aboutsummaryrefslogtreecommitdiffstats
path: root/tmk_core
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2020-01-12 22:21:42 +0000
committerfauxpark <fauxpark@gmail.com>2020-01-13 09:21:42 +1100
commitff5742da9ff468a7e2743c23c2e8551503792401 (patch)
tree25453d06fb4c3f9179cb10e085d28caa47b2df3c /tmk_core
parent5cb83dd5d7c60f4f19905a6e35f30b6bbfe562be (diff)
downloadfirmware-ff5742da9ff468a7e2743c23c2e8551503792401.tar.gz
firmware-ff5742da9ff468a7e2743c23c2e8551503792401.tar.bz2
firmware-ff5742da9ff468a7e2743c23c2e8551503792401.zip
Fix KEYBOARD_SHARED_EP on ChibiOS (#7860)
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/protocol/chibios/usb_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 740763de2..a4f996b8d 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -381,7 +381,7 @@ static uint16_t get_hword(uint8_t *p) {
* Other Device Required Optional Optional Optional Optional Optional
*/
-#ifdef SHARED_EP_ENABLE
+#if defined(SHARED_EP_ENABLE) && !defined(KEYBOARD_SHARED_EP)
static uint8_t set_report_buf[2] __attribute__((aligned(2)));
static void set_led_transfer_cb(USBDriver *usbp) {
if ((set_report_buf[0] == REPORT_ID_KEYBOARD) || (set_report_buf[0] == REPORT_ID_NKRO)) {