Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
uPython-mirror
Commits
4f94d90d
Commit
4f94d90d
authored
Mar 04, 2015
by
Damien George
Browse files
stmhal: Include fatfs headers using lib/fatfs prefix.
This helps make files reusable across other ports.
parent
6cb6947b
Changes
11
Hide whitespace changes
Inline
Side-by-side
stmhal/Makefile
View file @
4f94d90d
...
...
@@ -39,7 +39,6 @@ INC += -I$(CMSIS_DIR)/devinc
INC
+=
-I
$(HAL_DIR)
/inc
INC
+=
-I
$(USBDEV_DIR)
/core/inc
-I
$(USBDEV_DIR)
/class/inc
#INC += -I$(USBHOST_DIR)
INC
+=
-I
../
$(FATFS_DIR)
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
...
...
stmhal/diskio.c
View file @
4f94d90d
...
...
@@ -33,12 +33,11 @@
#include
"stm32f4xx_hal.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
"storage.h"
#include
"sdcard.h"
#include
"ff.h"
/* FatFs lower layer API */
#include
"diskio.h"
/* FatFs lower layer API */
#include
"fsusermount.h"
const
PARTITION
VolToPart
[]
=
{
...
...
stmhal/ffconf.c
View file @
4f94d90d
...
...
@@ -27,7 +27,7 @@
#include
<string.h>
#include
"py/obj.h"
#include
"ff.h"
#include
"
lib/fatfs/
ff.h"
#include
"ffconf.h"
#include
"fsusermount.h"
...
...
stmhal/file.c
View file @
4f94d90d
...
...
@@ -30,8 +30,8 @@
#include
"py/nlr.h"
#include
"py/runtime.h"
#include
"py/stream.h"
#include
"lib/fatfs/ff.h"
#include
"file.h"
#include
"ff.h"
extern
const
mp_obj_type_t
mp_type_fileio
;
extern
const
mp_obj_type_t
mp_type_textio
;
...
...
stmhal/fsusermount.c
View file @
4f94d90d
...
...
@@ -26,7 +26,7 @@
#include
"py/nlr.h"
#include
"py/runtime.h"
#include
"ff.h"
#include
"
lib/fatfs/
ff.h"
#include
"fsusermount.h"
// for user-mountable block device
...
...
stmhal/import.c
View file @
4f94d90d
...
...
@@ -27,7 +27,7 @@
#include
<stdio.h>
#include
"py/lexer.h"
#include
"ff.h"
#include
"
lib/fatfs/
ff.h"
mp_import_stat_t
mp_import_stat
(
const
char
*
path
)
{
FILINFO
fno
;
...
...
stmhal/lexerfatfs.c
View file @
4f94d90d
...
...
@@ -27,8 +27,8 @@
#include
<stdio.h>
#include
"py/lexer.h"
#include
"lib/fatfs/ff.h"
#include
"lexerfatfs.h"
#include
"ff.h"
typedef
struct
_mp_lexer_file_buf_t
{
FIL
fp
;
...
...
stmhal/main.c
View file @
4f94d90d
...
...
@@ -35,6 +35,8 @@
#include
"py/stackctrl.h"
#include
"py/gc.h"
#include
"lib/fatfs/ff.h"
#include
"systick.h"
#include
"pendsv.h"
#include
"gccollect.h"
...
...
@@ -52,7 +54,6 @@
#include
"rtc.h"
#include
"storage.h"
#include
"sdcard.h"
#include
"ff.h"
#include
"rng.h"
#include
"accel.h"
#include
"servo.h"
...
...
stmhal/modpyb.c
View file @
4f94d90d
...
...
@@ -33,6 +33,8 @@
#include
"py/nlr.h"
#include
"py/obj.h"
#include
"py/gc.h"
#include
"lib/fatfs/ff.h"
#include
"lib/fatfs/diskio.h"
#include
"gccollect.h"
#include
"irq.h"
#include
"systick.h"
...
...
@@ -56,8 +58,6 @@
#include
"dac.h"
#include
"lcd.h"
#include
"usb.h"
#include
"ff.h"
#include
"diskio.h"
#include
"fsusermount.h"
#include
"portmodules.h"
...
...
stmhal/moduos.c
View file @
4f94d90d
...
...
@@ -30,11 +30,10 @@
#include
"py/nlr.h"
#include
"py/obj.h"
#include
"py/objtuple.h"
#include
"systick.h"
#include
"lib/fatfs/ff.h"
#include
"lib/fatfs/diskio.h"
#include
"rng.h"
#include
"storage.h"
#include
"ff.h"
#include
"diskio.h"
#include
"file.h"
#include
"sdcard.h"
#include
"fsusermount.h"
...
...
stmhal/usbd_msc_storage.c
View file @
4f94d90d
...
...
@@ -37,8 +37,8 @@
#include
"usbd_msc_storage.h"
#include
"py/misc.h"
#include
"lib/fatfs/diskio.h"
#include
"storage.h"
#include
"diskio.h"
#include
"sdcard.h"
// These are needed to support removal of the medium, so that the USB drive
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment