diff options
Diffstat (limited to 'esp8266/moduos.c')
| -rw-r--r-- | esp8266/moduos.c | 95 |
1 files changed, 12 insertions, 83 deletions
diff --git a/esp8266/moduos.c b/esp8266/moduos.c index 5f5aab1662..006fc49d61 100644 --- a/esp8266/moduos.c +++ b/esp8266/moduos.c @@ -26,14 +26,10 @@ #include <string.h> -#include "py/mpconfig.h" -#include "py/nlr.h" -#include "py/obj.h" #include "py/objtuple.h" #include "py/objstr.h" -#include "py/runtime.h" -#include "py/mperrno.h" #include "extmod/misc.h" +#include "extmod/vfs.h" #include "extmod/vfs_fat.h" #include "genhdr/mpversion.h" #include "esp_mphal.h" @@ -70,74 +66,6 @@ STATIC mp_obj_t os_uname(void) { } STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname); -#if MICROPY_VFS_FAT -mp_obj_t vfs_proxy_call(qstr method_name, mp_uint_t n_args, const mp_obj_t *args) { - if (MP_STATE_PORT(fs_user_mount)[0] == NULL) { - mp_raise_OSError(MP_ENODEV); - } - - mp_obj_t meth[n_args + 2]; - mp_load_method(MP_STATE_PORT(fs_user_mount)[0], method_name, meth); - if (args != NULL) { - memcpy(meth + 2, args, n_args * sizeof(*args)); - } - return mp_call_method_n_kw(n_args, 0, meth); -} - -STATIC mp_obj_t os_listdir(mp_uint_t n_args, const mp_obj_t *args) { - return vfs_proxy_call(MP_QSTR_listdir, n_args, args); -} -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(os_listdir_obj, 0, 1, os_listdir); - -STATIC mp_obj_t os_mkdir(mp_obj_t path_in) { - return vfs_proxy_call(MP_QSTR_mkdir, 1, &path_in); -} -STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_mkdir_obj, os_mkdir); - -STATIC mp_obj_t os_rmdir(mp_obj_t path_in) { - return vfs_proxy_call(MP_QSTR_rmdir, 1, &path_in); -} -STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_rmdir_obj, os_rmdir); - -STATIC mp_obj_t os_chdir(mp_obj_t path_in) { - return vfs_proxy_call(MP_QSTR_chdir, 1, &path_in); -} -STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_chdir_obj, os_chdir); - -STATIC mp_obj_t os_getcwd(void) { - return vfs_proxy_call(MP_QSTR_getcwd, 0, NULL); -} -STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_getcwd_obj, os_getcwd); - -STATIC mp_obj_t os_remove(mp_obj_t path_in) { - return vfs_proxy_call(MP_QSTR_remove, 1, &path_in); -} -STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_remove_obj, os_remove); - -STATIC mp_obj_t os_rename(mp_obj_t path_old, mp_obj_t path_new) { - mp_obj_t args[2]; - args[0] = path_old; - args[1] = path_new; - return vfs_proxy_call(MP_QSTR_rename, 2, args); -} -STATIC MP_DEFINE_CONST_FUN_OBJ_2(os_rename_obj, os_rename); - -STATIC mp_obj_t os_stat(mp_obj_t path_in) { - return vfs_proxy_call(MP_QSTR_stat, 1, &path_in); -} -STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_stat_obj, os_stat); - -STATIC mp_obj_t os_statvfs(mp_obj_t path_in) { - return vfs_proxy_call(MP_QSTR_statvfs, 1, &path_in); -} -STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_statvfs_obj, os_statvfs); - -STATIC mp_obj_t os_umount(void) { - return vfs_proxy_call(MP_QSTR_umount, 0, NULL); -} -STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_umount_obj, os_umount); -#endif - STATIC mp_obj_t os_urandom(mp_obj_t num) { mp_int_t n = mp_obj_get_int(num); vstr_t vstr; @@ -166,16 +94,17 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = { #endif #if MICROPY_VFS_FAT { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) }, - { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&os_listdir_obj) }, - { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&os_mkdir_obj) }, - { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&os_rmdir_obj) }, - { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&os_chdir_obj) }, - { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&os_getcwd_obj) }, - { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&os_remove_obj) }, - { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&os_rename_obj) }, - { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&os_stat_obj) }, - { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&os_statvfs_obj) }, - { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&os_umount_obj) }, + { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) }, + { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) }, + { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) }, + { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) }, + { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) }, + { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) }, + { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mp_vfs_rename_obj) }, + { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) }, + { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) }, + { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) }, + { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) }, #endif }; |