From 24127a4ac4a4beabe89815b2d3ecd04311f96634 Mon Sep 17 00:00:00 2001 From: Jim Mussared Date: Wed, 20 Apr 2022 17:21:05 +1000 Subject: [PATCH] esp32: Make port-specific modules use MP_REGISTER_MODULE. Signed-off-by: Jim Mussared --- ports/esp32/modesp.c | 2 ++ ports/esp32/modesp32.c | 2 ++ ports/esp32/modutime.c | 2 ++ ports/esp32/mpconfigport.h | 10 ---------- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ports/esp32/modesp.c b/ports/esp32/modesp.c index b5beaf5053..fc9b0ec084 100644 --- a/ports/esp32/modesp.c +++ b/ports/esp32/modesp.c @@ -142,3 +142,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/esp32/modesp32.c b/ports/esp32/modesp32.c index 4579c5de11..1cdf234f41 100644 --- a/ports/esp32/modesp32.c +++ b/ports/esp32/modesp32.c @@ -224,3 +224,5 @@ const mp_obj_module_t esp32_module = { .base = { &mp_type_module }, .globals = (mp_obj_dict_t *)&esp32_module_globals, }; + +MP_REGISTER_MODULE(MP_QSTR_esp32, esp32_module, 1); diff --git a/ports/esp32/modutime.c b/ports/esp32/modutime.c index f864df678f..ca0d6b8274 100644 --- a/ports/esp32/modutime.c +++ b/ports/esp32/modutime.c @@ -106,3 +106,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/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h index 32dea05b4f..a3e4acf065 100644 --- a/ports/esp32/mpconfigport.h +++ b/ports/esp32/mpconfigport.h @@ -136,16 +136,6 @@ { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&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 esp32_module; -extern const struct _mp_obj_module_t utime_module; - -#define MICROPY_PORT_BUILTIN_MODULES \ - { MP_OBJ_NEW_QSTR(MP_QSTR_esp), (mp_obj_t)&esp_module }, \ - { MP_OBJ_NEW_QSTR(MP_QSTR_esp32), (mp_obj_t)&esp32_module }, \ - { MP_OBJ_NEW_QSTR(MP_QSTR_utime), (mp_obj_t)&utime_module }, \ - #define MP_STATE_PORT MP_STATE_VM struct _machine_timer_obj_t;