Commit 4f94d90d authored by Damien George's avatar Damien George
Browse files

stmhal: Include fatfs headers using lib/fatfs prefix.

This helps make files reusable across other ports.
parent 6cb6947b
...@@ -39,7 +39,6 @@ INC += -I$(CMSIS_DIR)/devinc ...@@ -39,7 +39,6 @@ INC += -I$(CMSIS_DIR)/devinc
INC += -I$(HAL_DIR)/inc INC += -I$(HAL_DIR)/inc
INC += -I$(USBDEV_DIR)/core/inc -I$(USBDEV_DIR)/class/inc INC += -I$(USBDEV_DIR)/core/inc -I$(USBDEV_DIR)/class/inc
#INC += -I$(USBHOST_DIR) #INC += -I$(USBHOST_DIR)
INC += -I../$(FATFS_DIR)
INC += -I../lib/mp-readline INC += -I../lib/mp-readline
CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mabi=aapcs-linux -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fsingle-precision-constant -Wdouble-promotion CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mabi=aapcs-linux -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fsingle-precision-constant -Wdouble-promotion
......
...@@ -33,12 +33,11 @@ ...@@ -33,12 +33,11 @@
#include "stm32f4xx_hal.h" #include "stm32f4xx_hal.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "systick.h" #include "lib/fatfs/ff.h" /* FatFs lower layer API */
#include "lib/fatfs/diskio.h" /* FatFs lower layer API */
#include "rtc.h" #include "rtc.h"
#include "storage.h" #include "storage.h"
#include "sdcard.h" #include "sdcard.h"
#include "ff.h" /* FatFs lower layer API */
#include "diskio.h" /* FatFs lower layer API */
#include "fsusermount.h" #include "fsusermount.h"
const PARTITION VolToPart[] = { const PARTITION VolToPart[] = {
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <string.h> #include <string.h>
#include "py/obj.h" #include "py/obj.h"
#include "ff.h" #include "lib/fatfs/ff.h"
#include "ffconf.h" #include "ffconf.h"
#include "fsusermount.h" #include "fsusermount.h"
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
#include "py/nlr.h" #include "py/nlr.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "py/stream.h" #include "py/stream.h"
#include "lib/fatfs/ff.h"
#include "file.h" #include "file.h"
#include "ff.h"
extern const mp_obj_type_t mp_type_fileio; extern const mp_obj_type_t mp_type_fileio;
extern const mp_obj_type_t mp_type_textio; extern const mp_obj_type_t mp_type_textio;
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "py/nlr.h" #include "py/nlr.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "ff.h" #include "lib/fatfs/ff.h"
#include "fsusermount.h" #include "fsusermount.h"
// for user-mountable block device // for user-mountable block device
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <stdio.h> #include <stdio.h>
#include "py/lexer.h" #include "py/lexer.h"
#include "ff.h" #include "lib/fatfs/ff.h"
mp_import_stat_t mp_import_stat(const char *path) { mp_import_stat_t mp_import_stat(const char *path) {
FILINFO fno; FILINFO fno;
......
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
#include <stdio.h> #include <stdio.h>
#include "py/lexer.h" #include "py/lexer.h"
#include "lib/fatfs/ff.h"
#include "lexerfatfs.h" #include "lexerfatfs.h"
#include "ff.h"
typedef struct _mp_lexer_file_buf_t { typedef struct _mp_lexer_file_buf_t {
FIL fp; FIL fp;
......
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
#include "py/stackctrl.h" #include "py/stackctrl.h"
#include "py/gc.h" #include "py/gc.h"
#include "lib/fatfs/ff.h"
#include "systick.h" #include "systick.h"
#include "pendsv.h" #include "pendsv.h"
#include "gccollect.h" #include "gccollect.h"
...@@ -52,7 +54,6 @@ ...@@ -52,7 +54,6 @@
#include "rtc.h" #include "rtc.h"
#include "storage.h" #include "storage.h"
#include "sdcard.h" #include "sdcard.h"
#include "ff.h"
#include "rng.h" #include "rng.h"
#include "accel.h" #include "accel.h"
#include "servo.h" #include "servo.h"
......
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
#include "py/nlr.h" #include "py/nlr.h"
#include "py/obj.h" #include "py/obj.h"
#include "py/gc.h" #include "py/gc.h"
#include "lib/fatfs/ff.h"
#include "lib/fatfs/diskio.h"
#include "gccollect.h" #include "gccollect.h"
#include "irq.h" #include "irq.h"
#include "systick.h" #include "systick.h"
...@@ -56,8 +58,6 @@ ...@@ -56,8 +58,6 @@
#include "dac.h" #include "dac.h"
#include "lcd.h" #include "lcd.h"
#include "usb.h" #include "usb.h"
#include "ff.h"
#include "diskio.h"
#include "fsusermount.h" #include "fsusermount.h"
#include "portmodules.h" #include "portmodules.h"
......
...@@ -30,11 +30,10 @@ ...@@ -30,11 +30,10 @@
#include "py/nlr.h" #include "py/nlr.h"
#include "py/obj.h" #include "py/obj.h"
#include "py/objtuple.h" #include "py/objtuple.h"
#include "systick.h" #include "lib/fatfs/ff.h"
#include "lib/fatfs/diskio.h"
#include "rng.h" #include "rng.h"
#include "storage.h" #include "storage.h"
#include "ff.h"
#include "diskio.h"
#include "file.h" #include "file.h"
#include "sdcard.h" #include "sdcard.h"
#include "fsusermount.h" #include "fsusermount.h"
......
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
#include "usbd_msc_storage.h" #include "usbd_msc_storage.h"
#include "py/misc.h" #include "py/misc.h"
#include "lib/fatfs/diskio.h"
#include "storage.h" #include "storage.h"
#include "diskio.h"
#include "sdcard.h" #include "sdcard.h"
// These are needed to support removal of the medium, so that the USB drive // These are needed to support removal of the medium, so that the USB drive
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment