Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bug] Restore usb suspend wakeup delay #21676

Merged
merged 2 commits into from
Aug 2, 2023
Merged

[Bug] Restore usb suspend wakeup delay #21676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0de58d5
Respect USB_SUSPEND_WAKEUP_DELAY on wakeup
KarlK90 Jul 25, 2023
1275bdc
Remove old, unused and commented testing code
KarlK90 Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 8 additions & 23 deletions tmk_core/protocol/chibios/chibios.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,26 +80,6 @@ void console_task(void);
void midi_ep_task(void);
#endif

/* TESTING
* Amber LED blinker thread, times are in milliseconds.
*/
/* set this variable to non-zero anywhere to blink once */
// static THD_WORKING_AREA(waThread1, 128);
// static THD_FUNCTION(Thread1, arg) {

// (void)arg;
// chRegSetThreadName("blinker");
// while (true) {
// systime_t time;

// time = USB_DRIVER.state == USB_ACTIVE ? 250 : 500;
// palClearLine(LINE_CAPS_LOCK);
// chSysPolledDelayX(MS2RTC(STM32_HCLK, time));
// palSetLine(LINE_CAPS_LOCK);
// chSysPolledDelayX(MS2RTC(STM32_HCLK, time));
// }
// }

/* Early initialisation
*/
__attribute__((weak)) void early_hardware_init_pre(void) {
Expand Down Expand Up @@ -135,9 +115,6 @@ void boardInit(void) {

void protocol_setup(void) {
usb_device_state_init();

// TESTING
// chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
}

static host_driver_t *driver = NULL;
Expand Down Expand Up @@ -189,6 +166,14 @@ void protocol_pre_task(void) {
/* issue a remote wakeup event to the host which should resume
* the bus and get our keyboard out of suspension. */
usbWakeupHost(&USB_DRIVER);
# if USB_SUSPEND_WAKEUP_DELAY > 0
/* Some hubs, kvm switches, and monitors do weird things, with
* USB device state bouncing around wildly on wakeup, yielding
* race conditions that can corrupt the keyboard state.
*
* Pause for a while to let things settle... */
wait_ms(USB_SUSPEND_WAKEUP_DELAY);
# endif
}
}
/* after a successful wakeup a USB_EVENT_WAKEUP is signaled to QMK by
Expand Down
27 changes: 6 additions & 21 deletions tmk_core/protocol/chibios/usb_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,34 +784,19 @@ void init_usb_driver(USBDriver *usbp) {
#endif
}

/*
* Activates the USB driver and then the USB bus pull-up on D+.
* Note, a delay is inserted in order to not have to disconnect the cable
* after a reset.
*/
usbDisconnectBus(usbp);
usbStop(usbp);
wait_ms(50);
usbStart(usbp, &usbcfg);
usbConnectBus(usbp);
restart_usb_driver(usbp);

chVTObjectInit(&keyboard_idle_timer);
}

/** @brief Restarts the USB driver and emulates a physical bus reconnection.
* Note that the bus reconnection is MCU and even board specific, so it might
* be a NOP on some hardware platforms.
*/
__attribute__((weak)) void restart_usb_driver(USBDriver *usbp) {
usbDisconnectBus(usbp);
usbStop(usbp);

#if USB_SUSPEND_WAKEUP_DELAY > 0
// Some hubs, kvm switches, and monitors do
// weird things, with USB device state bouncing
// around wildly on wakeup, yielding race
// conditions that can corrupt the keyboard state.
//
// Pause for a while to let things settle...
wait_ms(USB_SUSPEND_WAKEUP_DELAY);
#endif

wait_ms(50);
usbStart(usbp, &usbcfg);
usbConnectBus(usbp);
}
Expand Down