From ccc371ed53d2d08c410102cf6f652e3f8cd38862 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Mon, 16 Aug 2021 08:50:31 -0500 Subject: [PATCH 1/2] Don't double-list modules that MP_REGISTER_MODULE Closes: #5154 --- py/circuitpy_mpconfig.h | 7 +------ py/objmodule.c | 3 --- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index d0a65a6a7a..0001e9f7c9 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -635,12 +635,7 @@ extern const struct _mp_obj_module_t pwmio_module; #define PWMIO_MODULE #endif -#if CIRCUITPY_QRIO -extern const struct _mp_obj_module_t qrio_module; -#define QRIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_qrio), (mp_obj_t)&qrio_module }, -#else -#define QRIO_MODULE -#endif +// CIRCUITPY_QRIO uses MP_REGISTER_MODULE #if CIRCUITPY_RAINBOWIO extern const struct _mp_obj_module_t rainbowio_module; diff --git a/py/objmodule.c b/py/objmodule.c index 8fa36ab42e..ea10fb8ba2 100644 --- a/py/objmodule.c +++ b/py/objmodule.c @@ -161,9 +161,6 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = { { MP_ROM_QSTR(MP_QSTR_builtins), MP_ROM_PTR(&mp_module_builtins) }, { MP_ROM_QSTR(MP_QSTR_micropython), MP_ROM_PTR(&mp_module_micropython) }, - #if MICROPY_PY_ARRAY - { MP_ROM_QSTR(MP_QSTR_array), MP_ROM_PTR(&mp_module_array) }, - #endif #if MICROPY_PY_IO #if CIRCUITPY { MP_ROM_QSTR(MP_QSTR_io), MP_ROM_PTR(&mp_module_io) }, From f1bbf406c41dae8b597b035c2f8aae84c78b5610 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 19 Aug 2021 14:01:14 -0500 Subject: [PATCH 2/2] remove a straggling QRIO_MODULE mention --- py/circuitpy_mpconfig.h | 1 - 1 file changed, 1 deletion(-) diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index 0001e9f7c9..35ac272599 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -923,7 +923,6 @@ extern const struct _mp_obj_module_t msgpack_module; PS2IO_MODULE \ PULSEIO_MODULE \ PWMIO_MODULE \ - QRIO_MODULE \ RAINBOWIO_MODULE \ RANDOM_MODULE \ RE_MODULE \