Skip to content

Commit f35aae3

Browse files
dpgeorgedpgeorge
committed
extmod/vfs_fat: Rename FileIO/TextIO types to mp_type_vfs_fat_XXX.
So they don't clash with other VFS implementations.
1 parent 172c23f commit f35aae3

6 files changed

Lines changed: 15 additions & 19 deletions

File tree

‎extmod/vfs_fat.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ typedef struct _fs_user_mount_t {
5555

5656
extern const byte fresult_to_errno_table[20];
5757
extern const mp_obj_type_t mp_fat_vfs_type;
58+
extern const mp_obj_type_t mp_type_vfs_fat_fileio;
59+
extern const mp_obj_type_t mp_type_vfs_fat_textio;
5860

5961
mp_import_stat_t fat_vfs_import_stat(struct _fs_user_mount_t *vfs, const char *path);
6062
MP_DECLARE_CONST_FUN_OBJ_3(fat_vfs_open_obj);

‎extmod/vfs_fat_file.c‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@
3535
#include "lib/oofatfs/ff.h"
3636
#include "extmod/vfs_fat.h"
3737

38-
#define mp_type_fileio fatfs_type_fileio
39-
#define mp_type_textio fatfs_type_textio
40-
41-
extern const mp_obj_type_t mp_type_fileio;
42-
extern const mp_obj_type_t mp_type_textio;
43-
4438
// this table converts from FRESULT to POSIX errno
4539
const byte fresult_to_errno_table[20] = {
4640
[FR_OK] = 0,
@@ -189,11 +183,11 @@ STATIC mp_obj_t file_open(fs_user_mount_t *vfs, const mp_obj_type_t *type, mp_ar
189183
break;
190184
#if MICROPY_PY_IO_FILEIO
191185
case 'b':
192-
type = &mp_type_fileio;
186+
type = &mp_type_vfs_fat_fileio;
193187
break;
194188
#endif
195189
case 't':
196-
type = &mp_type_textio;
190+
type = &mp_type_vfs_fat_textio;
197191
break;
198192
}
199193
}
@@ -249,7 +243,7 @@ STATIC const mp_stream_p_t fileio_stream_p = {
249243
.ioctl = file_obj_ioctl,
250244
};
251245

252-
const mp_obj_type_t mp_type_fileio = {
246+
const mp_obj_type_t mp_type_vfs_fat_fileio = {
253247
{ &mp_type_type },
254248
.name = MP_QSTR_FileIO,
255249
.print = file_obj_print,
@@ -268,7 +262,7 @@ STATIC const mp_stream_p_t textio_stream_p = {
268262
.is_text = true,
269263
};
270264

271-
const mp_obj_type_t mp_type_textio = {
265+
const mp_obj_type_t mp_type_vfs_fat_textio = {
272266
{ &mp_type_type },
273267
.name = MP_QSTR_TextIOWrapper,
274268
.print = file_obj_print,
@@ -287,7 +281,7 @@ STATIC mp_obj_t fatfs_builtin_open_self(mp_obj_t self_in, mp_obj_t path, mp_obj_
287281
arg_vals[0].u_obj = path;
288282
arg_vals[1].u_obj = mode;
289283
arg_vals[2].u_obj = mp_const_none;
290-
return file_open(self, &mp_type_textio, arg_vals);
284+
return file_open(self, &mp_type_vfs_fat_textio, arg_vals);
291285
}
292286
MP_DEFINE_CONST_FUN_OBJ_3(fat_vfs_open_obj, fatfs_builtin_open_self);
293287

‎ports/cc3200/mpconfigport.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
X(ETIMEDOUT) \
132132

133133
// TODO these should be generic, not bound to fatfs
134-
#define mp_type_fileio fatfs_type_fileio
135-
#define mp_type_textio fatfs_type_textio
134+
#define mp_type_fileio mp_type_vfs_fat_fileio
135+
#define mp_type_textio mp_type_vfs_fat_textio
136136

137137
// use vfs's functions for import stat and builtin open
138138
#define mp_import_stat mp_vfs_import_stat

‎ports/esp32/mpconfigport.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@
152152
#define MICROPY_FATFS_RPATH (2)
153153
#define MICROPY_FATFS_MAX_SS (4096)
154154
#define MICROPY_FATFS_LFN_CODE_PAGE (437) /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
155-
#define mp_type_fileio fatfs_type_fileio
156-
#define mp_type_textio fatfs_type_textio
155+
#define mp_type_fileio mp_type_vfs_fat_fileio
156+
#define mp_type_textio mp_type_vfs_fat_textio
157157

158158
// use vfs's functions for import stat and builtin open
159159
#define mp_import_stat mp_vfs_import_stat

‎ports/esp8266/mpconfigport.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ typedef uint32_t sys_prot_t; // for modlwip
141141
void *esp_native_code_commit(void*, size_t);
142142
#define MP_PLAT_COMMIT_EXEC(buf, len) esp_native_code_commit(buf, len)
143143

144-
#define mp_type_fileio fatfs_type_fileio
145-
#define mp_type_textio fatfs_type_textio
144+
#define mp_type_fileio mp_type_vfs_fat_fileio
145+
#define mp_type_textio mp_type_vfs_fat_textio
146146

147147
// use vfs's functions for import stat and builtin open
148148
#define mp_import_stat mp_vfs_import_stat

‎ports/stm32/mpconfigport.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@
161161
#define MICROPY_FATFS_MULTI_PARTITION (1)
162162

163163
// TODO these should be generic, not bound to fatfs
164-
#define mp_type_fileio fatfs_type_fileio
165-
#define mp_type_textio fatfs_type_textio
164+
#define mp_type_fileio mp_type_vfs_fat_fileio
165+
#define mp_type_textio mp_type_vfs_fat_textio
166166

167167
// use vfs's functions for import stat and builtin open
168168
#define mp_import_stat mp_vfs_import_stat

0 commit comments

Comments
 (0)