summaryrefslogtreecommitdiff
path: root/protocol/lufa/lufa.c
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-11-21 13:01:47 +0900
committertmk <nobody@nowhere>2013-11-21 13:01:47 +0900
commit772ab7025ddf88126d9d6ddb654f62434985504b (patch)
treef0b4558bba2621a824736ceea0b09b51fdd41613 /protocol/lufa/lufa.c
parent821578293c79c5612f9b77e447295f2947fd6c3d (diff)
parenta9c3f4750b3d703b8bbbc90db2566afd2aab0ec9 (diff)
Merge branch 'ps2_mouse_fix'
Diffstat (limited to 'protocol/lufa/lufa.c')
-rw-r--r--protocol/lufa/lufa.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/protocol/lufa/lufa.c b/protocol/lufa/lufa.c
index a230d5ba20..04e8e78f38 100644
--- a/protocol/lufa/lufa.c
+++ b/protocol/lufa/lufa.c
@@ -539,11 +539,18 @@ int main(void)
{
SetupHardware();
sei();
+
+ /* wait for USB startup & debug output */
+ while (USB_DeviceState != DEVICE_STATE_Configured) {
#if defined(INTERRUPT_CONTROL_ENDPOINT)
- while (USB_DeviceState != DEVICE_STATE_Configured) ;
+ ;
+#else
+ USB_USBTask();
#endif
+ }
print("USB configured.\n");
+ /* init modules */
keyboard_init();
host_set_driver(&lufa_driver);
#ifdef SLEEP_LED_ENABLE