Move fatfs around

fusee/fusee-primary/src/lib/fatfs/diskio.c

@@ -9,7 +9,7 @@
 
 #include <string.h>
 #include "diskio.h"		/* FatFs lower layer API */
-#include "sdmmc.h"
+#include "../../sdmmc.h"
 
 /* Global sd struct. */
 extern struct mmc sd_mmc;

fusee/fusee-primary/src/lib/fatfs/ff.c

@@ -2237,7 +2237,7 @@ void init_alloc_info (
 /* exFAT: Load the object's directory entry block */
 /*------------------------------------------------*/
 static
-FRESULT load_obj_xdir (	
+FRESULT load_obj_xdir (
 	DIR* dp,			/* Blank directory object to be used to access containing direcotry */
 	const FFOBJID* obj	/* Object with its containing directory information */
 )

fusee/fusee-primary/src/sd_utils.c

@@ -2,7 +2,7 @@
 #include "hwinit.h"
 #include "sdmmc.h"
 #include "lib/printk.h"
-#include "ff.h"
+#include "lib/fatfs/ff.h"
 
 /* This is used by diskio.h. */
 struct mmc sd_mmc;
@@ -51,15 +51,15 @@ size_t read_sd_file(void *dst, size_t dst_size, const char *filename) {
     if (!mounted_sd && mount_sd() == 0) {
         return 0;
     }
-    
+
     FIL f;
     if (f_open(&f, filename, FA_READ) != FR_OK) {
         return 0;
     }
-    
+
     UINT br;
     int res = f_read(&f, dst, dst_size, &br);
     f_close(&f);
-    
+
     return res == FR_OK ? (int)br : 0;
-}
+}

fusee/fusee-primary/src/sd_utils.h

@@ -3,11 +3,11 @@
 
 #include "utils.h"
 #include "sdmmc.h"
-#include "ff.h"
+#include "lib/fatfs/ff.h"
 
 void save_sd_state(void **mmc, void **ff);
 void resume_sd_state(void *mmc, void *ff);
 
 size_t read_sd_file(void *dst, size_t dst_size, const char *filename);
 
-#endif
+#endif

fusee/fusee-secondary/src/lib/fatfs/diskio.c

@@ -9,7 +9,7 @@
 
 #include <string.h>
 #include "diskio.h"		/* FatFs lower layer API */
-#include "sdmmc.h"
+#include "../../sdmmc.h"
 
 /* Global sd struct. */
 extern struct mmc sd_mmc;

fusee/fusee-secondary/src/lib/fatfs/ff.c

@@ -2237,7 +2237,7 @@ void init_alloc_info (
 /* exFAT: Load the object's directory entry block */
 /*------------------------------------------------*/
 static
-FRESULT load_obj_xdir (	
+FRESULT load_obj_xdir (
 	DIR* dp,			/* Blank directory object to be used to access containing direcotry */
 	const FFOBJID* obj	/* Object with its containing directory information */
 )

fusee/fusee-secondary/src/sd_utils.c

@@ -2,7 +2,7 @@
 #include "hwinit.h"
 #include "sdmmc.h"
 #include "lib/printk.h"
-#include "ff.h"
+#include "lib/fatfs/ff.h"
 
 /* This is used by diskio.h. */
 struct mmc sd_mmc;
@@ -51,15 +51,15 @@ size_t read_sd_file(void *dst, size_t dst_size, const char *filename) {
     if (!mounted_sd && mount_sd() == 0) {
         return 0;
     }
-    
+
     FIL f;
     if (f_open(&f, filename, FA_READ) != FR_OK) {
         return 0;
     }
-    
+
     UINT br;
     int res = f_read(&f, dst, dst_size, &br);
     f_close(&f);
-    
+
     return res == FR_OK ? (int)br : 0;
-}
+}

fusee/fusee-secondary/src/sd_utils.h

@@ -3,11 +3,11 @@
 
 #include "utils.h"
 #include "sdmmc.h"
-#include "ff.h"
+#include "lib/fatfs/ff.h"
 
 void save_sd_state(void **mmc, void **ff);
 void resume_sd_state(void *mmc, void *ff);
 
 size_t read_sd_file(void *dst, size_t dst_size, const char *filename);
 
-#endif
+#endif