aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/protocol/lufa/lufa.c
diff options
context:
space:
mode:
Diffstat (limited to 'tmk_core/protocol/lufa/lufa.c')
-rw-r--r--tmk_core/protocol/lufa/lufa.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 22cc0db8ce..2142b04460 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -67,6 +67,11 @@
# include "raw_hid.h"
#endif
+#ifdef WAIT_FOR_USB
+// TODO: Remove backwards compatibility with old define
+# define USB_WAIT_FOR_ENUMERATION
+#endif
+
uint8_t keyboard_idle = 0;
/* 0: Boot Protocol, 1: Report Protocol(default) */
uint8_t keyboard_protocol = 1;
@@ -151,7 +156,7 @@ __attribute__((weak)) void raw_hid_receive(uint8_t *data, uint8_t length) {
*
* FIXME: Needs doc
*/
-static void raw_hid_task(void) {
+void raw_hid_task(void) {
// Create a temporary buffer to hold the read in data from the host
uint8_t data[RAW_EPSIZE];
bool data_read = false;
@@ -807,7 +812,7 @@ void protocol_pre_init(void) {
/* wait for USB startup & debug output */
-#ifdef WAIT_FOR_USB
+#ifdef USB_WAIT_FOR_ENUMERATION
while (USB_DeviceState != DEVICE_STATE_Configured) {
# if defined(INTERRUPT_CONTROL_ENDPOINT)
;
@@ -865,10 +870,6 @@ void protocol_post_task(void) {
CDC_Device_USBTask(&cdc_device);
#endif
-#ifdef RAW_ENABLE
- raw_hid_task();
-#endif
-
#if !defined(INTERRUPT_CONTROL_ENDPOINT)
USB_USBTask();
#endif