mirrors/micropython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extmod: Rename vfs_fat_file.h to vfs_fat.h.

Browse Source 
And move declaration of mp_fat_vfs_type to this file.
This commit is contained in:
Damien George 2017-01-27 15:04:17 +11:00
parent 143fa0ffeb
commit 32a1138b9f
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cc3200/mods/moduos.c
View File

@ -37,7 +37,7 @@
#include "moduos.h" #include "moduos.h"
#include "diskio.h" #include "diskio.h"
#include "sflash_diskio.h" #include "sflash_diskio.h"
#include "extmod/vfs_fat_file.h" #include "extmod/vfs_fat.h"
#include "random.h" #include "random.h"
#include "mpexception.h" #include "mpexception.h"
#include "version.h" #include "version.h"

3
esp8266/moduos.c
View File

@ -34,12 +34,11 @@
#include "py/runtime.h" #include "py/runtime.h"
#include "py/mperrno.h" #include "py/mperrno.h"
#include "extmod/misc.h" #include "extmod/misc.h"
#include "extmod/vfs_fat.h"
#include "genhdr/mpversion.h" #include "genhdr/mpversion.h"
#include "esp_mphal.h" #include "esp_mphal.h"
#include "user_interface.h" #include "user_interface.h"
extern const mp_obj_type_t mp_fat_vfs_type;
STATIC const qstr os_uname_info_fields[] = { STATIC const qstr os_uname_info_fields[] = {
MP_QSTR_sysname, MP_QSTR_nodename, MP_QSTR_sysname, MP_QSTR_nodename,
MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine

2
extmod/vfs_fat.c
View File

@ -37,7 +37,7 @@
#include "py/runtime.h" #include "py/runtime.h"
#include "py/mperrno.h" #include "py/mperrno.h"
#include "lib/oofatfs/ff.h" #include "lib/oofatfs/ff.h"
#include "extmod/vfs_fat_file.h" #include "extmod/vfs_fat.h"
#include "extmod/fsusermount.h" #include "extmod/fsusermount.h"
#include "timeutils.h" #include "timeutils.h"

1
extmod/vfs_fat_file.h → extmod/vfs_fat.h
View File

@ -27,6 +27,7 @@
struct _fs_user_mount_t; struct _fs_user_mount_t;
extern const byte fresult_to_errno_table[20]; extern const byte fresult_to_errno_table[20];
extern const mp_obj_type_t mp_fat_vfs_type;
struct _fs_user_mount_t *ff_get_vfs(const char **path); struct _fs_user_mount_t *ff_get_vfs(const char **path);

2
extmod/vfs_fat_ffconf.c
View File

@ -36,7 +36,7 @@
#include "lib/fatfs/ff.h" #include "lib/fatfs/ff.h"
#endif #endif
#include "extmod/fsusermount.h" #include "extmod/fsusermount.h"
#include "extmod/vfs_fat_file.h" #include "extmod/vfs_fat.h"
STATIC bool check_path(const TCHAR **path, const char *mount_point_str, mp_uint_t mount_point_len) { STATIC bool check_path(const TCHAR **path, const char *mount_point_str, mp_uint_t mount_point_len) {
if (strncmp(*path, mount_point_str, mount_point_len) == 0) { if (strncmp(*path, mount_point_str, mount_point_len) == 0) {

2
extmod/vfs_fat_file.c
View File

@ -42,7 +42,7 @@
#include "lib/fatfs/ff.h" #include "lib/fatfs/ff.h"
#endif #endif
#include "extmod/fsusermount.h" #include "extmod/fsusermount.h"
#include "extmod/vfs_fat_file.h" #include "extmod/vfs_fat.h"
#if MICROPY_VFS_FAT #if MICROPY_VFS_FAT
#define mp_type_fileio fatfs_type_fileio #define mp_type_fileio fatfs_type_fileio

2
extmod/vfs_fat_misc.c
View File

@ -37,7 +37,7 @@
#else #else
#include "lib/fatfs/ff.h" #include "lib/fatfs/ff.h"
#endif #endif
#include "extmod/vfs_fat_file.h" #include "extmod/vfs_fat.h"
#include "extmod/fsusermount.h" #include "extmod/fsusermount.h"
#include "py/lexer.h" #include "py/lexer.h"

2
extmod/vfs_fat_reader.c
View File

@ -38,7 +38,7 @@
#include "lib/fatfs/ff.h" #include "lib/fatfs/ff.h"
#endif #endif
#include "extmod/fsusermount.h" #include "extmod/fsusermount.h"
#include "extmod/vfs_fat_file.h" #include "extmod/vfs_fat.h"
typedef struct _mp_reader_fatfs_t { typedef struct _mp_reader_fatfs_t {
FIL fp; FIL fp;

2
stmhal/builtin_open.c
View File

@ -25,6 +25,6 @@
*/ */
#include "py/runtime.h" #include "py/runtime.h"
#include "extmod/vfs_fat_file.h" #include "extmod/vfs_fat.h"
MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, fatfs_builtin_open); MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, fatfs_builtin_open);

2
stmhal/moduos.c
View File

@ -37,7 +37,7 @@
#include "timeutils.h" #include "timeutils.h"
#include "rng.h" #include "rng.h"
#include "uart.h" #include "uart.h"
#include "extmod/vfs_fat_file.h" #include "extmod/vfs_fat.h"
#include "sdcard.h" #include "sdcard.h"
#include "extmod/fsusermount.h" #include "extmod/fsusermount.h"
#include "portmodules.h" #include "portmodules.h"

2
unix/modos.c
View File

@ -39,6 +39,7 @@
#include "py/objtuple.h" #include "py/objtuple.h"
#include "py/mphal.h" #include "py/mphal.h"
#include "extmod/misc.h" #include "extmod/misc.h"
#include "extmod/vfs_fat.h"
// Can't include this, as FATFS structure definition is required, // Can't include this, as FATFS structure definition is required,
// and FatFs header defining it conflicts with POSIX. // and FatFs header defining it conflicts with POSIX.
@ -46,7 +47,6 @@
MP_DECLARE_CONST_FUN_OBJ_KW(fsuser_mount_obj); MP_DECLARE_CONST_FUN_OBJ_KW(fsuser_mount_obj);
MP_DECLARE_CONST_FUN_OBJ_1(fsuser_umount_obj); MP_DECLARE_CONST_FUN_OBJ_1(fsuser_umount_obj);
MP_DECLARE_CONST_FUN_OBJ_KW(fsuser_mkfs_obj); MP_DECLARE_CONST_FUN_OBJ_KW(fsuser_mkfs_obj);
extern const mp_obj_type_t mp_fat_vfs_type;
#ifdef __ANDROID__ #ifdef __ANDROID__
#define USE_STATFS 1 #define USE_STATFS 1