djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cc3200: Fix breakage after VfsFat refactor.

Browse Source
This commit is contained in:
Paul Sokolovsky 2016-02-15 10:39:56 +02:00
parent 46a0ac02c5
commit 4cd45f48b1
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cc3200/application.mk
View File

@ -157,7 +157,6 @@ APP_LIB_SRC_C = $(addprefix lib/,\
APP_STM_SRC_C = $(addprefix stmhal/,\ APP_STM_SRC_C = $(addprefix stmhal/,\
bufhelper.c \ bufhelper.c \
file.c \
builtin_open.c \ builtin_open.c \
import.c \ import.c \
input.c \ input.c \

2
cc3200/mods/moduos.c
View File

@ -37,7 +37,7 @@
#include "moduos.h" #include "moduos.h"
#include "diskio.h" #include "diskio.h"
#include "sflash_diskio.h" #include "sflash_diskio.h"
#include "file.h" #include "extmod/vfs_fat_file.h"
#include "random.h" #include "random.h"
#include "mpexception.h" #include "mpexception.h"
#include "version.h" #include "version.h"

1
cc3200/mpconfigport.h
View File

@ -70,6 +70,7 @@
#define MICROPY_FATFS_REENTRANT (1) #define MICROPY_FATFS_REENTRANT (1)
#define MICROPY_FATFS_TIMEOUT (2500) #define MICROPY_FATFS_TIMEOUT (2500)
#define MICROPY_FATFS_SYNC_T SemaphoreHandle_t #define MICROPY_FATFS_SYNC_T SemaphoreHandle_t
#define MICROPY_FSUSERMOUNT_ADHOC (1)
#define MICROPY_STREAMS_NON_BLOCK (1) #define MICROPY_STREAMS_NON_BLOCK (1)
#define MICROPY_MODULE_WEAK_LINKS (1) #define MICROPY_MODULE_WEAK_LINKS (1)

4
extmod/vfs_fat_file.c
View File

@ -25,7 +25,9 @@
*/ */
#include "py/mpconfig.h" #include "py/mpconfig.h"
#if MICROPY_FSUSERMOUNT // *_ADHOC part is for cc3200 port which doesn't use general uPy
// infrastructure and instead duplicates code. TODO: Resolve.
#if MICROPY_FSUSERMOUNT || MICROPY_FSUSERMOUNT_ADHOC
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>