From a92071494a95175b44a1a3912110c9432f63f3ed Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 15 Jan 2023 19:40:52 +1100 Subject: [PATCH] usb_main.c: remove `CH_KERNEL_MAJOR` check (#19597) --- tmk_core/protocol/chibios/usb_main.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c index 47edd7cb8cc..34d4af73639 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();