From 9dfc2fac16bfe745bf17856f796ef7c3656992c4 Mon Sep 17 00:00:00 2001 From: stdvar Date: Mon, 11 Oct 2021 11:57:52 -0400 Subject: [PATCH] Use restart_usb_driver redefined in board chibios board file for history see: https://github.com/SonixQMK/qmk_firmware/pull/28 https://github.com/qmk/qmk_firmware/pull/12870 https://github.com/SonixQMK/ChibiOS-Contrib/pull/24 --- tmk_core/protocol/chibios/main.c | 2 -- tmk_core/protocol/chibios/usb_main.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tmk_core/protocol/chibios/main.c b/tmk_core/protocol/chibios/main.c index 0deab4a946b4..05d6b5761154 100644 --- a/tmk_core/protocol/chibios/main.c +++ b/tmk_core/protocol/chibios/main.c @@ -243,9 +243,7 @@ int main(void) { /* Remote wakeup */ if (suspend_wakeup_condition()) { usbWakeupHost(&USB_DRIVER); -#if !defined(SN32F24xx) restart_usb_driver(&USB_DRIVER); -#endif } } /* Woken up */ diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c index 78b19c99b60f..690f5e4859e7 100644 --- a/tmk_core/protocol/chibios/usb_main.c +++ b/tmk_core/protocol/chibios/usb_main.c @@ -652,7 +652,7 @@ void init_usb_driver(USBDriver *usbp) { chVTObjectInit(&keyboard_idle_timer); } -void restart_usb_driver(USBDriver *usbp) { +__attribute__((weak)) void restart_usb_driver(USBDriver *usbp) { usbStop(usbp); usbDisconnectBus(usbp); usbStart(usbp, &usbcfg);