Skip to content

Commit 56506fd

Browse files
committed
cc3200: Convert to use new VFS sub-system and new ooFatFs library.
1 parent 6eafa54 commit 56506fd

17 files changed

Lines changed: 445 additions & 996 deletions

File tree

cc3200/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -march=armv7e-m -mabi=aapcs -mcpu=co
2323
CFLAGS = -Wall -Wpointer-arith -Werror -ansi -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4) -Os
2424
CFLAGS += -g -ffunction-sections -fdata-sections -fno-common -fsigned-char -mno-unaligned-access
2525
CFLAGS += -Iboards/$(BOARD)
26+
CFLAGS += $(CFLAGS_MOD)
2627

2728
LDFLAGS = -Wl,-nostdlib -Wl,--gc-sections -Wl,-Map=$@.map
2829

cc3200/application.mk

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ APP_INC += -Iutil
1818
APP_INC += -Ibootmgr
1919
APP_INC += -I$(BUILD)
2020
APP_INC += -I$(BUILD)/genhdr
21-
APP_INC += -I../lib/fatfs
2221
APP_INC += -I../lib/mp-readline
2322
APP_INC += -I../lib/netutils
2423
APP_INC += -I../lib/timeutils
@@ -29,9 +28,6 @@ APP_CPPDEFINES = -Dgcc -DTARGET_IS_CC3200 -DSL_FULL -DUSE_FREERTOS
2928
APP_FATFS_SRC_C = $(addprefix fatfs/src/,\
3029
drivers/sflash_diskio.c \
3130
drivers/sd_diskio.c \
32-
option/syscall.c \
33-
diskio.c \
34-
ffconf.c \
3531
)
3632

3733
APP_RTOS_SRC_C = $(addprefix FreeRTOS/Source/,\
@@ -98,6 +94,7 @@ APP_MODS_SRC_C = $(addprefix mods/,\
9894
pybpin.c \
9995
pybi2c.c \
10096
pybrtc.c \
97+
pybflash.c \
10198
pybsd.c \
10299
pybsleep.c \
103100
pybspi.c \
@@ -143,11 +140,12 @@ APP_MAIN_SRC_C = \
143140
main.c \
144141
mptask.c \
145142
mpthreadport.c \
146-
serverstask.c
143+
serverstask.c \
144+
fatfs_port.c \
147145

148146
APP_LIB_SRC_C = $(addprefix lib/,\
149-
fatfs/ff.c \
150-
fatfs/option/ccsbcs.c \
147+
oofatfs/ff.c \
148+
oofatfs/option/unicode.c \
151149
libc/string0.c \
152150
mp-readline/readline.c \
153151
netutils/netutils.c \

cc3200/fatfs/src/diskio.c

Lines changed: 0 additions & 209 deletions
This file was deleted.

cc3200/fatfs/src/drivers/sd_diskio.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,12 @@
3939

4040
#include "py/mpconfig.h"
4141
#include "py/mphal.h"
42+
#include "lib/oofatfs/ff.h"
43+
#include "lib/oofatfs/diskio.h"
4244
#include "hw_types.h"
4345
#include "hw_memmap.h"
4446
#include "hw_ints.h"
4547
#include "rom_map.h"
46-
#include "diskio.h"
4748
#include "sd_diskio.h"
4849
#include "sdhost.h"
4950
#include "pin.h"

cc3200/fatfs/src/drivers/sflash_diskio.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
#include "py/mpconfig.h"
66
#include "py/obj.h"
7+
#include "lib/oofatfs/ff.h"
8+
#include "lib/oofatfs/diskio.h"
79
#include "simplelink.h"
8-
#include "diskio.h"
910
#include "sflash_diskio.h"
1011
#include "debug.h"
1112
#include "modnetwork.h"

cc3200/fatfs/src/ffconf.c

Lines changed: 0 additions & 93 deletions
This file was deleted.

0 commit comments

Comments
 (0)