jebbatime
/
micropython
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ports: Update to work with new oofatfs version.

pull/1/head
Damien George 2019-02-25 23:46:17 +11:00
parent e959f21986
commit b5f33ac2cb
15 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/cc3200/application.mk
View File

@ -140,7 +140,7 @@ APP_MAIN_SRC_C = \
APP_LIB_SRC_C = $(addprefix lib/,\ APP_LIB_SRC_C = $(addprefix lib/,\
oofatfs/ff.c \ oofatfs/ff.c \
oofatfs/option/unicode.c \ oofatfs/ffunicode.c \
libc/string0.c \ libc/string0.c \
mp-readline/readline.c \ mp-readline/readline.c \
netutils/netutils.c \ netutils/netutils.c \

12
ports/cc3200/fatfs_port.c
View File

@ -30,12 +30,12 @@
#include "lib/timeutils/timeutils.h" #include "lib/timeutils/timeutils.h"
#include "mods/pybrtc.h" #include "mods/pybrtc.h"
#if _FS_REENTRANT #if FF_FS_REENTRANT
// Create a Synchronization Object // Create a Synchronization Object
// This function is called in f_mount() function to create a new // This function is called in f_mount() function to create a new
// synchronization object, such as semaphore and mutex. // synchronization object, such as semaphore and mutex.
// A return of 0 indicates failure, and then f_mount() fails with FR_INT_ERR. // A return of 0 indicates failure, and then f_mount() fails with FR_INT_ERR.
int ff_cre_syncobj(FATFS *fatfs, _SYNC_t *sobj) { int ff_cre_syncobj(FATFS *fatfs, FF_SYNC_t *sobj) {
vSemaphoreCreateBinary((*sobj)); vSemaphoreCreateBinary((*sobj));
return (int)(*sobj != NULL); return (int)(*sobj != NULL);
} }
@ -44,7 +44,7 @@ int ff_cre_syncobj(FATFS *fatfs, _SYNC_t *sobj) {
// This function is called in f_mount() function to delete a synchronization // This function is called in f_mount() function to delete a synchronization
// object that created with ff_cre_syncobj function. // object that created with ff_cre_syncobj function.
// A return of 0 indicates failure, and then f_mount() fails with FR_INT_ERR. // A return of 0 indicates failure, and then f_mount() fails with FR_INT_ERR.
int ff_del_syncobj(_SYNC_t sobj) { int ff_del_syncobj(FF_SYNC_t sobj) {
vSemaphoreDelete(sobj); vSemaphoreDelete(sobj);
return 1; return 1;
} }
@ -52,13 +52,13 @@ int ff_del_syncobj(_SYNC_t sobj) {
// Request Grant to Access the Volume // Request Grant to Access the Volume
// This function is called on entering file functions to lock the volume. // This function is called on entering file functions to lock the volume.
// When a 0 is returned, the file function fails with FR_TIMEOUT. // When a 0 is returned, the file function fails with FR_TIMEOUT.
int ff_req_grant(_SYNC_t sobj) { int ff_req_grant(FF_SYNC_t sobj) {
return (int)(xSemaphoreTake(sobj, _FS_TIMEOUT) == pdTRUE); return (int)(xSemaphoreTake(sobj, FF_FS_TIMEOUT) == pdTRUE);
} }
// Release Grant to Access the Volume // Release Grant to Access the Volume
// This function is called on leaving file functions to unlock the volume. // This function is called on leaving file functions to unlock the volume.
void ff_rel_grant(_SYNC_t sobj) { void ff_rel_grant(FF_SYNC_t sobj) {
xSemaphoreGive(sobj); xSemaphoreGive(sobj);
} }

2
ports/cc3200/mpconfigport.h
View File

@ -65,7 +65,7 @@
// fatfs configuration used in ffconf.h // fatfs configuration used in ffconf.h
#define MICROPY_FATFS_ENABLE_LFN (2) #define MICROPY_FATFS_ENABLE_LFN (2)
#define MICROPY_FATFS_MAX_LFN (MICROPY_ALLOC_PATH_MAX) #define MICROPY_FATFS_MAX_LFN (MICROPY_ALLOC_PATH_MAX)
#define MICROPY_FATFS_LFN_CODE_PAGE (437) // 1=SFN/ANSI 437=LFN/U.S.(OEM) #define MICROPY_FATFS_LFN_CODE_PAGE 437 // 1=SFN/ANSI 437=LFN/U.S.(OEM)
#define MICROPY_FATFS_RPATH (2) #define MICROPY_FATFS_RPATH (2)
#define MICROPY_FATFS_REENTRANT (1) #define MICROPY_FATFS_REENTRANT (1)
#define MICROPY_FATFS_TIMEOUT (2500) #define MICROPY_FATFS_TIMEOUT (2500)

2
ports/cc3200/mptask.c
View File

@ -307,7 +307,7 @@ STATIC void mptask_init_sflash_filesystem (void) {
FRESULT res = f_mount(&vfs_fat->fatfs); FRESULT res = f_mount(&vfs_fat->fatfs);
if (res == FR_NO_FILESYSTEM) { if (res == FR_NO_FILESYSTEM) {
// no filesystem, so create a fresh one // no filesystem, so create a fresh one
uint8_t working_buf[_MAX_SS]; uint8_t working_buf[FF_MAX_SS];
res = f_mkfs(&vfs_fat->fatfs, FM_FAT | FM_SFD, 0, working_buf, sizeof(working_buf)); res = f_mkfs(&vfs_fat->fatfs, FM_FAT | FM_SFD, 0, working_buf, sizeof(working_buf));
if (res == FR_OK) { if (res == FR_OK) {
// success creating fresh LFS // success creating fresh LFS

2
ports/esp32/Makefile
View File

@ -209,7 +209,7 @@ LIB_SRC_C = $(addprefix lib/,\
ifeq ($(MICROPY_FATFS), 1) ifeq ($(MICROPY_FATFS), 1)
LIB_SRC_C += \ LIB_SRC_C += \
lib/oofatfs/ff.c \ lib/oofatfs/ff.c \
lib/oofatfs/option/unicode.c lib/oofatfs/ffunicode.c
endif endif
DRIVERS_SRC_C = $(addprefix drivers/,\ DRIVERS_SRC_C = $(addprefix drivers/,\

2
ports/esp32/mpconfigport.h
View File

@ -155,7 +155,7 @@
#define MICROPY_FATFS_ENABLE_LFN (1) #define MICROPY_FATFS_ENABLE_LFN (1)
#define MICROPY_FATFS_RPATH (2) #define MICROPY_FATFS_RPATH (2)
#define MICROPY_FATFS_MAX_SS (4096) #define MICROPY_FATFS_MAX_SS (4096)
#define MICROPY_FATFS_LFN_CODE_PAGE (437) /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */ #define MICROPY_FATFS_LFN_CODE_PAGE 437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
#define mp_type_fileio mp_type_vfs_fat_fileio #define mp_type_fileio mp_type_vfs_fat_fileio
#define mp_type_textio mp_type_vfs_fat_textio #define mp_type_textio mp_type_vfs_fat_textio

2
ports/esp8266/Makefile
View File

@ -127,7 +127,7 @@ LIB_SRC_C = $(addprefix lib/,\
ifeq ($(MICROPY_FATFS), 1) ifeq ($(MICROPY_FATFS), 1)
LIB_SRC_C += \ LIB_SRC_C += \
lib/oofatfs/ff.c \ lib/oofatfs/ff.c \
lib/oofatfs/option/unicode.c lib/oofatfs/ffunicode.c
endif endif
DRIVERS_SRC_C = $(addprefix drivers/,\ DRIVERS_SRC_C = $(addprefix drivers/,\

2
ports/esp8266/mpconfigport.h
View File

@ -110,7 +110,7 @@
#define MICROPY_FATFS_ENABLE_LFN (1) #define MICROPY_FATFS_ENABLE_LFN (1)
#define MICROPY_FATFS_RPATH (2) #define MICROPY_FATFS_RPATH (2)
#define MICROPY_FATFS_MAX_SS (4096) #define MICROPY_FATFS_MAX_SS (4096)
#define MICROPY_FATFS_LFN_CODE_PAGE (437) /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */ #define MICROPY_FATFS_LFN_CODE_PAGE 437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
#define MICROPY_VFS_FAT (1) #define MICROPY_VFS_FAT (1)
#define MICROPY_ESP8266_APA102 (1) #define MICROPY_ESP8266_APA102 (1)
#define MICROPY_ESP8266_NEOPIXEL (1) #define MICROPY_ESP8266_NEOPIXEL (1)

2
ports/nrf/mpconfigport.h
View File

@ -65,7 +65,7 @@
// fatfs configuration used in ffconf.h // fatfs configuration used in ffconf.h
#define MICROPY_FATFS_ENABLE_LFN (1) #define MICROPY_FATFS_ENABLE_LFN (1)
#define MICROPY_FATFS_LFN_CODE_PAGE (437) /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */ #define MICROPY_FATFS_LFN_CODE_PAGE 437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
#define MICROPY_FATFS_USE_LABEL (1) #define MICROPY_FATFS_USE_LABEL (1)
#define MICROPY_FATFS_RPATH (2) #define MICROPY_FATFS_RPATH (2)
#define MICROPY_FATFS_MULTI_PARTITION (1) #define MICROPY_FATFS_MULTI_PARTITION (1)

2
ports/stm32/Makefile
View File

@ -108,7 +108,7 @@ endif
SRC_LIB = $(addprefix lib/,\ SRC_LIB = $(addprefix lib/,\
libc/string0.c \ libc/string0.c \
oofatfs/ff.c \ oofatfs/ff.c \
oofatfs/option/unicode.c \ oofatfs/ffunicode.c \
mp-readline/readline.c \ mp-readline/readline.c \
netutils/netutils.c \ netutils/netutils.c \
netutils/trace.c \ netutils/trace.c \

2
ports/stm32/main.c
View File

@ -201,7 +201,7 @@ MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) {
led_state(PYB_LED_GREEN, 1); led_state(PYB_LED_GREEN, 1);
uint32_t start_tick = HAL_GetTick(); uint32_t start_tick = HAL_GetTick();
uint8_t working_buf[_MAX_SS]; uint8_t working_buf[FF_MAX_SS];
res = f_mkfs(&vfs_fat->fatfs, FM_FAT, 0, working_buf, sizeof(working_buf)); res = f_mkfs(&vfs_fat->fatfs, FM_FAT, 0, working_buf, sizeof(working_buf));
if (res == FR_OK) { if (res == FR_OK) {
// success creating fresh LFS // success creating fresh LFS

4
ports/stm32/mboot/diskio.c
View File

@ -31,8 +31,8 @@
#if MBOOT_FSLOAD #if MBOOT_FSLOAD
#if _MAX_SS == _MIN_SS #if FF_MAX_SS == FF_MIN_SS
#define SECSIZE (_MIN_SS) #define SECSIZE (FF_MIN_SS)
#else #else
#error Unsupported #error Unsupported
#endif #endif

2
ports/stm32/mpconfigport.h
View File

@ -169,7 +169,7 @@
// fatfs configuration used in ffconf.h // fatfs configuration used in ffconf.h
#define MICROPY_FATFS_ENABLE_LFN (1) #define MICROPY_FATFS_ENABLE_LFN (1)
#define MICROPY_FATFS_LFN_CODE_PAGE (437) /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */ #define MICROPY_FATFS_LFN_CODE_PAGE 437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
#define MICROPY_FATFS_USE_LABEL (1) #define MICROPY_FATFS_USE_LABEL (1)
#define MICROPY_FATFS_RPATH (2) #define MICROPY_FATFS_RPATH (2)
#define MICROPY_FATFS_MULTI_PARTITION (1) #define MICROPY_FATFS_MULTI_PARTITION (1)

2
ports/unix/Makefile
View File

@ -162,7 +162,7 @@ LIB_SRC_C = $(addprefix lib/,\
# FatFS VFS support # FatFS VFS support
LIB_SRC_C += $(addprefix lib/,\ LIB_SRC_C += $(addprefix lib/,\
oofatfs/ff.c \ oofatfs/ff.c \
oofatfs/option/unicode.c \ oofatfs/ffunicode.c \
) )
OBJ = $(PY_O) OBJ = $(PY_O)

2
ports/unix/mpconfigport.h
View File

@ -145,7 +145,7 @@
#define MICROPY_FATFS_ENABLE_LFN (1) #define MICROPY_FATFS_ENABLE_LFN (1)
#define MICROPY_FATFS_RPATH (2) #define MICROPY_FATFS_RPATH (2)
#define MICROPY_FATFS_MAX_SS (4096) #define MICROPY_FATFS_MAX_SS (4096)
#define MICROPY_FATFS_LFN_CODE_PAGE (437) /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */ #define MICROPY_FATFS_LFN_CODE_PAGE 437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
#define MICROPY_VFS_FAT (0) #define MICROPY_VFS_FAT (0)
// Define to MICROPY_ERROR_REPORTING_DETAILED to get function, etc. // Define to MICROPY_ERROR_REPORTING_DETAILED to get function, etc.