domdfcoding
diff --git a/‎cc3200/fatfs/src/diskio.c
Lines changed: 7 additions & 7 deletions b/‎cc3200/fatfs/src/diskio.c
Lines changed: 7 additions & 7 deletions
diff --git a/‎cc3200/fatfs/src/diskio.h
Lines changed: 0 additions & 64 deletions b/‎cc3200/fatfs/src/diskio.h
Lines changed: 0 additions & 64 deletions
diff --git a/‎cc3200/fatfs/src/ffconf.c
Lines changed: 5 additions & 5 deletions b/‎cc3200/fatfs/src/ffconf.c
Lines changed: 5 additions & 5 deletions
@@ -12,7 +12,8 @@
 #include "py/mpconfig.h"
 #include "py/runtime.h"
 #include "py/obj.h"
-#include "diskio.h"             /* FatFs lower layer API */
+#include "lib/fatfs/ff.h"
+#include "lib/fatfs/diskio.h"   /* FatFs lower layer API */
 #include "sflash_diskio.h"      /* Serial flash disk IO API */
 #include "sd_diskio.h"          /* SDCARD disk IO API */
 #include "inc/hw_types.h"
@@ -22,7 +23,6 @@
 #include "prcm.h"
 #include "pybrtc.h"
 #include "timeutils.h"
-#include "ff.h"
 #include "pybsd.h"
 #include "moduos.h"
 
@@ -35,7 +35,7 @@ DSTATUS disk_status (
 	BYTE pdrv		/* Physical drive nmuber to identify the drive */
 )
 {
-    if (pdrv == FLASH) {
+    if (pdrv == PD_FLASH) {
         return sflash_disk_status();
     } else {
         os_fs_mount_t *mount_obj;
@@ -57,7 +57,7 @@ DSTATUS disk_initialize (
 	BYTE pdrv				/* Physical drive nmuber to identify the drive */
 )
 {
-    if (pdrv == FLASH) {
+    if (pdrv == PD_FLASH) {
         if (RES_OK != sflash_disk_init()) {
             return STA_NOINIT;
         }
@@ -84,7 +84,7 @@ DRESULT disk_read (
 	UINT count		/* Number of sectors to read */
 )
 {
-    if (pdrv == FLASH) {
+    if (pdrv == PD_FLASH) {
         return sflash_disk_read(buff, sector, count);
     } else {
         os_fs_mount_t *mount_obj;
@@ -115,7 +115,7 @@ DRESULT disk_write (
 	UINT count			/* Number of sectors to write */
 )
 {
-    if (pdrv == FLASH) {
+    if (pdrv == PD_FLASH) {
         return sflash_disk_write(buff, sector, count);
     } else {
         os_fs_mount_t *mount_obj;
@@ -147,7 +147,7 @@ DRESULT disk_ioctl (
 	void *buff		/* Buffer to send/receive control data */
 )
 {
-    if (pdrv == FLASH) {
+    if (pdrv == PD_FLASH) {
         switch (cmd) {
         case CTRL_SYNC:
             return sflash_disk_flush();
 
@@ -27,9 +27,9 @@
 #include <string.h>
 
 #include "py/mpstate.h"
-#include "ff.h"
-#include "ffconf.h"
-#include "diskio.h"
+#include "lib/fatfs/ff.h"
+#include "lib/fatfs/ffconf.h"
+#include "lib/fatfs/diskio.h"
 #include "moduos.h"
 
 #if _FS_RPATH
@@ -65,7 +65,7 @@ int ff_get_ldnumber (const TCHAR **path) {
     }
 
     if (check_path(path, "/flash", 6)) {
-        return FLASH;
+        return PD_FLASH;
     }
     else {
         for (mp_uint_t i = 0; i < MP_STATE_PORT(mount_obj_list).len; i++) {
@@ -80,7 +80,7 @@ int ff_get_ldnumber (const TCHAR **path) {
 }
 
 void ff_get_volname(BYTE vol, TCHAR **dest) {
-    if (vol == FLASH) {
+    if (vol == PD_FLASH) {
         memcpy(*dest, "/flash", 6);
         *dest += 6;
     } else {
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@`
`12`	`12`	`#include "py/mpconfig.h"`
`13`	`13`	`#include "py/runtime.h"`
`14`	`14`	`#include "py/obj.h"`
`15`		`-#include "diskio.h" /* FatFs lower layer API */`
	`15`	`+#include "lib/fatfs/ff.h"`
	`16`	`+#include "lib/fatfs/diskio.h" /* FatFs lower layer API */`
`16`	`17`	`#include "sflash_diskio.h" /* Serial flash disk IO API */`
`17`	`18`	`#include "sd_diskio.h" /* SDCARD disk IO API */`
`18`	`19`	`#include "inc/hw_types.h"`
`@@ -22,7 +23,6 @@`
`22`	`23`	`#include "prcm.h"`
`23`	`24`	`#include "pybrtc.h"`
`24`	`25`	`#include "timeutils.h"`
`25`		`-#include "ff.h"`
`26`	`26`	`#include "pybsd.h"`
`27`	`27`	`#include "moduos.h"`
`28`	`28`
`@@ -35,7 +35,7 @@ DSTATUS disk_status (`
`35`	`35`	`BYTE pdrv /* Physical drive nmuber to identify the drive */`
`36`	`36`	`)`
`37`	`37`	`{`
`38`		`- if (pdrv == FLASH) {`
	`38`	`+ if (pdrv == PD_FLASH) {`
`39`	`39`	`return sflash_disk_status();`
`40`	`40`	`} else {`
`41`	`41`	`os_fs_mount_t *mount_obj;`
`@@ -57,7 +57,7 @@ DSTATUS disk_initialize (`
`57`	`57`	`BYTE pdrv /* Physical drive nmuber to identify the drive */`
`58`	`58`	`)`
`59`	`59`	`{`
`60`		`- if (pdrv == FLASH) {`
	`60`	`+ if (pdrv == PD_FLASH) {`
`61`	`61`	`if (RES_OK != sflash_disk_init()) {`
`62`	`62`	`return STA_NOINIT;`
`63`	`63`	`}`
`@@ -84,7 +84,7 @@ DRESULT disk_read (`
`84`	`84`	`UINT count /* Number of sectors to read */`
`85`	`85`	`)`
`86`	`86`	`{`
`87`		`- if (pdrv == FLASH) {`
	`87`	`+ if (pdrv == PD_FLASH) {`
`88`	`88`	`return sflash_disk_read(buff, sector, count);`
`89`	`89`	`} else {`
`90`	`90`	`os_fs_mount_t *mount_obj;`
`@@ -115,7 +115,7 @@ DRESULT disk_write (`
`115`	`115`	`UINT count /* Number of sectors to write */`
`116`	`116`	`)`
`117`	`117`	`{`
`118`		`- if (pdrv == FLASH) {`
	`118`	`+ if (pdrv == PD_FLASH) {`
`119`	`119`	`return sflash_disk_write(buff, sector, count);`
`120`	`120`	`} else {`
`121`	`121`	`os_fs_mount_t *mount_obj;`
`@@ -147,7 +147,7 @@ DRESULT disk_ioctl (`
`147`	`147`	`void buff / Buffer to send/receive control data */`
`148`	`148`	`)`
`149`	`149`	`{`
`150`		`- if (pdrv == FLASH) {`
	`150`	`+ if (pdrv == PD_FLASH) {`
`151`	`151`	`switch (cmd) {`
`152`	`152`	`case CTRL_SYNC:`
`153`	`153`	`return sflash_disk_flush();`