From e8e116e7fc35623dd9c429c57f4e98fdc3339ef1 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Mon, 28 Mar 2016 12:44:36 +0300
Subject: [PATCH] esp8266/moduos: Factor out VFS method proxy helper.
---
esp8266/moduos.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/esp8266/moduos.c b/esp8266/moduos.c
index 417e2064b..36bd8137e 100644
--- a/esp8266/moduos.c
+++ b/esp8266/moduos.c
@@ -68,16 +68,20 @@ STATIC mp_obj_t os_uname(void) {
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
-STATIC mp_obj_t os_listdir(mp_uint_t n_args, const mp_obj_t *args) {
+STATIC 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)));
}
mp_obj_t meth[n_args + 2];
- mp_load_method(MP_STATE_PORT(fs_user_mount)[0], MP_QSTR_listdir, meth);
+ mp_load_method(MP_STATE_PORT(fs_user_mount)[0], method_name, meth);
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 const mp_rom_map_elem_t os_module_globals_table[] = {
--
GitLab