ibmpc_usb: Add prebuilt firmware files

[max/tmk_keyboard.git] / tmk_core / protocol / lufa / lufa.c

diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 48034dbeab18ef9af9a668db43d740406be9e6c2..32bc698109b577537ca14f1c144b99232ee2ccef 100644 (file)
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -642,7 +642,7 @@ int main(void)
     print_set_sendchar(sendchar);
     host_set_driver(&lufa_driver);
 
-    print("\n\nKeyboard init.\n");
+    print("\n\nTMK:" STR(TMK_VERSION) "/LUFA\n\n");
     hook_early_init();
     keyboard_setup();
     setup_usb();
@@ -654,6 +654,7 @@ int main(void)
 
     keyboard_init();
 
+#ifndef NO_USB_STARTUP_WAIT_LOOP
     /* wait for USB startup */
     while (USB_DeviceState != DEVICE_STATE_Configured) {
 #if defined(INTERRUPT_CONTROL_ENDPOINT)
@@ -661,17 +662,20 @@ int main(void)
 #else
         USB_USBTask();
 #endif
-        matrix_scan();
+        hook_usb_startup_wait_loop();
     }
     print("\nUSB configured.\n");
+#endif
 
     hook_late_init();
 
     print("\nKeyboard start.\n");
     while (1) {
+#ifndef NO_USB_SUSPEND_LOOP
         while (USB_DeviceState == DEVICE_STATE_Suspended) {
             hook_usb_suspend_loop();
         }
+#endif
 
         keyboard_task();
 
@@ -736,3 +740,6 @@ void hook_usb_wakeup(void)
 
     // Calling long task here can prevent USB state transition
 }
+
+__attribute__((weak))
+void hook_usb_startup_wait_loop(void) {}