summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-01-15 19:40:52 +1100
committerGitHub <noreply@github.com>2023-01-15 19:40:52 +1100
commita92071494a95175b44a1a3912110c9432f63f3ed (patch)
tree8a170a3b556ff29c1305eccea4afe6694706114b
parent80464674d3275de70ab0f1e2a6aa2ea536501def (diff)
usb_main.c: remove `CH_KERNEL_MAJOR` check (#19597)
-rw-r--r--tmk_core/protocol/chibios/usb_main.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 47edd7cb8c..34d4af7363 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -69,11 +69,7 @@ uint8_t keyboard_led_state = 0;
volatile uint16_t keyboard_idle_count = 0;
static virtual_timer_t keyboard_idle_timer;
-#if CH_KERNEL_MAJOR >= 7
static void keyboard_idle_timer_cb(struct ch_virtual_timer *, void *arg);
-#elif CH_KERNEL_MAJOR <= 6
-static void keyboard_idle_timer_cb(void *arg);
-#endif
report_keyboard_t keyboard_report_sent = {{0}};
report_mouse_t mouse_report_sent = {0};
@@ -827,12 +823,8 @@ __attribute__((weak)) void restart_usb_driver(USBDriver *usbp) {
/* Idle requests timer code
* callback (called from ISR, unlocked state) */
-#if CH_KERNEL_MAJOR >= 7
static void keyboard_idle_timer_cb(struct ch_virtual_timer *timer, void *arg) {
(void)timer;
-#elif CH_KERNEL_MAJOR <= 6
-static void keyboard_idle_timer_cb(void *arg) {
-#endif
USBDriver *usbp = (USBDriver *)arg;
osalSysLockFromISR();