cc3200: Make port-specific modules use MP_REGISTER_MODULE.

jimmo · jimmo · commit 1d33ceb0d023 · 2022-05-18T20:57:09.000+10:00
Signed-off-by: Jim Mussared &lt;jim.mussared@gmail.com&gt;
diff --git a/ports/cc3200/mods/modnetwork.c b/ports/cc3200/mods/modnetwork.c
@@ -159,6 +159,8 @@ const mp_obj_module_t mp_module_network = {
     .globals = (mp_obj_dict_t*)&mp_module_network_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_network, mp_module_network, 1);
+
 #if (MICROPY_PORT_HAS_TELNET || MICROPY_PORT_HAS_FTP)
 STATIC const mp_rom_map_elem_t network_server_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init),                MP_ROM_PTR(&network_server_init_obj) },
diff --git a/ports/cc3200/mods/moduos.c b/ports/cc3200/mods/moduos.c
@@ -179,3 +179,5 @@ const mp_obj_module_t mp_module_uos = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&os_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_uos, mp_module_uos, 1);
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c
@@ -816,3 +816,5 @@ const mp_obj_module_t mp_module_usocket = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&mp_module_usocket_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket, 1);
diff --git a/ports/cc3200/mods/modussl.c b/ports/cc3200/mods/modussl.c
@@ -161,3 +161,4 @@ const mp_obj_module_t mp_module_ussl = {
     .globals = (mp_obj_dict_t*)&mp_module_ussl_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_ussl, mp_module_ussl, 1);
diff --git a/ports/cc3200/mods/modutime.c b/ports/cc3200/mods/modutime.c
@@ -155,3 +155,5 @@ const mp_obj_module_t mp_module_utime = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&time_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1);
diff --git a/ports/cc3200/mods/modwipy.c b/ports/cc3200/mods/modwipy.c
@@ -28,3 +28,5 @@ const mp_obj_module_t wipy_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&wipy_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_wipy, wipy_module, 1);
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
@@ -144,28 +144,6 @@
 #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 wipy_module;
-extern const struct _mp_obj_module_t mp_module_ure;
-extern const struct _mp_obj_module_t mp_module_ujson;
-extern const struct _mp_obj_module_t mp_module_uos;
-extern const struct _mp_obj_module_t mp_module_utime;
-extern const struct _mp_obj_module_t mp_module_uselect;
-extern const struct _mp_obj_module_t mp_module_usocket;
-extern const struct _mp_obj_module_t mp_module_network;
-extern const struct _mp_obj_module_t mp_module_ubinascii;
-extern const struct _mp_obj_module_t mp_module_ussl;
-
-#define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_wipy),        MP_ROM_PTR(&wipy_module) },         \
-    { MP_ROM_QSTR(MP_QSTR_uos),         MP_ROM_PTR(&mp_module_uos) },       \
-    { MP_ROM_QSTR(MP_QSTR_utime),       MP_ROM_PTR(&mp_module_utime) },     \
-    { MP_ROM_QSTR(MP_QSTR_uselect),     MP_ROM_PTR(&mp_module_uselect) },   \
-    { MP_ROM_QSTR(MP_QSTR_usocket),     MP_ROM_PTR(&mp_module_usocket) },   \
-    { MP_ROM_QSTR(MP_QSTR_network),     MP_ROM_PTR(&mp_module_network) },   \
-    { MP_ROM_QSTR(MP_QSTR_ubinascii),   MP_ROM_PTR(&mp_module_ubinascii) }, \
-    { MP_ROM_QSTR(MP_QSTR_ussl),        MP_ROM_PTR(&mp_module_ussl) },      \
-
 // extra constants
 #define MICROPY_PORT_CONSTANTS \
     { MP_ROM_QSTR(MP_QSTR_umachine),     MP_ROM_PTR(&mp_module_machine) },  \

Original file line number	Diff line number	Diff line change
`@@ -161,3 +161,4 @@ const mp_obj_module_t mp_module_ussl = {`
`161`	`161`	`.globals = (mp_obj_dict_t*)&mp_module_ussl_globals,`
`162`	`162`	`};`
`163`	`163`
	`164`	`+MP_REGISTER_MODULE(MP_QSTR_ussl, mp_module_ussl, 1);`