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

unify blank reports into one case

Browse source
This commit is contained in:
Jack Humbert 2021-10-14 12:35:16 -04:00
parent 56ec2854a8
commit 4a62ff5f9a
1 changed files with 36 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,15 +73,24 @@ static virtual_timer_t keyboard_idle_timer;
static void keyboard_idle_timer_cb(void *arg); static void keyboard_idle_timer_cb(void *arg);
report_keyboard_t keyboard_report_sent = {{0}}; report_keyboard_t keyboard_report_sent = {{0}};
#ifdef MOUSE_ENABLE report_mouse_t mouse_report_sent = {0};
report_mouse_t mouse_report_blank = {0};
#endif /* MOUSE_ENABLE */ union {
uint8_t report_id;
report_keyboard_t keyboard;
#ifdef EXTRAKEY_ENABLE #ifdef EXTRAKEY_ENABLE
uint8_t extra_report_blank[3] = {0}; report_extra_t extra;
#endif /* EXTRAKEY_ENABLE */ #endif
#ifdef CONSOLE_ENABLE #ifdef MOUSE_ENABLE
uint8_t console_report_blank[CONSOLE_EPSIZE] = {0}; report_mouse_t mouse;
#endif /* EXTRAKEY_ENABLE */ #endif
#ifdef DIGITIZER_ENABLE
report_digitizer_t digitizer;
#endif
#ifdef JOYSTICK_ENABLE
joystick_report_t joystick;
#endif
} universal_report_blank = {0};
/* --------------------------------------------------------- /* ---------------------------------------------------------
* Descriptors and USB driver objects * Descriptors and USB driver objects
@ -577,54 +586,30 @@ static bool usb_request_hook_cb(USBDriver *usbp) {
#endif #endif
#if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP) #if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP)
case MOUSE_INTERFACE: case MOUSE_INTERFACE:
usbSetupTransfer(usbp, (uint8_t *)&mouse_report_blank, sizeof(mouse_report_blank), NULL); usbSetupTransfer(usbp, (uint8_t *)&mouse_report_sent, sizeof(mouse_report_sent), NULL);
return TRUE; return TRUE;
break; break;
#endif #endif
#ifdef SHARED_EP_ENABLE #ifdef SHARED_EP_ENABLE
case SHARED_INTERFACE: case SHARED_INTERFACE:
switch (usbp->setup[2]) {
# ifdef MOUSE_SHARED_EP
case REPORT_ID_MOUSE:
usbSetupTransfer(usbp, (uint8_t *)&mouse_report_blank, sizeof(mouse_report_blank), NULL);
return TRUE;
break;
# endif
# ifdef EXTRAKEY_ENABLE
case REPORT_ID_SYSTEM:
usbSetupTransfer(usbp, (uint8_t *)&extra_report_blank, sizeof(extra_report_blank), NULL);
return TRUE;
break;
case REPORT_ID_CONSUMER:
usbSetupTransfer(usbp, (uint8_t *)&extra_report_blank, sizeof(extra_report_blank), NULL);
return TRUE;
break;
# endif
# if defined(KEYBOARD_SHARED_EP) || defined(NKRO_ENABLE)
# ifdef KEYBOARD_SHARED_EP # ifdef KEYBOARD_SHARED_EP
case REPORT_ID_KEYBOARD: if (usbp->setup[2] == REPORT_ID_KEYBOARD) {
# endif usbSetupTransfer(usbp, (uint8_t *)&keyboard_report_sent, KEYBOARD_REPORT_SIZE, NULL);
# ifdef NKRO_ENABLE
case REPORT_ID_NKRO:
# endif
usbSetupTransfer(usbp, (uint8_t *)&keyboard_report_sent, sizeof(keyboard_report_sent), NULL);
return TRUE; return TRUE;
break; break;
# endif
default:
return FALSE;
break;
} }
break;
# endif # endif
#ifdef CONSOLE_ENABLE # ifdef MOUSE_SHARED_EP
case CONSOLE_INTERFACE: if (usbp->setup[2] == REPORT_ID_MOUSE) {
usbSetupTransfer(usbp, (uint8_t *)&console_report_blank, sizeof(console_report_blank), NULL); usbSetupTransfer(usbp, (uint8_t *)&mouse_report_sent, sizeof(mouse_report_sent), NULL);
return TRUE; return TRUE;
break; break;
}
# endif # endif
#endif /* SHARED_EP_ENABLE */
default: default:
usbSetupTransfer(usbp, NULL, 0, NULL); universal_report_blank.report_id = usbp->setup[2];
usbSetupTransfer(usbp, (uint8_t *)&universal_report_blank, usbp->setup[6], NULL);
return TRUE; return TRUE;
break; break;
} }
@ -933,6 +918,7 @@ void send_mouse(report_mouse_t *report) {
} }
} }
usbStartTransmitI(&USB_DRIVER, MOUSE_IN_EPNUM, (uint8_t *)report, sizeof(report_mouse_t)); usbStartTransmitI(&USB_DRIVER, MOUSE_IN_EPNUM, (uint8_t *)report, sizeof(report_mouse_t));
mouse_report_sent = *report;
osalSysUnlock(); osalSysUnlock();
} }