extmod: Rename vfs_fat_file.h to vfs_fat.h.

And move declaration of mp_fat_vfs_type to this file.

11 files changed, 11 insertions, 11 deletions

diff --git a/cc3200/mods/moduos.c b/cc3200/mods/moduos.c
index d5b29336af..1c9932b8e7 100644
--- a/cc3200/mods/moduos.c
+++ b/cc3200/mods/moduos.c
@@ -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"
diff --git a/esp8266/moduos.c b/esp8266/moduos.c
index e9c4c3e8cc..5f5aab1662 100644
--- a/esp8266/moduos.c
+++ b/esp8266/moduos.c
@@ -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
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 36bdb5dbde..36e5031a83 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -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"
 
diff --git a/extmod/vfs_fat_file.h b/extmod/vfs_fat.h
index 9693aa04a2..441b35c045 100644
--- a/extmod/vfs_fat_file.h
+++ b/extmod/vfs_fat.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);
 
diff --git a/extmod/vfs_fat_ffconf.c b/extmod/vfs_fat_ffconf.c
index ddcdd88444..89081380e1 100644
--- a/extmod/vfs_fat_ffconf.c
+++ b/extmod/vfs_fat_ffconf.c
@@ -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) {
diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
index 6651d70d05..ea332709e4 100644
--- a/extmod/vfs_fat_file.c
+++ b/extmod/vfs_fat_file.c
@@ -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
diff --git a/extmod/vfs_fat_misc.c b/extmod/vfs_fat_misc.c
index 5e89009cd3..ea267a15fa 100644
--- a/extmod/vfs_fat_misc.c
+++ b/extmod/vfs_fat_misc.c
@@ -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"
 
diff --git a/extmod/vfs_fat_reader.c b/extmod/vfs_fat_reader.c
index efd2de0c16..b9abf3ad71 100644
--- a/extmod/vfs_fat_reader.c
+++ b/extmod/vfs_fat_reader.c
@@ -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;
diff --git a/stmhal/builtin_open.c b/stmhal/builtin_open.c
index 697eec8eaa..56b98ea61c 100644
--- a/stmhal/builtin_open.c
+++ b/stmhal/builtin_open.c
@@ -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);
diff --git a/stmhal/moduos.c b/stmhal/moduos.c
index b3c6570a5b..158e530ff4 100644
--- a/stmhal/moduos.c
+++ b/stmhal/moduos.c
@@ -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"
diff --git a/unix/modos.c b/unix/modos.c
index 72f5d872e4..c35b246dd0 100644
--- a/unix/modos.c
+++ b/unix/modos.c
@@ -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