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

cc3200: Disable uheapq and uhashlib.

Browse Source 
Those two are rarely used features and better to have the extra heap.
This commit is contained in:
Daniel Campora 2015-09-27 18:04:11 +02:00
parent 6143f63560
commit eb9a3ec654
5 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cc3200/application.mk
View File

@ -87,7 +87,6 @@ APP_MISC_SRC_C = $(addprefix misc/,\
APP_MODS_SRC_C = $(addprefix mods/,\ APP_MODS_SRC_C = $(addprefix mods/,\
modmachine.c \ modmachine.c \
modnetwork.c \ modnetwork.c \
moduhashlib.c \
modubinascii.c \ modubinascii.c \
moduos.c \ moduos.c \
modusocket.c \ modusocket.c \

2
cc3200/mods/pybsleep.c
View File

@ -472,7 +472,7 @@ void pyb_sleep_suspend_exit (void) {
mp_irq_wake_all(); mp_irq_wake_all();
// we need to init the crypto hash engine again // we need to init the crypto hash engine again
CRYPTOHASH_Init(); //CRYPTOHASH_Init();
// trigger a sw interrupt // trigger a sw interrupt
MAP_IntPendSet(INT_PRCM); MAP_IntPendSet(INT_PRCM);

7
cc3200/mpconfigport.h
View File

@ -96,7 +96,7 @@
#define MICROPY_PY_UZLIB (0) #define MICROPY_PY_UZLIB (0)
#define MICROPY_PY_UJSON (1) #define MICROPY_PY_UJSON (1)
#define MICROPY_PY_URE (1) #define MICROPY_PY_URE (1)
#define MICROPY_PY_UHEAPQ (1) #define MICROPY_PY_UHEAPQ (0)
#define MICROPY_PY_UHASHLIB (0) #define MICROPY_PY_UHASHLIB (0)
#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1) #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
@ -115,13 +115,11 @@ extern const struct _mp_obj_fun_builtin_t mp_builtin_open_obj;
extern const struct _mp_obj_module_t machine_module; extern const struct _mp_obj_module_t machine_module;
extern const struct _mp_obj_module_t mp_module_ure; extern const struct _mp_obj_module_t mp_module_ure;
extern const struct _mp_obj_module_t mp_module_ujson; extern const struct _mp_obj_module_t mp_module_ujson;
extern const struct _mp_obj_module_t mp_module_uheapq;
extern const struct _mp_obj_module_t mp_module_uos; extern const struct _mp_obj_module_t mp_module_uos;
extern const struct _mp_obj_module_t mp_module_utime; extern const struct _mp_obj_module_t mp_module_utime;
extern const struct _mp_obj_module_t mp_module_uselect; extern const struct _mp_obj_module_t mp_module_uselect;
extern const struct _mp_obj_module_t mp_module_usocket; extern const struct _mp_obj_module_t mp_module_usocket;
extern const struct _mp_obj_module_t mp_module_network; extern const struct _mp_obj_module_t mp_module_network;
extern const struct _mp_obj_module_t mp_module_uhashlib;
extern const struct _mp_obj_module_t mp_module_ubinascii; extern const struct _mp_obj_module_t mp_module_ubinascii;
extern const struct _mp_obj_module_t mp_module_ussl; extern const struct _mp_obj_module_t mp_module_ussl;
@ -132,7 +130,6 @@ extern const struct _mp_obj_module_t mp_module_ussl;
{ MP_OBJ_NEW_QSTR(MP_QSTR_uselect), (mp_obj_t)&mp_module_uselect }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_uselect), (mp_obj_t)&mp_module_uselect }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_usocket), (mp_obj_t)&mp_module_usocket }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_usocket), (mp_obj_t)&mp_module_usocket }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_network), (mp_obj_t)&mp_module_network }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_network), (mp_obj_t)&mp_module_network }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_uhashlib), (mp_obj_t)&mp_module_uhashlib }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_ubinascii), (mp_obj_t)&mp_module_ubinascii }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_ubinascii), (mp_obj_t)&mp_module_ubinascii }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_ussl), (mp_obj_t)&mp_module_ussl }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_ussl), (mp_obj_t)&mp_module_ussl }, \
@ -140,12 +137,10 @@ extern const struct _mp_obj_module_t mp_module_ussl;
{ MP_OBJ_NEW_QSTR(MP_QSTR_struct), (mp_obj_t)&mp_module_ustruct }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_struct), (mp_obj_t)&mp_module_ustruct }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_re), (mp_obj_t)&mp_module_ure }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_re), (mp_obj_t)&mp_module_ure }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_json), (mp_obj_t)&mp_module_ujson }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_json), (mp_obj_t)&mp_module_ujson }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_heapq), (mp_obj_t)&mp_module_uheapq }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_os), (mp_obj_t)&mp_module_uos }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_os), (mp_obj_t)&mp_module_uos }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&mp_module_utime }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&mp_module_utime }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_select), (mp_obj_t)&mp_module_uselect }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_select), (mp_obj_t)&mp_module_uselect }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_socket), (mp_obj_t)&mp_module_usocket }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_socket), (mp_obj_t)&mp_module_usocket }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_hashlib), (mp_obj_t)&mp_module_uhashlib }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_binascii), (mp_obj_t)&mp_module_ubinascii }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_binascii), (mp_obj_t)&mp_module_ubinascii }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_ssl), (mp_obj_t)&mp_module_ussl }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_ssl), (mp_obj_t)&mp_module_ussl }, \

2
cc3200/mptask.c
View File

@ -267,7 +267,7 @@ STATIC void mptask_pre_init (void) {
// this one allocates memory for the socket semaphore // this one allocates memory for the socket semaphore
modusocket_pre_init(); modusocket_pre_init();
CRYPTOHASH_Init(); //CRYPTOHASH_Init();
#ifdef DEBUG #ifdef DEBUG
ASSERT (OSI_OK == osi_TaskCreate(TASK_Servers, ASSERT (OSI_OK == osi_TaskCreate(TASK_Servers,

12
cc3200/qstrdefsport.h
View File

@ -68,7 +68,7 @@ Q(binascii)
Q(re) Q(re)
Q(json) Q(json)
Q(heapq) Q(heapq)
Q(hashlib) //Q(hashlib)
// for os module // for os module
Q(os) Q(os)
@ -376,12 +376,12 @@ Q(POSITIVE)
Q(NEGATIVE) Q(NEGATIVE)
// for uhashlib module // for uhashlib module
Q(uhashlib) //Q(uhashlib)
Q(update) //Q(update)
Q(digest) //Q(digest)
//Q(md5) //Q(md5)
Q(sha1) //Q(sha1)
Q(sha256) //Q(sha256)
// for ubinascii module // for ubinascii module
Q(ubinascii) Q(ubinascii)