aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/protocol/lufa/lufa.c
diff options
context:
space:
mode:
authorJoshua Diamond <josh@windowoffire.com>2021-02-01 19:12:41 -0500
committerGitHub <noreply@github.com>2021-02-02 11:12:41 +1100
commit9a4618b05b9f1093908c2153c719c5eb5d4a79ee (patch)
tree7487e6226c72d2c3d09749d60ce8df18a2c40d59 /tmk_core/protocol/lufa/lufa.c
parent85079d6a2ecfd55d0d33ce32cd1ad137f1c1df55 (diff)
downloadqmk_firmware-9a4618b05b9f1093908c2153c719c5eb5d4a79ee.tar.gz
qmk_firmware-9a4618b05b9f1093908c2153c719c5eb5d4a79ee.zip
Address wake from sleep instability (#11450)
* resolve race condition between suspend and wake in LUFA * avoid multiple calls to suspend_power_down() / suspend_wakeup_init() * Remove duplicate suspend_power_down_kb() call * pause on wakeup to wait for USB state to settle * need the repeated suspend_power_down() (that's where the sleep is) * more efficient implementation * fine tune the pause after sending wakeup * speculative chibios version of pause-after-wake * make wakeup delay configurable, and adjust value * better location for wakeup delay
Diffstat (limited to 'tmk_core/protocol/lufa/lufa.c')
-rw-r--r--tmk_core/protocol/lufa/lufa.c24
1 files changed, 20 insertions, 4 deletions
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 623aa33ff..74e48222d 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -435,7 +435,9 @@ void EVENT_USB_Device_Suspend() {
435 */ 435 */
436void EVENT_USB_Device_WakeUp() { 436void EVENT_USB_Device_WakeUp() {
437 print("[W]"); 437 print("[W]");
438#if defined(NO_USB_STARTUP_CHECK)
438 suspend_wakeup_init(); 439 suspend_wakeup_init();
440#endif
439 441
440#ifdef SLEEP_LED_ENABLE 442#ifdef SLEEP_LED_ENABLE
441 sleep_led_disable(); 443 sleep_led_disable();
@@ -1073,12 +1075,26 @@ int main(void) {
1073 print("Keyboard start.\n"); 1075 print("Keyboard start.\n");
1074 while (1) { 1076 while (1) {
1075#if !defined(NO_USB_STARTUP_CHECK) 1077#if !defined(NO_USB_STARTUP_CHECK)
1076 while (USB_DeviceState == DEVICE_STATE_Suspended) { 1078 if (USB_DeviceState == DEVICE_STATE_Suspended) {
1077 print("[s]"); 1079 print("[s]");
1078 suspend_power_down(); 1080 while (USB_DeviceState == DEVICE_STATE_Suspended) {
1079 if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) { 1081 suspend_power_down();
1080 USB_Device_SendRemoteWakeup(); 1082 if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) {
1083 USB_Device_SendRemoteWakeup();
1084 clear_keyboard();
1085
1086# if USB_SUSPEND_WAKEUP_DELAY > 0
1087 // Some hubs, kvm switches, and monitors do
1088 // weird things, with USB device state bouncing
1089 // around wildly on wakeup, yielding race
1090 // conditions that can corrupt the keyboard state.
1091 //
1092 // Pause for a while to let things settle...
1093 wait_ms(USB_SUSPEND_WAKEUP_DELAY);
1094# endif
1095 }
1081 } 1096 }
1097 suspend_wakeup_init();
1082 } 1098 }
1083#endif 1099#endif
1084 1100