hook: Change func name of usb events

Author: tmk

common/hook.h

@@ -34,18 +34,18 @@ void hook_early_init(void);
 void hook_late_init(void);
 
 /* Called once, on getting SUSPEND event from USB. */
-/* Default behaviour: enables sleep LED breathing. */
-void hook_suspend_entry(void);
+/* Default behaviour: do nothing. */
+void hook_usb_suspend_entry(void);
 
 /* Called repeatedly during the SUSPENDed state. */
 /* Default behaviour: power down and periodically check
  * the matrix, cause wakeup if needed. */
-void hook_suspend_loop(void);
+void hook_usb_suspend_loop(void);
 
 /* Called once, on getting WAKE event from USB. */
 /* Default behaviour: disables sleep LED breathing and restores 
  * the "normal" indicator LED status by default. */
-void hook_wakeup(void);
+void hook_usb_wakeup(void);
 
 /* Called once, on checking the bootmagic combos. */
 /* Default behaviour: do nothing. */

protocol/chibios/main.c

@@ -67,7 +67,7 @@ __attribute__((weak))
 void hook_late_init(void) {}
 
 __attribute__((weak))
-void hook_suspend_loop(void) {
+void hook_usb_suspend_loop(void) {
   /* Do this in the suspended state */
   suspend_power_down(); // on AVR this deep sleeps for 15ms
   /* Remote wakeup */
@@ -147,7 +147,7 @@ int main(void) {
     if(USB_DRIVER.state == USB_SUSPENDED) {
       print("[s]");
       while(USB_DRIVER.state == USB_SUSPENDED) {
-        hook_suspend_loop();
+        hook_usb_suspend_loop();
       }
       /* Woken up */
       // variables have been already cleared

protocol/chibios/usb_main.c

@@ -31,7 +31,7 @@
 
 /* TMK hooks */
 __attribute__((weak))
-void hook_wakeup(void) {
+void hook_usb_wakeup(void) {
 #ifdef SLEEP_LED_ENABLE
     sleep_led_disable();
     // NOTE: converters may not accept this
@@ -40,7 +40,7 @@ void hook_wakeup(void) {
 }
 
  __attribute__((weak))
-void hook_suspend_entry(void) {
+void hook_usb_suspend_entry(void) {
 #ifdef SLEEP_LED_ENABLE
     sleep_led_enable();
 #endif /* SLEEP_LED_ENABLE */
@@ -814,13 +814,13 @@ static void usb_event_cb(USBDriver *usbp, usbevent_t event) {
 
   case USB_EVENT_SUSPEND:
     //TODO: from ISR! print("[S]");
-    hook_suspend_entry();
+    hook_usb_suspend_entry();
     return;
 
   case USB_EVENT_WAKEUP:
     //TODO: from ISR! print("[W]");
     suspend_wakeup_init();
-    hook_wakeup();
+    hook_usb_wakeup();
     return;
 
   case USB_EVENT_STALLED:

protocol/lufa/lufa.c

@@ -181,13 +181,13 @@ void EVENT_USB_Device_Reset(void)
 void EVENT_USB_Device_Suspend()
 {
     print("[S]");
-    hook_suspend_entry();
+    hook_usb_suspend_entry();
 }
 
 void EVENT_USB_Device_WakeUp()
 {
     print("[W]");
-    hook_wakeup();
+    hook_usb_wakeup();
 }
 
 #ifdef CONSOLE_ENABLE
@@ -585,8 +585,8 @@ int main(void)  __attribute__ ((weak));
 int main(void)
 {
     setup_mcu();
-    keyboard_setup();
     hook_early_init();
+    keyboard_setup();
     setup_usb();
     sei();
 
@@ -612,7 +612,7 @@ int main(void)
     while (1) {
         while (USB_DeviceState == DEVICE_STATE_Suspended) {
             print("[s]");
-            hook_suspend_loop();
+            hook_usb_suspend_loop();
         }
 
         keyboard_task();
@@ -632,15 +632,15 @@ __attribute__((weak))
 void hook_late_init(void) {}
 
  __attribute__((weak))
-void hook_suspend_entry(void)
+void hook_usb_suspend_entry(void)
 {
 #ifdef SLEEP_LED_ENABLE
     sleep_led_enable();
 #endif
 }
 
 __attribute__((weak))
-void hook_suspend_loop(void)
+void hook_usb_suspend_loop(void)
 {
     suspend_power_down();
     if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) {
@@ -649,7 +649,7 @@ void hook_suspend_loop(void)
 }
 
 __attribute__((weak))
-void hook_wakeup(void)
+void hook_usb_wakeup(void)
 {
     suspend_wakeup_init();
 #ifdef SLEEP_LED_ENABLE