aboutsummaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c2
-rw-r--r--tmk_core/protocol/chibios/usb_main.c14
-rw-r--r--tmk_core/protocol/usb_descriptor.h6
3 files changed, 11 insertions, 11 deletions
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c
index 814389b6e..3c1c9a792 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c
+++ b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c
@@ -83,7 +83,7 @@ UDC_DESC_STORAGE usb_dev_desc_t udc_device_desc = {.bLength = sizeof(usb
83#ifdef USB_DEVICE_PRODUCT_NAME 83#ifdef USB_DEVICE_PRODUCT_NAME
84 .iProduct = 2, 84 .iProduct = 2,
85#else 85#else
86 .iProduct = 0, // No product string 86 .iProduct = 0, // No product string
87#endif 87#endif
88#if (defined USB_DEVICE_SERIAL_NAME || defined USB_DEVICE_GET_SERIAL_NAME_POINTER) 88#if (defined USB_DEVICE_SERIAL_NAME || defined USB_DEVICE_GET_SERIAL_NAME_POINTER)
89 .iSerialNumber = 3, 89 .iSerialNumber = 3,
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 9745d147c..ad489fb91 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -544,7 +544,7 @@ static bool usb_request_hook_cb(USBDriver *usbp) {
544#ifdef NKRO_ENABLE 544#ifdef NKRO_ENABLE
545 keymap_config.nkro = !!keyboard_protocol; 545 keymap_config.nkro = !!keyboard_protocol;
546 if (!keymap_config.nkro && keyboard_idle) { 546 if (!keymap_config.nkro && keyboard_idle) {
547#else /* NKRO_ENABLE */ 547#else /* NKRO_ENABLE */
548 if (keyboard_idle) { 548 if (keyboard_idle) {
549#endif /* NKRO_ENABLE */ 549#endif /* NKRO_ENABLE */
550 /* arm the idle timer if boot protocol & idle */ 550 /* arm the idle timer if boot protocol & idle */
@@ -562,7 +562,7 @@ static bool usb_request_hook_cb(USBDriver *usbp) {
562 /* arm the timer */ 562 /* arm the timer */
563#ifdef NKRO_ENABLE 563#ifdef NKRO_ENABLE
564 if (!keymap_config.nkro && keyboard_idle) { 564 if (!keymap_config.nkro && keyboard_idle) {
565#else /* NKRO_ENABLE */ 565#else /* NKRO_ENABLE */
566 if (keyboard_idle) { 566 if (keyboard_idle) {
567#endif /* NKRO_ENABLE */ 567#endif /* NKRO_ENABLE */
568 osalSysLockFromISR(); 568 osalSysLockFromISR();
@@ -689,7 +689,7 @@ static void keyboard_idle_timer_cb(void *arg) {
689 689
690#ifdef NKRO_ENABLE 690#ifdef NKRO_ENABLE
691 if (!keymap_config.nkro && keyboard_idle && keyboard_protocol) { 691 if (!keymap_config.nkro && keyboard_idle && keyboard_protocol) {
692#else /* NKRO_ENABLE */ 692#else /* NKRO_ENABLE */
693 if (keyboard_idle && keyboard_protocol) { 693 if (keyboard_idle && keyboard_protocol) {
694#endif /* NKRO_ENABLE */ 694#endif /* NKRO_ENABLE */
695 /* TODO: are we sure we want the KBD_ENDPOINT? */ 695 /* TODO: are we sure we want the KBD_ENDPOINT? */
@@ -738,7 +738,7 @@ void send_keyboard(report_keyboard_t *report) {
738 usbStartTransmitI(&USB_DRIVER, SHARED_IN_EPNUM, (uint8_t *)report, sizeof(struct nkro_report)); 738 usbStartTransmitI(&USB_DRIVER, SHARED_IN_EPNUM, (uint8_t *)report, sizeof(struct nkro_report));
739 } else 739 } else
740#endif /* NKRO_ENABLE */ 740#endif /* NKRO_ENABLE */
741 { /* regular protocol */ 741 { /* regular protocol */
742 /* need to wait until the previous packet has made it through */ 742 /* need to wait until the previous packet has made it through */
743 /* busy wait, should be short and not very common */ 743 /* busy wait, should be short and not very common */
744 if (usbGetTransmitStatusI(&USB_DRIVER, KEYBOARD_IN_EPNUM)) { 744 if (usbGetTransmitStatusI(&USB_DRIVER, KEYBOARD_IN_EPNUM)) {
@@ -805,8 +805,8 @@ void send_mouse(report_mouse_t *report) {
805 osalSysUnlock(); 805 osalSysUnlock();
806} 806}
807 807
808#else /* MOUSE_ENABLE */ 808#else /* MOUSE_ENABLE */
809void send_mouse(report_mouse_t *report) { (void)report; } 809void send_mouse(report_mouse_t *report) { (void)report; }
810#endif /* MOUSE_ENABLE */ 810#endif /* MOUSE_ENABLE */
811 811
812/* --------------------------------------------------------- 812/* ---------------------------------------------------------
@@ -885,7 +885,7 @@ void console_task(void) {
885 } while (size > 0); 885 } while (size > 0);
886} 886}
887 887
888#else /* CONSOLE_ENABLE */ 888#else /* CONSOLE_ENABLE */
889int8_t sendchar(uint8_t c) { 889int8_t sendchar(uint8_t c) {
890 (void)c; 890 (void)c;
891 return 0; 891 return 0;
diff --git a/tmk_core/protocol/usb_descriptor.h b/tmk_core/protocol/usb_descriptor.h
index 4c6728ebb..867e549b4 100644
--- a/tmk_core/protocol/usb_descriptor.h
+++ b/tmk_core/protocol/usb_descriptor.h
@@ -208,7 +208,7 @@ enum usb_endpoints {
208# if STM32_USB_USE_OTG1 208# if STM32_USB_USE_OTG1
209# define RAW_OUT_EPNUM RAW_IN_EPNUM 209# define RAW_OUT_EPNUM RAW_IN_EPNUM
210# else 210# else
211 RAW_OUT_EPNUM = NEXT_EPNUM, 211 RAW_OUT_EPNUM = NEXT_EPNUM,
212# endif 212# endif
213#endif 213#endif
214 214
@@ -248,7 +248,7 @@ enum usb_endpoints {
248# if STM32_USB_USE_OTG1 248# if STM32_USB_USE_OTG1
249# define CDC_OUT_EPNUM CDC_IN_EPNUM 249# define CDC_OUT_EPNUM CDC_IN_EPNUM
250# else 250# else
251 CDC_OUT_EPNUM = NEXT_EPNUM, 251 CDC_OUT_EPNUM = NEXT_EPNUM,
252# endif 252# endif
253#endif 253#endif
254#ifdef JOYSTICK_ENABLE 254#ifdef JOYSTICK_ENABLE
@@ -256,7 +256,7 @@ enum usb_endpoints {
256# if STM32_USB_USE_OTG1 256# if STM32_USB_USE_OTG1
257 JOYSTICK_OUT_EPNUM = JOYSTICK_IN_EPNUM, 257 JOYSTICK_OUT_EPNUM = JOYSTICK_IN_EPNUM,
258# else 258# else
259 JOYSTICK_OUT_EPNUM = NEXT_EPNUM, 259 JOYSTICK_OUT_EPNUM = NEXT_EPNUM,
260# endif 260# endif
261#endif 261#endif
262}; 262};