2 files changed, 40 insertions, 17 deletions

diff --git a/tmk_core/protocol/vusb/main.c b/tmk_core/protocol/vusb/main.c
index 2e8bb2fbbc..af64f4e561 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,6 +70,27 @@ 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();
+}
+
+static void vusb_wakeup(void) {
+    vusb_suspended = false;
+    suspend_wakeup_init();
+
+#ifdef SLEEP_LED_ENABLE
+    sleep_led_disable();
+#endif
+}
+
 /** \brief Setup USB
  *
  * FIXME: Needs doc
@@ -87,9 +108,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 +132,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 +166,7 @@ int main(void) {
                 raw_hid_task();
             }
 #endif
+
 #ifdef CONSOLE_ENABLE
             usbPoll();
 
@@ -156,8 +178,6 @@ int main(void) {
             // Run housekeeping
             housekeeping_task_kb();
             housekeeping_task_user();
-        } else if (suspend_wakeup_condition()) {
-            usb_remote_wakeup();
         }
     }
 }
diff --git a/tmk_core/protocol/vusb/vusb.h b/tmk_core/protocol/vusb/vusb.h
index b4c73aabae..b1ecc98f37 100644
--- a/tmk_core/protocol/vusb/vusb.h
+++ b/tmk_core/protocol/vusb/vusb.h
@@ -18,6 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include "host_driver.h"
+#include <usbdrv/usbdrv.h>
 
 typedef struct usbDescriptorHeader {
     uchar bLength;
@@ -119,5 +120,7 @@ typedef struct usbConfigurationDescriptor {
 
 #define USB_STRING_LEN(s) (sizeof(usbDescriptorHeader_t) + ((s) << 1))
 
+extern bool vusb_suspended;
+
 host_driver_t *vusb_driver(void);
 void           vusb_transfer_keyboard(void);