m5/M5Stack_MicroPython
0
0
Fork 0
mirror of https://github.com/m5stack/M5Stack_MicroPython.git synced 2026-05-20 10:14:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in unmounting sdcard causing issues with rshell

Browse Source 
Fixed bug in curl module affecting sendmail
This commit is contained in:
Boris Lovosevic
2018-01-16 01:34:47 +01:00
parent 934917e19e
commit 927966dbc7
18 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MicroPython_BUILD/components/micropython/extmod/vfs_native.c
+33 -32
View File
@@ -881,6 +881,39 @@ STATIC mp_obj_t native_vfs_umount(mp_obj_t self_in) {
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(native_vfs_umount_obj, native_vfs_umount);
//------------------
int internalUmount()
{
int res = 0;
if (native_vfs_mounted[VFS_NATIVE_TYPE_SPIFLASH]) {
#if MICROPY_USE_SPIFFS
res = esp_vfs_spiffs_unregister("internalfs");
if (res) res = 0;
#else
if (s_wl_handle != WL_INVALID_HANDLE) res = wl_unmount(s_wl_handle);
if (res) res = 0;
#endif
native_vfs_mounted[VFS_NATIVE_TYPE_SPIFLASH] = false;
}
return res;
}
//-----------------
int externalUmount()
{
int res = 0;
if (native_vfs_mounted[VFS_NATIVE_TYPE_SDCARD]) {
esp_vfs_fat_sdmmc_unmount();
if (res) res = 0;
#if defined(CONFIG_SDCARD_MODE1)
sdspi_host_deinit();
#endif
native_vfs_mounted[VFS_NATIVE_TYPE_SDCARD] = false;
}
return res;
}
//-------------------------------------
int mount_vfs(int type, char *chdir_to)
@@ -913,38 +946,6 @@ int mount_vfs(int type, char *chdir_to)
return 0;
}
//------------------
int internalUmount()
{
int res = 0;
if (native_vfs_mounted[VFS_NATIVE_TYPE_SPIFLASH]) {
#if MICROPY_USE_SPIFFS
res = esp_vfs_spiffs_unregister(NULL);
if (res) res = 0;
#else
if (s_wl_handle != WL_INVALID_HANDLE) res = wl_unmount(s_wl_handle);
if (res) res = 0;
#endif
}
return res;
}
//-----------------
int externalUmount()
{
int res = 0;
if (native_vfs_mounted[VFS_NATIVE_TYPE_SDCARD]) {
esp_vfs_fat_sdmmc_unmount();
if (res) res = 0;
#if defined(CONFIG_SDCARD_MODE1)
sdspi_host_deinit();
#endif
}
return res;
}
//===============================================================
STATIC const mp_rom_map_elem_t native_vfs_locals_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR_mkfs), MP_ROM_PTR(&native_vfs_mkfs_obj) },