stmhal: FatFS configuration moved to the library folder.

Alex March · dpgeorge · commit 748509a93cec · 2015-11-08T22:21:17.000Z
Port specific settings defined in mpconfigport.
diff --git a/stmhal/diskio.c b/stmhal/diskio.c
@@ -34,7 +34,7 @@
 
 #include "py/runtime.h"
 #include "lib/fatfs/ff.h"        /* FatFs lower layer API */
-#include "lib/fatfs/diskio.h"        /* FatFs lower layer API */
+#include "lib/fatfs/diskio.h"    /* FatFs lower layer API */
 #include "rtc.h"
 #include "storage.h"
 #include "sdcard.h"
@@ -50,10 +50,6 @@ const PARTITION VolToPart[] = {
     */
 };
 
-/* Definitions of physical drive number for each media */
-#define PD_FLASH (0)
-#define PD_SDCARD (1)
-#define PD_USER (2)
 
 /*-----------------------------------------------------------------------*/
 /* Initialize a Drive                                                    */
diff --git a/stmhal/ffconf.c b/stmhal/ffconf.c
@@ -28,7 +28,8 @@
 
 #include "py/mpstate.h"
 #include "lib/fatfs/ff.h"
-#include "ffconf.h"
+#include "lib/fatfs/ffconf.h"
+#include "lib/fatfs/diskio.h"
 #include "fsusermount.h"
 
 STATIC bool check_path(const TCHAR **path, const char *mount_point_str, mp_uint_t mount_point_len) {
@@ -60,21 +61,21 @@ int ff_get_ldnumber (const TCHAR **path) {
     }
 
     if (check_path(path, "/flash", 6)) {
-        return 0;
+        return PD_FLASH;
     } else if (check_path(path, "/sd", 3)) {
-        return 1;
+        return PD_SDCARD;
     } else if (MP_STATE_PORT(fs_user_mount) != NULL && check_path(path, MP_STATE_PORT(fs_user_mount)->str, MP_STATE_PORT(fs_user_mount)->len)) {
-        return 2;
+        return PD_USER;
     } else {
         return -1;
     }
 }
 
 void ff_get_volname(BYTE vol, TCHAR **dest) {
-    if (vol == 0) {
+    if (vol == PD_FLASH) {
         memcpy(*dest, "/flash", 6);
         *dest += 6;
-    } else if (vol == 1) {
+    } else if (vol == PD_SDCARD) {
         memcpy(*dest, "/sd", 3);
         *dest += 3;
     } else {
diff --git a/stmhal/ffconf.h b/stmhal/ffconf.h
diff --git a/stmhal/mpconfigport.h b/stmhal/mpconfigport.h
@@ -46,14 +46,15 @@
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
 #define MICROPY_OPT_COMPUTED_GOTO   (1)
 #define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (0)
-/* Enable FatFS LFNs
-    0: Disable LFN feature.
-    1: Enable LFN with static working buffer on the BSS. Always NOT reentrant.
-    2: Enable LFN with dynamic working buffer on the STACK.
-    3: Enable LFN with dynamic working buffer on the HEAP.
-*/
-#define MICROPY_ENABLE_LFN          (1)
-#define MICROPY_LFN_CODE_PAGE       (437) /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
+
+// fatfs configuration used in ffconf.h
+#define MICROPY_FATFS_ENABLE_LFN       (1)
+#define MICROPY_FATFS_LFN_CODE_PAGE    (437) /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
+#define MICROPY_FATFS_USE_LABEL        (1)
+#define MICROPY_FATFS_RPATH            (2)
+#define MICROPY_FATFS_VOLUMES          (3)
+#define MICROPY_FATFS_MULTI_PARTITION  (1)
+
 #define MICROPY_STREAMS_NON_BLOCK   (1)
 #define MICROPY_MODULE_WEAK_LINKS   (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS (1)
