diff options
Diffstat (limited to 'tmk_core/protocol')
| -rw-r--r-- | tmk_core/protocol/chibios/usb_main.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c index 3b16a0ff7..a7db3e3ab 100644 --- a/tmk_core/protocol/chibios/usb_main.c +++ b/tmk_core/protocol/chibios/usb_main.c | |||
| @@ -71,7 +71,12 @@ uint8_t keyboard_protocol __attribute__((aligned(2))) = 1; | |||
| 71 | uint8_t keyboard_led_state = 0; | 71 | uint8_t keyboard_led_state = 0; |
| 72 | volatile uint16_t keyboard_idle_count = 0; | 72 | volatile uint16_t keyboard_idle_count = 0; |
| 73 | static virtual_timer_t keyboard_idle_timer; | 73 | static virtual_timer_t keyboard_idle_timer; |
| 74 | static void keyboard_idle_timer_cb(void *arg); | 74 | |
| 75 | #if CH_KERNEL_MAJOR >= 7 | ||
| 76 | static void keyboard_idle_timer_cb(struct ch_virtual_timer *, void *arg); | ||
| 77 | #elif CH_KERNEL_MAJOR <= 6 | ||
| 78 | static void keyboard_idle_timer_cb(void *arg); | ||
| 79 | #endif | ||
| 75 | 80 | ||
| 76 | report_keyboard_t keyboard_report_sent = {{0}}; | 81 | report_keyboard_t keyboard_report_sent = {{0}}; |
| 77 | #ifdef MOUSE_ENABLE | 82 | #ifdef MOUSE_ENABLE |
| @@ -774,7 +779,12 @@ void kbd_sof_cb(USBDriver *usbp) { (void)usbp; } | |||
| 774 | 779 | ||
| 775 | /* Idle requests timer code | 780 | /* Idle requests timer code |
| 776 | * callback (called from ISR, unlocked state) */ | 781 | * callback (called from ISR, unlocked state) */ |
| 782 | #if CH_KERNEL_MAJOR >= 7 | ||
| 783 | static void keyboard_idle_timer_cb(struct ch_virtual_timer *timer, void *arg) { | ||
| 784 | (void)timer; | ||
| 785 | #elif CH_KERNEL_MAJOR <= 6 | ||
| 777 | static void keyboard_idle_timer_cb(void *arg) { | 786 | static void keyboard_idle_timer_cb(void *arg) { |
| 787 | #endif | ||
| 778 | USBDriver *usbp = (USBDriver *)arg; | 788 | USBDriver *usbp = (USBDriver *)arg; |
| 779 | 789 | ||
| 780 | osalSysLockFromISR(); | 790 | osalSysLockFromISR(); |
