From 4274b34d6be19874d2868e385e38e5655f83bd32 Mon Sep 17 00:00:00 2001 From: Jim Mussared Date: Wed, 20 Apr 2022 17:22:57 +1000 Subject: [PATCH] esp8266: Make port-specific modules use MP_REGISTER_MODULE. Signed-off-by: Jim Mussared --- ports/esp8266/modesp.c | 2 ++ ports/esp8266/modutime.c | 2 ++ ports/esp8266/mpconfigport.h | 8 -------- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ports/esp8266/modesp.c b/ports/esp8266/modesp.c index 0e2acaf5ff..a6084e48bc 100644 --- a/ports/esp8266/modesp.c +++ b/ports/esp8266/modesp.c @@ -379,3 +379,5 @@ const mp_obj_module_t esp_module = { .base = { &mp_type_module }, .globals = (mp_obj_dict_t *)&esp_module_globals, }; + +MP_REGISTER_MODULE(MP_QSTR_esp, esp_module, 1); diff --git a/ports/esp8266/modutime.c b/ports/esp8266/modutime.c index 1d4ecc05f2..7f498ef1ed 100644 --- a/ports/esp8266/modutime.c +++ b/ports/esp8266/modutime.c @@ -129,3 +129,5 @@ const mp_obj_module_t utime_module = { .base = { &mp_type_module }, .globals = (mp_obj_dict_t *)&time_module_globals, }; + +MP_REGISTER_MODULE(MP_QSTR_utime, utime_module, 1); diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h index 63577e7b08..a64bc8f86d 100644 --- a/ports/esp8266/mpconfigport.h +++ b/ports/esp8266/mpconfigport.h @@ -159,14 +159,6 @@ extern const struct _mp_print_t mp_debug_print; #define MICROPY_PORT_BUILTINS \ { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) }, -// extra built in modules to add to the list of known ones -extern const struct _mp_obj_module_t esp_module; -extern const struct _mp_obj_module_t utime_module; - -#define MICROPY_PORT_BUILTIN_MODULES \ - { MP_ROM_QSTR(MP_QSTR_esp), MP_ROM_PTR(&esp_module) }, \ - { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&utime_module) }, \ - #define MP_STATE_PORT MP_STATE_VM #define MICROPY_PORT_ROOT_POINTERS \