From 631b692177ef1e6ba2832ee224e2680ac9982dbf Mon Sep 17 00:00:00 2001 From: David Lechner Date: Sat, 2 Jul 2022 15:05:41 -0500 Subject: [PATCH] extmod/uos_dupterm: Use MP_REGISTER_ROOT_POINTER(). This uses MP_REGISTER_ROOT_POINTER() to register dupterm_objs instead of using a conditional inside of mp_state_vm_t. Signed-off-by: David Lechner --- extmod/uos_dupterm.c | 4 +++- py/mpstate.h | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/extmod/uos_dupterm.c b/extmod/uos_dupterm.c index e18d133b91..826bf1715d 100644 --- a/extmod/uos_dupterm.c +++ b/extmod/uos_dupterm.c @@ -201,4 +201,6 @@ STATIC mp_obj_t mp_uos_dupterm(size_t n_args, const mp_obj_t *args) { } MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_uos_dupterm_obj, 1, 2, mp_uos_dupterm); -#endif +MP_REGISTER_ROOT_POINTER(mp_obj_t dupterm_objs[MICROPY_PY_OS_DUPTERM]); + +#endif // MICROPY_PY_OS_DUPTERM diff --git a/py/mpstate.h b/py/mpstate.h index 67146d282b..53bb882ceb 100644 --- a/py/mpstate.h +++ b/py/mpstate.h @@ -198,10 +198,6 @@ typedef struct _mp_state_vm_t { // root pointers for extmod - #if MICROPY_PY_OS_DUPTERM - mp_obj_t dupterm_objs[MICROPY_PY_OS_DUPTERM]; - #endif - #if MICROPY_PY_LWIP_SLIP mp_obj_t lwip_slip_stream; #endif