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

Merge pull request #1245 from jerryneedell/jerryn_erase

Browse Source 
add force_create to nrf filesystem_init()
This commit is contained in:
Dan Halbert 2018-10-06 16:57:23 -04:00 committed by GitHub
commit 122859447e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/nrf/supervisor/filesystem.c
View File

@ -36,7 +36,7 @@ static mp_vfs_mount_t _mp_vfs;
static fs_user_mount_t _internal_vfs; static fs_user_mount_t _internal_vfs;
void filesystem_init(bool create_allowed) { void filesystem_init(bool create_allowed, bool force_create) {
// init the vfs object // init the vfs object
fs_user_mount_t *int_vfs = &_internal_vfs; fs_user_mount_t *int_vfs = &_internal_vfs;
int_vfs->flags = 0; int_vfs->flags = 0;
@ -45,7 +45,7 @@ void filesystem_init(bool create_allowed) {
// try to mount the flash // try to mount the flash
FRESULT res = f_mount(&int_vfs->fatfs); FRESULT res = f_mount(&int_vfs->fatfs);
if (res == FR_NO_FILESYSTEM && create_allowed) { if ((res == FR_NO_FILESYSTEM && create_allowed) || force_create) {
// no filesystem so create a fresh one // no filesystem so create a fresh one
uint8_t working_buf[_MAX_SS]; uint8_t working_buf[_MAX_SS];
res = f_mkfs(&int_vfs->fatfs, FM_FAT | FM_SFD, 4096, working_buf, sizeof(working_buf)); res = f_mkfs(&int_vfs->fatfs, FM_FAT | FM_SFD, 4096, working_buf, sizeof(working_buf));