cc3200: Fix breakage after VfsFat refactor.

micropython · Feb 15, 2016 · 4cd45f4 · 4cd45f4
1 parent 46a0ac0
commit 4cd45f4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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>