diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-02-15 00:16:46 +0200 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-02-15 00:16:46 +0200 |
| commit | 6b0c88256b03de63280eb7b704f5b6aaa5e9cc46 (patch) | |
| tree | 93ef978091acb342b01ebafee83fbf1077525b94 | |
| parent | 8cb78e0e5356134e9313e745667297d6b9dc46ed (diff) | |
| download | micropython-6b0c88256b03de63280eb7b704f5b6aaa5e9cc46.tar.gz micropython-6b0c88256b03de63280eb7b704f5b6aaa5e9cc46.zip | |
extmod/vfs_fat_file: Reusable FatFs module, move from stmhal/file.
| -rw-r--r-- | extmod/vfs_fat.c | 2 | ||||
| -rw-r--r-- | extmod/vfs_fat_file.c (renamed from stmhal/file.c) | 7 | ||||
| -rw-r--r-- | extmod/vfs_fat_file.h (renamed from stmhal/file.h) | 0 | ||||
| -rw-r--r-- | py/py.mk | 1 | ||||
| -rw-r--r-- | stmhal/Makefile | 1 | ||||
| -rw-r--r-- | stmhal/builtin_open.c | 2 | ||||
| -rw-r--r-- | stmhal/moduos.c | 2 | ||||
| -rw-r--r-- | unix/Makefile | 3 |
8 files changed, 11 insertions, 7 deletions
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c index 607a736a78..b408dca0c8 100644 --- a/extmod/vfs_fat.c +++ b/extmod/vfs_fat.c @@ -32,7 +32,7 @@ #include "py/runtime.h" #include "lib/fatfs/ff.h" #include "lib/fatfs/diskio.h" -#include "stmhal/file.h" +#include "extmod/vfs_fat_file.h" #include "fsusermount.h" #define mp_obj_fat_vfs_t fs_user_mount_t diff --git a/stmhal/file.c b/extmod/vfs_fat_file.c index 20400a572f..0c0ea84b31 100644 --- a/stmhal/file.c +++ b/extmod/vfs_fat_file.c @@ -24,6 +24,9 @@ * THE SOFTWARE. */ +#include "py/mpconfig.h" +#if MICROPY_FSUSERMOUNT + #include <stdio.h> #include <errno.h> @@ -31,7 +34,7 @@ #include "py/runtime.h" #include "py/stream.h" #include "lib/fatfs/ff.h" -#include "file.h" +#include "extmod/vfs_fat_file.h" #if MICROPY_VFS_FAT #define mp_type_fileio fatfs_type_fileio @@ -284,3 +287,5 @@ mp_obj_t fatfs_builtin_open(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw mp_arg_parse_all(n_args, args, kwargs, FILE_OPEN_NUM_ARGS, file_open_args, arg_vals); return file_open(&mp_type_textio, arg_vals); } + +#endif // MICROPY_FSUSERMOUNT diff --git a/stmhal/file.h b/extmod/vfs_fat_file.h index e62fd826f6..e62fd826f6 100644 --- a/stmhal/file.h +++ b/extmod/vfs_fat_file.h @@ -172,6 +172,7 @@ PY_O_BASENAME = \ ../extmod/fsusermount.o \ ../extmod/vfs_fat.o \ ../extmod/vfs_fat_diskio.o \ + ../extmod/vfs_fat_file.o \ ../extmod/moduos_dupterm.o \ # prepend the build destination prefix to the py object files diff --git a/stmhal/Makefile b/stmhal/Makefile index cd565a6f4a..884a40fda9 100644 --- a/stmhal/Makefile +++ b/stmhal/Makefile @@ -153,7 +153,6 @@ SRC_C = \ rtc.c \ flash.c \ storage.c \ - file.c \ builtin_open.c \ sdcard.c \ fatfs_port.c \ diff --git a/stmhal/builtin_open.c b/stmhal/builtin_open.c index c7e183f91b..697eec8eaa 100644 --- a/stmhal/builtin_open.c +++ b/stmhal/builtin_open.c @@ -25,6 +25,6 @@ */ #include "py/runtime.h" -#include "file.h" +#include "extmod/vfs_fat_file.h" MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, fatfs_builtin_open); diff --git a/stmhal/moduos.c b/stmhal/moduos.c index 293fbabafc..75cb8986d0 100644 --- a/stmhal/moduos.c +++ b/stmhal/moduos.c @@ -36,7 +36,7 @@ #include "timeutils.h" #include "rng.h" #include "uart.h" -#include "file.h" +#include "extmod/vfs_fat_file.h" #include "sdcard.h" #include "extmod/fsusermount.h" #include "portmodules.h" diff --git a/unix/Makefile b/unix/Makefile index 342786debe..18186ec566 100644 --- a/unix/Makefile +++ b/unix/Makefile @@ -148,8 +148,7 @@ SRC_C = \ $(SRC_MOD) STMHAL_SRC_C = \ - stmhal/ffconf.c \ - stmhal/file.c + stmhal/ffconf.c # Include builtin package manager in the standard build (and coverage) ifeq ($(PROG),micropython) |