Skip to content

Commit 62f00a4

Browse files
committed
rp2: Make port-specific modules use MP_REGISTER_MODULE.
Signed-off-by: Jim Mussared <[email protected]>
1 parent 60c5968 commit 62f00a4

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

ports/rp2/modrp2.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,5 @@ const mp_obj_module_t mp_module_rp2 = {
4242
.base = { &mp_type_module },
4343
.globals = (mp_obj_dict_t *)&rp2_module_globals,
4444
};
45+
46+
MP_REGISTER_MODULE(MP_QSTR__rp2, mp_module_rp2, 1);

ports/rp2/modutime.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,3 +125,5 @@ const mp_obj_module_t mp_module_utime = {
125125
.base = { &mp_type_module },
126126
.globals = (mp_obj_dict_t *)&mp_module_time_globals,
127127
};
128+
129+
MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1);

ports/rp2/mpconfigport.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,6 @@
134134
#define MICROPY_PORT_BUILTINS \
135135
{ MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
136136

137-
extern const struct _mp_obj_module_t mp_module_rp2;
138-
extern const struct _mp_obj_module_t mp_module_utime;
139-
140137
#if MICROPY_PY_NETWORK
141138
#define NETWORK_ROOT_POINTERS mp_obj_list_t mod_network_nic_list;
142139
#else
@@ -171,10 +168,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_nina;
171168
#define MICROPY_PORT_ROOT_POINTER_NINAW10
172169
#endif
173170

174-
#define MICROPY_PORT_BUILTIN_MODULES \
175-
{ MP_OBJ_NEW_QSTR(MP_QSTR__rp2), (mp_obj_t)&mp_module_rp2 }, \
176-
{ MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
177-
178171
#ifndef MICROPY_BOARD_NETWORK_INTERFACES
179172
#define MICROPY_BOARD_NETWORK_INTERFACES
180173
#endif

0 commit comments

Comments
 (0)