diff --git a/cc3200/application.mk b/cc3200/application.mk index 0f393bd5418e3517b7fd9ef700a4580052caf6a2..7393bccc545ce6add35a5065a6ebb932fa0e0881 100644 --- a/cc3200/application.mk +++ b/cc3200/application.mk @@ -157,7 +157,6 @@ APP_LIB_SRC_C = $(addprefix lib/,\ APP_STM_SRC_C = $(addprefix stmhal/,\ bufhelper.c \ - file.c \ builtin_open.c \ import.c \ input.c \ diff --git a/cc3200/mods/moduos.c b/cc3200/mods/moduos.c index 1601ee5b0390db371cae04fba3658e51ec14511b..9538b679e2910afac62893894e1b6fffd96604da 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 "file.h" +#include "extmod/vfs_fat_file.h" #include "random.h" #include "mpexception.h" #include "version.h" diff --git a/cc3200/mpconfigport.h b/cc3200/mpconfigport.h index 97c89c6fe475f1145aac2de76ba274867e173d61..fd645618da4369c7c67ad63399a6c364b1ea6240 100644 --- a/cc3200/mpconfigport.h +++ b/cc3200/mpconfigport.h @@ -70,6 +70,7 @@ #define MICROPY_FATFS_REENTRANT (1) #define MICROPY_FATFS_TIMEOUT (2500) #define MICROPY_FATFS_SYNC_T SemaphoreHandle_t +#define MICROPY_FSUSERMOUNT_ADHOC (1) #define MICROPY_STREAMS_NON_BLOCK (1) #define MICROPY_MODULE_WEAK_LINKS (1) diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c index 0c0ea84b310e2a366e60a8b0e8b343f2e7c5dba0..f5dc565d1bf511c4c9821bc3505df6aa2d3483e3 100644 --- a/extmod/vfs_fat_file.c +++ b/extmod/vfs_fat_file.c @@ -25,7 +25,9 @@ */ #include "py/mpconfig.h" -#if MICROPY_FSUSERMOUNT +// *_ADHOC part is for cc3200 port which doesn't use general uPy +// infrastructure and instead duplicates code. TODO: Resolve. +#if MICROPY_FSUSERMOUNT || MICROPY_FSUSERMOUNT_ADHOC #include <stdio.h> #include <errno.h>