mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-07-16 12:51:47 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
08708002aa
@ -749,6 +749,7 @@ void init_usb_driver(USBDriver *usbp) {
|
|||||||
* after a reset.
|
* after a reset.
|
||||||
*/
|
*/
|
||||||
usbDisconnectBus(usbp);
|
usbDisconnectBus(usbp);
|
||||||
|
usbStop(usbp);
|
||||||
wait_ms(50);
|
wait_ms(50);
|
||||||
usbStart(usbp, &usbcfg);
|
usbStart(usbp, &usbcfg);
|
||||||
usbConnectBus(usbp);
|
usbConnectBus(usbp);
|
||||||
@ -757,8 +758,8 @@ void init_usb_driver(USBDriver *usbp) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
__attribute__((weak)) void restart_usb_driver(USBDriver *usbp) {
|
__attribute__((weak)) void restart_usb_driver(USBDriver *usbp) {
|
||||||
usbStop(usbp);
|
|
||||||
usbDisconnectBus(usbp);
|
usbDisconnectBus(usbp);
|
||||||
|
usbStop(usbp);
|
||||||
|
|
||||||
#if USB_SUSPEND_WAKEUP_DELAY > 0
|
#if USB_SUSPEND_WAKEUP_DELAY > 0
|
||||||
// Some hubs, kvm switches, and monitors do
|
// Some hubs, kvm switches, and monitors do
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
#include "usb_util.h"
|
#include "usb_util.h"
|
||||||
|
|
||||||
void usb_disconnect(void) {
|
void usb_disconnect(void) {
|
||||||
|
usbDisconnectBus(&USBD1);
|
||||||
usbStop(&USBD1);
|
usbStop(&USBD1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user