mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nrf: Make port-specific modules use MP_REGISTER_MODULE. 

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This commit is contained in:
Jim Mussared 2022-04-20 17:34:30 +10:00
parent 7d79fd7e8b
commit f67ac90fa9
10 changed files with 16 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ports/nrf/boards/microbit/modules/boardmodules.h
View File

@ -29,9 +29,4 @@
#include "modmicrobit.h" #include "modmicrobit.h"
extern const struct _mp_obj_module_t microbit_module;
#define BOARD_MODULES \
{ MP_ROM_QSTR(MP_QSTR_microbit), MP_ROM_PTR(&microbit_module) }, \
#endif // MICROPY_INCLUDED_NRF_BOARD_MICROBIT_BOARD_MODULES_H #endif // MICROPY_INCLUDED_NRF_BOARD_MICROBIT_BOARD_MODULES_H

2
ports/nrf/boards/microbit/modules/modmicrobit.c
View File

@ -156,3 +156,5 @@ const mp_obj_module_t microbit_module = {
.base = { &mp_type_module }, .base = { &mp_type_module },
.globals = (mp_obj_dict_t*)&microbit_module_globals, .globals = (mp_obj_dict_t*)&microbit_module_globals,
}; };
MP_REGISTER_MODULE(MP_QSTR_microbit, microbit_module, 1);

2
ports/nrf/modules/ble/modble.c
View File

@ -102,4 +102,6 @@ const mp_obj_module_t ble_module = {
.globals = (mp_obj_dict_t*)&ble_module_globals, .globals = (mp_obj_dict_t*)&ble_module_globals,
}; };
MP_REGISTER_MODULE(MP_QSTR_ble, ble_module, MICROPY_PY_BLE);
#endif // MICROPY_PY_BLE #endif // MICROPY_PY_BLE

2
ports/nrf/modules/board/modboard.c
View File

@ -53,3 +53,5 @@ const mp_obj_module_t board_module = {
.base = { &mp_type_module }, .base = { &mp_type_module },
.globals = (mp_obj_dict_t*)&board_module_globals, .globals = (mp_obj_dict_t*)&board_module_globals,
}; };
MP_REGISTER_MODULE(MP_QSTR_board, board_module, 1);

2
ports/nrf/modules/music/modmusic.c
View File

@ -509,4 +509,6 @@ const mp_obj_module_t music_module = {
.globals = (mp_obj_dict_t*)&microbit_music_locals_dict, .globals = (mp_obj_dict_t*)&microbit_music_locals_dict,
}; };
MP_REGISTER_MODULE(MP_QSTR_music, music_module, MICROPY_PY_MUSIC);
#endif // MICROPY_PY_MUSIC #endif // MICROPY_PY_MUSIC

2
ports/nrf/modules/nrf/modnrf.c
View File

@ -95,4 +95,6 @@ const mp_obj_module_t nrf_module = {
.globals = (mp_obj_dict_t *)&nrf_module_globals, .globals = (mp_obj_dict_t *)&nrf_module_globals,
}; };
MP_REGISTER_MODULE(MP_QSTR_nrf, nrf_module, MICROPY_PY_NRF);
#endif // MICROPY_PY_NRF #endif // MICROPY_PY_NRF

2
ports/nrf/modules/ubluepy/modubluepy.c
View File

@ -67,4 +67,6 @@ const mp_obj_module_t mp_module_ubluepy = {
.globals = (mp_obj_dict_t*)&mp_module_ubluepy_globals, .globals = (mp_obj_dict_t*)&mp_module_ubluepy_globals,
}; };
MP_REGISTER_MODULE(MP_QSTR_ubluepy, mp_module_ubluepy, MICROPY_PY_UBLUEPY);
#endif // MICROPY_PY_UBLUEPY #endif // MICROPY_PY_UBLUEPY

2
ports/nrf/modules/uos/moduos.c
View File

@ -196,3 +196,5 @@ const mp_obj_module_t mp_module_uos = {
.base = { &mp_type_module }, .base = { &mp_type_module },
.globals = (mp_obj_dict_t*)&os_module_globals, .globals = (mp_obj_dict_t*)&os_module_globals,
}; };
MP_REGISTER_MODULE(MP_QSTR_uos, mp_module_uos, 1);

2
ports/nrf/modules/utime/modutime.c
View File

@ -54,3 +54,5 @@ const mp_obj_module_t mp_module_utime = {
.base = { &mp_type_module }, .base = { &mp_type_module },
.globals = (mp_obj_dict_t*)&time_module_globals, .globals = (mp_obj_dict_t*)&time_module_globals,
}; };
MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1);

55
ports/nrf/mpconfigport.h
View File

@ -226,65 +226,10 @@ extern const struct _mp_obj_module_t mp_module_uos;
extern const struct _mp_obj_module_t mp_module_ubluepy; extern const struct _mp_obj_module_t mp_module_ubluepy;
extern const struct _mp_obj_module_t music_module; extern const struct _mp_obj_module_t music_module;
#if MICROPY_PY_NRF
#define NRF_MODULE { MP_ROM_QSTR(MP_QSTR_nrf), MP_ROM_PTR(&nrf_module) },
#else
#define NRF_MODULE
#endif
#if MICROPY_PY_UBLUEPY
#define UBLUEPY_MODULE { MP_ROM_QSTR(MP_QSTR_ubluepy), MP_ROM_PTR(&mp_module_ubluepy) },
#else
#define UBLUEPY_MODULE
#endif
#if MICROPY_PY_MUSIC
#define MUSIC_MODULE { MP_ROM_QSTR(MP_QSTR_music), MP_ROM_PTR(&music_module) },
#else
#define MUSIC_MODULE
#endif
#if BOARD_SPECIFIC_MODULES #if BOARD_SPECIFIC_MODULES
#include "boardmodules.h" #include "boardmodules.h"
#define MICROPY_BOARD_BUILTINS BOARD_MODULES
#else
#define MICROPY_BOARD_BUILTINS
#endif // BOARD_SPECIFIC_MODULES #endif // BOARD_SPECIFIC_MODULES
#if BLUETOOTH_SD
#if MICROPY_PY_BLE
extern const struct _mp_obj_module_t ble_module;
#define BLE_MODULE { MP_ROM_QSTR(MP_QSTR_ble), MP_ROM_PTR(&ble_module) },
#else
#define BLE_MODULE
#endif
#define MICROPY_PORT_BUILTIN_MODULES \
{ MP_ROM_QSTR(MP_QSTR_board), MP_ROM_PTR(&board_module) }, \
{ MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
{ MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mp_module_utime) }, \
{ MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
BLE_MODULE \
MUSIC_MODULE \
UBLUEPY_MODULE \
MICROPY_BOARD_BUILTINS \
NRF_MODULE \
#else
extern const struct _mp_obj_module_t ble_module;
#define MICROPY_PORT_BUILTIN_MODULES \
{ MP_ROM_QSTR(MP_QSTR_board), MP_ROM_PTR(&board_module) }, \
{ MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
{ MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
MUSIC_MODULE \
MICROPY_BOARD_BUILTINS \
NRF_MODULE \
#endif // BLUETOOTH_SD
// extra built in names to add to the global namespace // extra built in names to add to the global namespace
#define MICROPY_PORT_BUILTINS \ #define MICROPY_PORT_BUILTINS \
{ MP_ROM_QSTR(MP_QSTR_help), MP_ROM_PTR(&mp_builtin_help_obj) }, \ { MP_ROM_QSTR(MP_QSTR_help), MP_ROM_PTR(&mp_builtin_help_obj) }, \