diff options
| -rw-r--r-- | ports/cc3200/application.mk | 2 | ||||
| -rw-r--r-- | ports/cc3200/hal/cc3200_hal.c | 2 | ||||
| -rw-r--r-- | ports/cc3200/misc/mpirq.c | 1 | ||||
| -rw-r--r-- | ports/cc3200/mods/modmachine.c | 1 | ||||
| -rw-r--r-- | ports/cc3200/mods/pybsleep.c | 1 | ||||
| -rw-r--r-- | ports/cc3200/mods/pybtimer.c | 1 | ||||
| -rw-r--r-- | ports/cc3200/mods/pybuart.c | 2 | ||||
| -rw-r--r-- | ports/cc3200/mpconfigport.h | 9 |
8 files changed, 9 insertions, 10 deletions
diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk index 25a9925ea..428367d66 100644 --- a/ports/cc3200/application.mk +++ b/ports/cc3200/application.mk @@ -166,7 +166,7 @@ OBJ += $(BUILD)/shared/runtime/gchelper_m3.o OBJ += $(BUILD)/pins.o # List of sources for qstr extraction -SRC_QSTR += $(APP_MODS_SRC_C) $(APP_MISC_SRC_C) $(APP_STM_SRC_C) $(APP_SHARED_SRC_C) +SRC_QSTR += $(APP_MODS_SRC_C) $(APP_MISC_SRC_C) $(APP_STM_SRC_C) $(APP_SHARED_SRC_C) $(APP_HAL_SRC_C) # Append any auto-generated sources that are needed by sources listed in # SRC_QSTR SRC_QSTR_AUTO_DEPS += diff --git a/ports/cc3200/hal/cc3200_hal.c b/ports/cc3200/hal/cc3200_hal.c index 3a35e39e1..4694235ee 100644 --- a/ports/cc3200/hal/cc3200_hal.c +++ b/ports/cc3200/hal/cc3200_hal.c @@ -195,3 +195,5 @@ static void hal_TickInit (void) { MAP_SysTickEnable(); } #endif + +MP_REGISTER_ROOT_POINTER(struct _os_term_dup_obj_t *os_term_dup_obj); diff --git a/ports/cc3200/misc/mpirq.c b/ports/cc3200/misc/mpirq.c index de30ebc49..eb93e5eef 100644 --- a/ports/cc3200/misc/mpirq.c +++ b/ports/cc3200/misc/mpirq.c @@ -197,3 +197,4 @@ const mp_obj_type_t mp_irq_type = { .locals_dict = (mp_obj_t)&mp_irq_locals_dict, }; +MP_REGISTER_ROOT_POINTER(mp_obj_list_t mp_irq_obj_list); diff --git a/ports/cc3200/mods/modmachine.c b/ports/cc3200/mods/modmachine.c index 782ccc55a..3e483e0a2 100644 --- a/ports/cc3200/mods/modmachine.c +++ b/ports/cc3200/mods/modmachine.c @@ -215,3 +215,4 @@ const mp_obj_module_t mp_module_machine = { }; MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine); +MP_REGISTER_ROOT_POINTER(mp_obj_t machine_config_main); diff --git a/ports/cc3200/mods/pybsleep.c b/ports/cc3200/mods/pybsleep.c index 2d4b1ca8a..76fe0849a 100644 --- a/ports/cc3200/mods/pybsleep.c +++ b/ports/cc3200/mods/pybsleep.c @@ -652,3 +652,4 @@ STATIC bool setup_timer_hibernate_wake (void) { return false; } +MP_REGISTER_ROOT_POINTER(mp_obj_list_t pyb_sleep_obj_list); diff --git a/ports/cc3200/mods/pybtimer.c b/ports/cc3200/mods/pybtimer.c index 55caa6de1..b2725ae16 100644 --- a/ports/cc3200/mods/pybtimer.c +++ b/ports/cc3200/mods/pybtimer.c @@ -728,3 +728,4 @@ STATIC const mp_obj_type_t pyb_timer_channel_type = { .locals_dict = (mp_obj_t)&pyb_timer_channel_locals_dict, }; +MP_REGISTER_ROOT_POINTER(mp_obj_list_t pyb_timer_channel_obj_list); diff --git a/ports/cc3200/mods/pybuart.c b/ports/cc3200/mods/pybuart.c index b8e8cbb68..6e774b70d 100644 --- a/ports/cc3200/mods/pybuart.c +++ b/ports/cc3200/mods/pybuart.c @@ -666,3 +666,5 @@ const mp_obj_type_t pyb_uart_type = { .protocol = &uart_stream_p, .locals_dict = (mp_obj_t)&pyb_uart_locals_dict, }; + +MP_REGISTER_ROOT_POINTER(struct _pyb_uart_obj_t *pyb_uart_objs[2]); diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h index a9daca88b..8059daeec 100644 --- a/ports/cc3200/mpconfigport.h +++ b/ports/cc3200/mpconfigport.h @@ -139,16 +139,7 @@ #define MICROPY_PORT_CONSTANTS \ { MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&mp_module_machine) }, \ -// vm state and root pointers for the gc #define MP_STATE_PORT MP_STATE_VM -#define MICROPY_PORT_ROOT_POINTERS \ - mp_obj_t machine_config_main; \ - mp_obj_list_t pyb_sleep_obj_list; \ - mp_obj_list_t mp_irq_obj_list; \ - mp_obj_list_t pyb_timer_channel_obj_list; \ - struct _pyb_uart_obj_t *pyb_uart_objs[2]; \ - struct _os_term_dup_obj_t *os_term_dup_obj; \ - // type definitions for the specific machine #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1)) |