diff options
Diffstat (limited to 'tmk_core/protocol/vusb/main.c')
-rw-r--r-- | tmk_core/protocol/vusb/main.c | 66 |
1 files changed, 41 insertions, 25 deletions
diff --git a/tmk_core/protocol/vusb/main.c b/tmk_core/protocol/vusb/main.c index 2e8bb2fbbc..53926a7493 100644 --- a/tmk_core/protocol/vusb/main.c +++ b/tmk_core/protocol/vusb/main.c @@ -53,10 +53,10 @@ static void initForUsbConnectivity(void) { usbDeviceConnect(); } -static void usb_remote_wakeup(void) { +static void vusb_send_remote_wakeup(void) { cli(); - int8_t ddr_orig = USBDDR; + uint8_t ddr_orig = USBDDR; USBOUT |= (1 << USBMINUS); USBDDR = ddr_orig | USBMASK; USBOUT ^= USBMASK; @@ -70,16 +70,34 @@ static void usb_remote_wakeup(void) { sei(); } +bool vusb_suspended = false; + +static void vusb_suspend(void) { + vusb_suspended = true; + +#ifdef SLEEP_LED_ENABLE + sleep_led_enable(); +#endif + + suspend_power_down(); +} + +#if USB_COUNT_SOF +static void vusb_wakeup(void) { + vusb_suspended = false; + suspend_wakeup_init(); + +# ifdef SLEEP_LED_ENABLE + sleep_led_disable(); +# endif +} +#endif + /** \brief Setup USB * * FIXME: Needs doc */ -static void setup_usb(void) { - initForUsbConnectivity(); - - // for Console_Task - print_set_sendchar(sendchar); -} +static void setup_usb(void) { initForUsbConnectivity(); } /** \brief Main * @@ -87,9 +105,8 @@ static void setup_usb(void) { */ int main(void) __attribute__((weak)); int main(void) { - bool suspended = false; #if USB_COUNT_SOF - uint16_t last_timer = timer_read(); + uint16_t sof_timer = timer_read(); #endif #ifdef CLKPR @@ -112,23 +129,24 @@ int main(void) { while (1) { #if USB_COUNT_SOF if (usbSofCount != 0) { - suspended = false; usbSofCount = 0; - last_timer = timer_read(); -# ifdef SLEEP_LED_ENABLE - sleep_led_disable(); -# endif + sof_timer = timer_read(); + if (vusb_suspended) { + vusb_wakeup(); + } } else { // Suspend when no SOF in 3ms-10ms(7.1.7.4 Suspending of USB1.1) - if (timer_elapsed(last_timer) > 5) { - suspended = true; -# ifdef SLEEP_LED_ENABLE - sleep_led_enable(); -# endif + if (!vusb_suspended && timer_elapsed(sof_timer) > 5) { + vusb_suspend(); } } #endif - if (!suspended) { + if (vusb_suspended) { + vusb_suspend(); + if (suspend_wakeup_condition()) { + vusb_send_remote_wakeup(); + } + } else { usbPoll(); // TODO: configuration process is inconsistent. it sometime fails. @@ -145,6 +163,7 @@ int main(void) { raw_hid_task(); } #endif + #ifdef CONSOLE_ENABLE usbPoll(); @@ -154,10 +173,7 @@ int main(void) { #endif // Run housekeeping - housekeeping_task_kb(); - housekeeping_task_user(); - } else if (suspend_wakeup_condition()) { - usb_remote_wakeup(); + housekeeping_task(); } } } |