darkkirb/qmk_firmware
1
0
Fork 0
forked from mirrors/qmk_firmware
Code Issues Pull requests Projects Releases Packages Wiki Activity

usb_main.c: remove CH_KERNEL_MAJOR check (#19597)

Browse source
This commit is contained in:
Ryan 2023-01-15 19:40:52 +11:00 committed by GitHub
parent 80464674d3
commit a92071494a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tmk_core/protocol/chibios/usb_main.c
View file

@ -69,11 +69,7 @@ uint8_t keyboard_led_state = 0;
volatile uint16_t keyboard_idle_count = 0; volatile uint16_t keyboard_idle_count = 0;
static virtual_timer_t keyboard_idle_timer; static virtual_timer_t keyboard_idle_timer;
#if CH_KERNEL_MAJOR >= 7
static void keyboard_idle_timer_cb(struct ch_virtual_timer *, void *arg); 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_keyboard_t keyboard_report_sent = {{0}};
report_mouse_t mouse_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 /* Idle requests timer code
* callback (called from ISR, unlocked state) */ * callback (called from ISR, unlocked state) */
#if CH_KERNEL_MAJOR >= 7
static void keyboard_idle_timer_cb(struct ch_virtual_timer *timer, void *arg) { static void keyboard_idle_timer_cb(struct ch_virtual_timer *timer, void *arg) {
(void)timer; (void)timer;
#elif CH_KERNEL_MAJOR <= 6
static void keyboard_idle_timer_cb(void *arg) {
#endif
USBDriver *usbp = (USBDriver *)arg; USBDriver *usbp = (USBDriver *)arg;
osalSysLockFromISR(); osalSysLockFromISR();