diff options
Diffstat (limited to 'cc3200/fatfs')
| -rw-r--r-- | cc3200/fatfs/src/ffconf.c | 9 | ||||
| -rw-r--r-- | cc3200/fatfs/src/option/syscall.c | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/cc3200/fatfs/src/ffconf.c b/cc3200/fatfs/src/ffconf.c index 95633e066a..3206a85bf7 100644 --- a/cc3200/fatfs/src/ffconf.c +++ b/cc3200/fatfs/src/ffconf.c @@ -38,7 +38,6 @@ extern BYTE ff_CurrVol; #endif STATIC bool check_path(const TCHAR **path, const char *mount_point_str, mp_uint_t mount_point_len) { - stoupper ((char *)(*path)); if (strncmp(*path, mount_point_str, mount_point_len) == 0) { if ((*path)[mount_point_len] == '/') { *path += mount_point_len; @@ -66,11 +65,11 @@ int ff_get_ldnumber (const TCHAR **path) { #endif } - if (check_path(path, "/SFLASH", 7)) { + if (check_path(path, "/flash", 6)) { return 0; } #if MICROPY_HW_HAS_SDCARD - else if (check_path(path, "/SD", 3)) { + else if (check_path(path, "/sd", 3)) { return 1; } #endif @@ -84,13 +83,13 @@ void ff_get_volname(BYTE vol, TCHAR **dest) { if (vol == 0) #endif { - memcpy(*dest, "/SFLASH", 7); + memcpy(*dest, "/flash", 6); *dest += 7; } #if MICROPY_HW_HAS_SDCARD else { - memcpy(*dest, "/SD", 3); + memcpy(*dest, "/sd", 3); *dest += 3; } #endif diff --git a/cc3200/fatfs/src/option/syscall.c b/cc3200/fatfs/src/option/syscall.c index 1bb1ec3798..1ada97bd43 100644 --- a/cc3200/fatfs/src/option/syscall.c +++ b/cc3200/fatfs/src/option/syscall.c @@ -3,8 +3,6 @@ /* (C)ChaN, 2014 */ /*------------------------------------------------------------------------*/ -#include "py/mpconfig.h" -#include MICROPY_HAL_H #include "ff.h" @@ -134,7 +132,7 @@ void* ff_memalloc ( /* Returns pointer to the allocated memory block */ UINT msize /* Number of bytes to allocate */ ) { - return malloc(msize); /* Allocate a new memory block with POSIX API */ + return pvPortMalloc(msize); /* Allocate a new memory block with POSIX API */ } @@ -146,7 +144,7 @@ void ff_memfree ( void* mblock /* Pointer to the memory block to free */ ) { - free(mblock); /* Discard the memory block with POSIX API */ + vPortFree(mblock); /* Discard the memory block with POSIX API */ } #endif |