Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
89936c66b0
|
@ -82,6 +82,7 @@ static void vusb_suspend(void) {
|
||||||
suspend_power_down();
|
suspend_power_down();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if USB_COUNT_SOF
|
||||||
static void vusb_wakeup(void) {
|
static void vusb_wakeup(void) {
|
||||||
vusb_suspended = false;
|
vusb_suspended = false;
|
||||||
suspend_wakeup_init();
|
suspend_wakeup_init();
|
||||||
|
@ -90,6 +91,7 @@ static void vusb_wakeup(void) {
|
||||||
sleep_led_disable();
|
sleep_led_disable();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/** \brief Setup USB
|
/** \brief Setup USB
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue