From 845953cc67e33dbd9ac5007ba3b39562f5aea962 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sun, 5 Apr 2020 01:18:19 -0700
Subject: [PATCH] V-USB remote wakeup (#7627)

* V-USB remote wakeup

Backport from tmk/tmk_keyboard@391c979be751eaf113c8f53c36644a6bb6ff12f6

* Change vusb.c remote wake config

as per fauxpark's suggestion
---
 tmk_core/protocol/vusb/main.c | 20 ++++++++++++++++++++
 tmk_core/protocol/vusb/vusb.c |  6 +-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/tmk_core/protocol/vusb/main.c b/tmk_core/protocol/vusb/main.c
index 1ab765343..610638e7d 100644
--- a/tmk_core/protocol/vusb/main.c
+++ b/tmk_core/protocol/vusb/main.c
@@ -20,6 +20,7 @@
 #include "timer.h"
 #include "uart.h"
 #include "debug.h"
+#include "suspend.h"
 #ifdef SLEEP_LED_ENABLE
 #    include "sleep_led.h"
 #endif
@@ -41,6 +42,23 @@ static void initForUsbConnectivity(void) {
     sei();
 }
 
+void usb_remote_wakeup(void) {
+    cli();
+
+    int8_t ddr_orig = USBDDR;
+    USBOUT |= (1 << USBMINUS);
+    USBDDR = ddr_orig | USBMASK;
+    USBOUT ^= USBMASK;
+
+    _delay_ms(25);
+
+    USBOUT ^= USBMASK;
+    USBDDR = ddr_orig;
+    USBOUT &= ~(1 << USBMINUS);
+
+    sei();
+}
+
 int main(void) {
     bool suspended = false;
 #if USB_COUNT_SOF
@@ -115,6 +133,8 @@ int main(void) {
                 raw_hid_task();
             }
 #endif
+        } else if (suspend_wakeup_condition()) {
+            usb_remote_wakeup();
         }
     }
 }
diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c
index 00314ebe8..470d29ba3 100644
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@@ -521,11 +521,7 @@ const PROGMEM usbConfigurationDescriptor_t usbConfigurationDescriptor = {
 #    endif
         .bConfigurationValue = 0x01,
         .iConfiguration      = 0x00,
-#    if USB_CFG_IS_SELF_POWERED
-        .bmAttributes        = (1 << 7) | USBATTR_SELFPOWER,
-#    else
-        .bmAttributes        = (1 << 7),
-#    endif
+        .bmAttributes        = (1 << 7) | USBATTR_REMOTEWAKE,
         .bMaxPower           = USB_MAX_POWER_CONSUMPTION / 2
     },