extmod/vfs_fat_ffconf: Reusable FatFs module, move from stmhal/ffconf.

TODO: Probably merge into vfs_fat_diskio.
micropython · Feb 14, 2016 · 46a0ac0 · 46a0ac0
1 parent 6b0c882
commit 46a0ac0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/stmhal/ffconf.c → extmod/vfs_fat_ffconf.c b/stmhal/ffconf.c → extmod/vfs_fat_ffconf.c
@@ -24,6 +24,9 @@
  * THE SOFTWARE.
  */
 
+#include "py/mpconfig.h"
+#if MICROPY_FSUSERMOUNT
+
 #include <string.h>
 
 #include "py/mpstate.h"
@@ -75,3 +78,5 @@ void ff_get_volname(BYTE vol, TCHAR **dest) {
     memcpy(*dest, vfs->str, vfs->len);
     *dest += vfs->len;
 }
+
+#endif // MICROPY_FSUSERMOUNT
diff --git a/py/py.mk b/py/py.mk
@@ -171,6 +171,7 @@ PY_O_BASENAME = \
 	../extmod/modurandom.o \
 	../extmod/fsusermount.o \
 	../extmod/vfs_fat.o \
+	../extmod/vfs_fat_ffconf.o \
 	../extmod/vfs_fat_diskio.o \
 	../extmod/vfs_fat_file.o \
 	../extmod/moduos_dupterm.o \

diff --git a/stmhal/Makefile b/stmhal/Makefile
@@ -156,7 +156,6 @@ SRC_C = \
 	builtin_open.c \
 	sdcard.c \
 	fatfs_port.c \
-	ffconf.c \
 	lcd.c \
 	accel.c \
 	servo.c \

diff --git a/unix/Makefile b/unix/Makefile
@@ -147,9 +147,6 @@ SRC_C = \
 	fatfs_port.c \
 	$(SRC_MOD)
 
-STMHAL_SRC_C = \
-	stmhal/ffconf.c
-
 # Include builtin package manager in the standard build (and coverage)
 ifeq ($(PROG),micropython)
 SRC_C += $(BUILD)/_frozen_upip.c