diff options
| author | Dan Halbert <halbert@halwitz.org> | 2017-10-12 14:35:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-12 14:35:39 -0400 |
| commit | 922006dd59323e6019e8fbfe1938e0c30121999c (patch) | |
| tree | a18927c9cee675b32c7ff8385e6ca6b4200e6d24 | |
| parent | ef65ee78c544f0996eeb77ae762d2c4c7ed17057 (diff) | |
Don't create a new filesystem if we restart in safe mode. (#319)
| -rw-r--r-- | atmel-samd/main.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/atmel-samd/main.c b/atmel-samd/main.c index 3a2d5a63c..36d5dde27 100644 --- a/atmel-samd/main.c +++ b/atmel-samd/main.c @@ -107,7 +107,7 @@ void do_str(const char *src, mp_parse_input_kind_t input_kind) { // we don't make this function static because it needs a lot of stack and we // want it to be executed without using stack within main() function -void init_flash_fs(void) { +void init_flash_fs(bool create_allowed) { // init the vfs object fs_user_mount_t *vfs_fat = &fs_user_mount_flash; vfs_fat->flags = 0; @@ -116,7 +116,7 @@ void init_flash_fs(void) { // try to mount the flash FRESULT res = f_mount(&vfs_fat->fatfs); - if (res == FR_NO_FILESYSTEM) { + if (res == FR_NO_FILESYSTEM && create_allowed) { // no filesystem so create a fresh one uint8_t working_buf[_MAX_SS]; @@ -653,7 +653,10 @@ int main(void) { mp_stack_fill_with_sentinel(); #endif - init_flash_fs(); + // Create a new filesystem only if we're not in a safe mode. + // A power brownout here could make it appear as if there's + // no SPI flash filesystem, and we might erase the existing one. + init_flash_fs(safe_mode == NO_SAFE_MODE); // Reset everything and prep MicroPython to run boot.py. reset_samd21(); |