djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3223 from dhalbert/unmount-before-reset

Browse Source 
storage.erase_filesystem(): disconnect from USB and wait 1 second before resetting
This commit is contained in:
Scott Shawcroft 2020-07-29 10:47:24 -07:00 committed by GitHub
commit b76d37f24a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
shared-module/storage/__init__.c
View File

@ -30,6 +30,7 @@
#include "extmod/vfs.h" #include "extmod/vfs.h"
#include "py/mperrno.h" #include "py/mperrno.h"
#include "py/mphal.h"
#include "py/obj.h" #include "py/obj.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "shared-bindings/microcontroller/__init__.h" #include "shared-bindings/microcontroller/__init__.h"
@ -159,6 +160,8 @@ void common_hal_storage_remount(const char *mount_path, bool readonly, bool disa
} }
void common_hal_storage_erase_filesystem(void) { void common_hal_storage_erase_filesystem(void) {
usb_disconnect();
mp_hal_delay_ms(1000);
filesystem_init(false, true); // Force a re-format. filesystem_init(false, true); // Force a re-format.
common_hal_mcu_reset(); common_hal_mcu_reset();
// We won't actually get here, since we're resetting. // We won't actually get here, since we're resetting.

4
supervisor/shared/usb/usb.c
View File

@ -74,6 +74,10 @@ void usb_init(void) {
#endif #endif
} }
void usb_disconnect(void) {
tud_disconnect();
}
void usb_background(void) { void usb_background(void) {
if (usb_enabled()) { if (usb_enabled()) {
#if CFG_TUSB_OS == OPT_OS_NONE #if CFG_TUSB_OS == OPT_OS_NONE

1
supervisor/usb.h
View File

@ -45,6 +45,7 @@ void init_usb_hardware(void);
// Shared implementation. // Shared implementation.
bool usb_enabled(void); bool usb_enabled(void);
void usb_init(void); void usb_init(void);
void usb_disconnect(void);
// Propagate plug/unplug events to the MSC logic. // Propagate plug/unplug events to the MSC logic.
void usb_msc_mount(void); void usb_msc_mount(void);