extmod: Rename vfs_fat_file.h to vfs_fat.h.
And move declaration of mp_fat_vfs_type to this file.
This commit is contained in:
parent
143fa0ffeb
commit
32a1138b9f
@ -37,7 +37,7 @@
|
||||
#include "moduos.h"
|
||||
#include "diskio.h"
|
||||
#include "sflash_diskio.h"
|
||||
#include "extmod/vfs_fat_file.h"
|
||||
#include "extmod/vfs_fat.h"
|
||||
#include "random.h"
|
||||
#include "mpexception.h"
|
||||
#include "version.h"
|
||||
|
@ -34,12 +34,11 @@
|
||||
#include "py/runtime.h"
|
||||
#include "py/mperrno.h"
|
||||
#include "extmod/misc.h"
|
||||
#include "extmod/vfs_fat.h"
|
||||
#include "genhdr/mpversion.h"
|
||||
#include "esp_mphal.h"
|
||||
#include "user_interface.h"
|
||||
|
||||
extern const mp_obj_type_t mp_fat_vfs_type;
|
||||
|
||||
STATIC const qstr os_uname_info_fields[] = {
|
||||
MP_QSTR_sysname, MP_QSTR_nodename,
|
||||
MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
|
||||
|
@ -37,7 +37,7 @@
|
||||
#include "py/runtime.h"
|
||||
#include "py/mperrno.h"
|
||||
#include "lib/oofatfs/ff.h"
|
||||
#include "extmod/vfs_fat_file.h"
|
||||
#include "extmod/vfs_fat.h"
|
||||
#include "extmod/fsusermount.h"
|
||||
#include "timeutils.h"
|
||||
|
||||
|
@ -27,6 +27,7 @@
|
||||
struct _fs_user_mount_t;
|
||||
|
||||
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);
|
||||
|
@ -36,7 +36,7 @@
|
||||
#include "lib/fatfs/ff.h"
|
||||
#endif
|
||||
#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) {
|
||||
if (strncmp(*path, mount_point_str, mount_point_len) == 0) {
|
||||
|
@ -42,7 +42,7 @@
|
||||
#include "lib/fatfs/ff.h"
|
||||
#endif
|
||||
#include "extmod/fsusermount.h"
|
||||
#include "extmod/vfs_fat_file.h"
|
||||
#include "extmod/vfs_fat.h"
|
||||
|
||||
#if MICROPY_VFS_FAT
|
||||
#define mp_type_fileio fatfs_type_fileio
|
||||
|
@ -37,7 +37,7 @@
|
||||
#else
|
||||
#include "lib/fatfs/ff.h"
|
||||
#endif
|
||||
#include "extmod/vfs_fat_file.h"
|
||||
#include "extmod/vfs_fat.h"
|
||||
#include "extmod/fsusermount.h"
|
||||
#include "py/lexer.h"
|
||||
|
||||
|
@ -38,7 +38,7 @@
|
||||
#include "lib/fatfs/ff.h"
|
||||
#endif
|
||||
#include "extmod/fsusermount.h"
|
||||
#include "extmod/vfs_fat_file.h"
|
||||
#include "extmod/vfs_fat.h"
|
||||
|
||||
typedef struct _mp_reader_fatfs_t {
|
||||
FIL fp;
|
||||
|
@ -25,6 +25,6 @@
|
||||
*/
|
||||
|
||||
#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);
|
||||
|
@ -37,7 +37,7 @@
|
||||
#include "timeutils.h"
|
||||
#include "rng.h"
|
||||
#include "uart.h"
|
||||
#include "extmod/vfs_fat_file.h"
|
||||
#include "extmod/vfs_fat.h"
|
||||
#include "sdcard.h"
|
||||
#include "extmod/fsusermount.h"
|
||||
#include "portmodules.h"
|
||||
|
@ -39,6 +39,7 @@
|
||||
#include "py/objtuple.h"
|
||||
#include "py/mphal.h"
|
||||
#include "extmod/misc.h"
|
||||
#include "extmod/vfs_fat.h"
|
||||
|
||||
// Can't include this, as FATFS structure definition is required,
|
||||
// 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_1(fsuser_umount_obj);
|
||||
MP_DECLARE_CONST_FUN_OBJ_KW(fsuser_mkfs_obj);
|
||||
extern const mp_obj_type_t mp_fat_vfs_type;
|
||||
|
||||
#ifdef __ANDROID__
|
||||
#define USE_STATFS 1
|
||||
|
Loading…
x
Reference in New Issue
Block a user