esp8266/main: mp_builtin_open(): Implement, using vfs_proxy_call().

pfalcon · pfalcon · commit c734de490a03 · 2016-04-10T16:59:19.000+03:00
diff --git a/esp8266/main.c b/esp8266/main.c
@@ -123,8 +123,14 @@ mp_import_stat_t mp_import_stat(const char *path) {
     #endif
 }
 
+mp_obj_t vfs_proxy_call(qstr method_name, mp_uint_t n_args, const mp_obj_t *args);
 mp_obj_t mp_builtin_open(uint n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    #if MICROPY_VFS_FAT
+    // TODO: Handle kwargs!
+    return vfs_proxy_call(MP_QSTR_open, n_args, args);
+    #else
     return mp_const_none;
+    #endif
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
 
diff --git a/esp8266/moduos.c b/esp8266/moduos.c
@@ -72,7 +72,7 @@ STATIC mp_obj_t os_uname(void) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
 
 #if MICROPY_VFS_FAT
-STATIC mp_obj_t vfs_proxy_call(qstr method_name, mp_uint_t n_args, const mp_obj_t *args) {
+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) {
         nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(ENODEV)));
     }

Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,14 @@ mp_import_stat_t mp_import_stat(const char *path) {`
`123`	`123`	`#endif`
`124`	`124`	`}`
`125`	`125`
	`126`	`+mp_obj_t vfs_proxy_call(qstr method_name, mp_uint_t n_args, const mp_obj_t *args);`
`126`	`127`	`mp_obj_t mp_builtin_open(uint n_args, const mp_obj_t args, mp_map_t kwargs) {`
	`128`	`+ #if MICROPY_VFS_FAT`
	`129`	`+ // TODO: Handle kwargs!`
	`130`	`+ return vfs_proxy_call(MP_QSTR_open, n_args, args);`
	`131`	`+ #else`
`127`	`132`	`return mp_const_none;`
	`133`	`+ #endif`
`128`	`134`	`}`
`129`	`135`	`MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);`
`130`	`136`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ STATIC mp_obj_t os_uname(void) {`
`72`	`72`	`STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);`
`73`	`73`
`74`	`74`	`#if MICROPY_VFS_FAT`
`75`		`-STATIC mp_obj_t vfs_proxy_call(qstr method_name, mp_uint_t n_args, const mp_obj_t *args) {`
	`75`	`+mp_obj_t vfs_proxy_call(qstr method_name, mp_uint_t n_args, const mp_obj_t *args) {`
`76`	`76`	`if (MP_STATE_PORT(fs_user_mount)[0] == NULL) {`
`77`	`77`	`nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(ENODEV)));`
`78`	`78`	`}`