diff options
Diffstat (limited to 'ports')
57 files changed, 112 insertions, 57 deletions
diff --git a/ports/cc3200/mods/modmachine.c b/ports/cc3200/mods/modmachine.c index be8b7d6b5..782ccc55a 100644 --- a/ports/cc3200/mods/modmachine.c +++ b/ports/cc3200/mods/modmachine.c @@ -214,4 +214,4 @@ const mp_obj_module_t mp_module_machine = { .globals = (mp_obj_dict_t*)&machine_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE); +MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine); diff --git a/ports/cc3200/mods/modnetwork.c b/ports/cc3200/mods/modnetwork.c index 61996feb5..d6ccc7c6a 100644 --- a/ports/cc3200/mods/modnetwork.c +++ b/ports/cc3200/mods/modnetwork.c @@ -159,7 +159,7 @@ 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); +MP_REGISTER_MODULE(MP_QSTR_network, mp_module_network); #if (MICROPY_PORT_HAS_TELNET || MICROPY_PORT_HAS_FTP) STATIC const mp_rom_map_elem_t network_server_locals_dict_table[] = { diff --git a/ports/cc3200/mods/moduos.c b/ports/cc3200/mods/moduos.c index 5825ca691..cd01b59b3 100644 --- a/ports/cc3200/mods/moduos.c +++ b/ports/cc3200/mods/moduos.c @@ -180,4 +180,4 @@ const mp_obj_module_t mp_module_uos = { .globals = (mp_obj_dict_t*)&os_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_uos, mp_module_uos, 1); +MP_REGISTER_MODULE(MP_QSTR_uos, mp_module_uos); diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c index 65fc3ae29..32849c51d 100644 --- a/ports/cc3200/mods/modusocket.c +++ b/ports/cc3200/mods/modusocket.c @@ -817,4 +817,4 @@ const mp_obj_module_t mp_module_usocket = { .globals = (mp_obj_dict_t*)&mp_module_usocket_globals, }; -MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket, 1); +MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket); diff --git a/ports/cc3200/mods/modussl.c b/ports/cc3200/mods/modussl.c index 7bfb02b1d..cd2c62dcb 100644 --- a/ports/cc3200/mods/modussl.c +++ b/ports/cc3200/mods/modussl.c @@ -161,4 +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); +MP_REGISTER_MODULE(MP_QSTR_ussl, mp_module_ussl); diff --git a/ports/cc3200/mods/modutime.c b/ports/cc3200/mods/modutime.c index 4f4c36340..237a80065 100644 --- a/ports/cc3200/mods/modutime.c +++ b/ports/cc3200/mods/modutime.c @@ -156,4 +156,4 @@ const mp_obj_module_t mp_module_utime = { .globals = (mp_obj_dict_t*)&time_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1); +MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime); diff --git a/ports/cc3200/mods/modwipy.c b/ports/cc3200/mods/modwipy.c index c85958375..110c3cfd3 100644 --- a/ports/cc3200/mods/modwipy.c +++ b/ports/cc3200/mods/modwipy.c @@ -29,4 +29,4 @@ const mp_obj_module_t wipy_module = { .globals = (mp_obj_dict_t*)&wipy_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_wipy, wipy_module, 1); +MP_REGISTER_MODULE(MP_QSTR_wipy, wipy_module); diff --git a/ports/esp32/modesp.c b/ports/esp32/modesp.c index fc9b0ec08..0c6429be7 100644 --- a/ports/esp32/modesp.c +++ b/ports/esp32/modesp.c @@ -143,4 +143,4 @@ const mp_obj_module_t esp_module = { .globals = (mp_obj_dict_t *)&esp_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_esp, esp_module, 1); +MP_REGISTER_MODULE(MP_QSTR_esp, esp_module); diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c index 1cdf234f4..0dbd7efda 100644 --- a/ports/esp32/modesp32.c +++ b/ports/esp32/modesp32.c @@ -225,4 +225,4 @@ const mp_obj_module_t esp32_module = { .globals = (mp_obj_dict_t *)&esp32_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_esp32, esp32_module, 1); +MP_REGISTER_MODULE(MP_QSTR_esp32, esp32_module); diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c index f1e261634..aee3be0e7 100644 --- a/ports/esp32/modmachine.c +++ b/ports/esp32/modmachine.c @@ -337,6 +337,6 @@ const mp_obj_module_t mp_module_machine = { .globals = (mp_obj_dict_t *)&machine_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE); +MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine); #endif // MICROPY_PY_MACHINE diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c index 199836e36..45231c423 100644 --- a/ports/esp32/modnetwork.c +++ b/ports/esp32/modnetwork.c @@ -298,4 +298,4 @@ const mp_obj_module_t mp_module_network = { // Note: This port doesn't define MICROPY_PY_NETWORK so this will not conflict // with the common implementation provided by extmod/modnetwork.c. -MP_REGISTER_MODULE(MP_QSTR_network, mp_module_network, 1); +MP_REGISTER_MODULE(MP_QSTR_network, mp_module_network); diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c index aa3a8d1b6..819ea26e9 100644 --- a/ports/esp32/modsocket.c +++ b/ports/esp32/modsocket.c @@ -871,4 +871,4 @@ const mp_obj_module_t mp_module_usocket = { // Note: This port doesn't define MICROPY_PY_USOCKET or MICROPY_PY_LWIP so // this will not conflict with the common implementation provided by // extmod/mod{lwip,usocket}.c. -MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket, 1); +MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket); diff --git a/ports/esp32/modutime.c b/ports/esp32/modutime.c index ca0d6b827..631d0fe29 100644 --- a/ports/esp32/modutime.c +++ b/ports/esp32/modutime.c @@ -107,4 +107,4 @@ const mp_obj_module_t utime_module = { .globals = (mp_obj_dict_t *)&time_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_utime, utime_module, 1); +MP_REGISTER_MODULE(MP_QSTR_utime, utime_module); diff --git a/ports/esp8266/modesp.c b/ports/esp8266/modesp.c index a6084e48b..645de7fe9 100644 --- a/ports/esp8266/modesp.c +++ b/ports/esp8266/modesp.c @@ -380,4 +380,4 @@ const mp_obj_module_t esp_module = { .globals = (mp_obj_dict_t *)&esp_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_esp, esp_module, 1); +MP_REGISTER_MODULE(MP_QSTR_esp, esp_module); diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c index ef1b50f63..1dd87b9af 100644 --- a/ports/esp8266/modmachine.c +++ b/ports/esp8266/modmachine.c @@ -453,6 +453,6 @@ const mp_obj_module_t mp_module_machine = { .globals = (mp_obj_dict_t *)&machine_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE); +MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine); #endif // MICROPY_PY_MACHINE diff --git a/ports/esp8266/modnetwork.c b/ports/esp8266/modnetwork.c index d24bc147e..dc1b435fb 100644 --- a/ports/esp8266/modnetwork.c +++ b/ports/esp8266/modnetwork.c @@ -548,4 +548,4 @@ const mp_obj_module_t network_module = { // Note: This port doesn't define MICROPY_PY_NETWORK so this will not conflict // with the common implementation provided by extmod/modnetwork.c. -MP_REGISTER_MODULE(MP_QSTR_network, network_module, 1); +MP_REGISTER_MODULE(MP_QSTR_network, network_module); diff --git a/ports/esp8266/modutime.c b/ports/esp8266/modutime.c index 7f498ef1e..08508f881 100644 --- a/ports/esp8266/modutime.c +++ b/ports/esp8266/modutime.c @@ -130,4 +130,4 @@ const mp_obj_module_t utime_module = { .globals = (mp_obj_dict_t *)&time_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_utime, utime_module, 1); +MP_REGISTER_MODULE(MP_QSTR_utime, utime_module); diff --git a/ports/javascript/modutime.c b/ports/javascript/modutime.c index 92ddd4729..76fe8df37 100644 --- a/ports/javascript/modutime.c +++ b/ports/javascript/modutime.c @@ -55,4 +55,4 @@ const mp_obj_module_t mp_module_utime = { .globals = (mp_obj_dict_t *)&time_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1); +MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime); diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c index fd83ebaad..ad4e4a594 100644 --- a/ports/mimxrt/modmachine.c +++ b/ports/mimxrt/modmachine.c @@ -39,6 +39,8 @@ #include "fsl_clock.h" #include "fsl_wdog.h" +#if MICROPY_PY_MACHINE + #include CPU_HEADER_H typedef enum { @@ -160,4 +162,6 @@ const mp_obj_module_t mp_module_machine = { .globals = (mp_obj_dict_t *)&machine_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE); +MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine); + +#endif // MICROPY_PY_MACHINE diff --git a/ports/mimxrt/modmimxrt.c b/ports/mimxrt/modmimxrt.c index 0091c36ff..9dd38ee07 100644 --- a/ports/mimxrt/modmimxrt.c +++ b/ports/mimxrt/modmimxrt.c @@ -42,4 +42,4 @@ const mp_obj_module_t mp_module_mimxrt = { .globals = (mp_obj_dict_t *)&mimxrt_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_mimxrt, mp_module_mimxrt, 1); +MP_REGISTER_MODULE(MP_QSTR_mimxrt, mp_module_mimxrt); diff --git a/ports/mimxrt/modutime.c b/ports/mimxrt/modutime.c index f24ce43c0..b1defff77 100644 --- a/ports/mimxrt/modutime.c +++ b/ports/mimxrt/modutime.c @@ -135,4 +135,4 @@ const mp_obj_module_t mp_module_utime = { .globals = (mp_obj_dict_t *)&time_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1); +MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime); diff --git a/ports/nrf/boards/microbit/modules/modmicrobit.c b/ports/nrf/boards/microbit/modules/modmicrobit.c index bb721357d..c6aa445b1 100644 --- a/ports/nrf/boards/microbit/modules/modmicrobit.c +++ b/ports/nrf/boards/microbit/modules/modmicrobit.c @@ -157,4 +157,4 @@ const mp_obj_module_t microbit_module = { .globals = (mp_obj_dict_t*)µbit_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_microbit, microbit_module, 1); +MP_REGISTER_MODULE(MP_QSTR_microbit, microbit_module); diff --git a/ports/nrf/modules/ble/modble.c b/ports/nrf/modules/ble/modble.c index 6726c63c4..3a9c6b20d 100644 --- a/ports/nrf/modules/ble/modble.c +++ b/ports/nrf/modules/ble/modble.c @@ -102,6 +102,6 @@ const mp_obj_module_t ble_module = { .globals = (mp_obj_dict_t*)&ble_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_ble, ble_module, MICROPY_PY_BLE); +MP_REGISTER_MODULE(MP_QSTR_ble, ble_module); #endif // MICROPY_PY_BLE diff --git a/ports/nrf/modules/board/modboard.c b/ports/nrf/modules/board/modboard.c index 45dd9f30e..1fe3dcc5c 100644 --- a/ports/nrf/modules/board/modboard.c +++ b/ports/nrf/modules/board/modboard.c @@ -54,4 +54,4 @@ const mp_obj_module_t board_module = { .globals = (mp_obj_dict_t*)&board_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_board, board_module, 1); +MP_REGISTER_MODULE(MP_QSTR_board, board_module); diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c index 65297548a..1378ba8f4 100644 --- a/ports/nrf/modules/machine/modmachine.c +++ b/ports/nrf/modules/machine/modmachine.c @@ -55,6 +55,8 @@ #include "rtcounter.h" #endif +#if MICROPY_PY_MACHINE + #define PYB_RESET_HARD (0) #define PYB_RESET_WDT (1) #define PYB_RESET_SOFT (2) @@ -249,4 +251,6 @@ const mp_obj_module_t mp_module_machine = { .globals = (mp_obj_dict_t*)&machine_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE); +MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine); + +#endif // MICROPY_PY_MACHINE diff --git a/ports/nrf/modules/music/modmusic.c b/ports/nrf/modules/music/modmusic.c index c8c6775de..a950b0392 100644 --- a/ports/nrf/modules/music/modmusic.c +++ b/ports/nrf/modules/music/modmusic.c @@ -509,6 +509,6 @@ const mp_obj_module_t music_module = { .globals = (mp_obj_dict_t*)µbit_music_locals_dict, }; -MP_REGISTER_MODULE(MP_QSTR_music, music_module, MICROPY_PY_MUSIC); +MP_REGISTER_MODULE(MP_QSTR_music, music_module); #endif // MICROPY_PY_MUSIC diff --git a/ports/nrf/modules/nrf/modnrf.c b/ports/nrf/modules/nrf/modnrf.c index ab7d043f4..6533fa121 100644 --- a/ports/nrf/modules/nrf/modnrf.c +++ b/ports/nrf/modules/nrf/modnrf.c @@ -95,6 +95,6 @@ const mp_obj_module_t nrf_module = { .globals = (mp_obj_dict_t *)&nrf_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_nrf, nrf_module, MICROPY_PY_NRF); +MP_REGISTER_MODULE(MP_QSTR_nrf, nrf_module); #endif // MICROPY_PY_NRF diff --git a/ports/nrf/modules/ubluepy/modubluepy.c b/ports/nrf/modules/ubluepy/modubluepy.c index d888b6dd5..fd42c4940 100644 --- a/ports/nrf/modules/ubluepy/modubluepy.c +++ b/ports/nrf/modules/ubluepy/modubluepy.c @@ -67,6 +67,6 @@ const mp_obj_module_t mp_module_ubluepy = { .globals = (mp_obj_dict_t*)&mp_module_ubluepy_globals, }; -MP_REGISTER_MODULE(MP_QSTR_ubluepy, mp_module_ubluepy, MICROPY_PY_UBLUEPY); +MP_REGISTER_MODULE(MP_QSTR_ubluepy, mp_module_ubluepy); #endif // MICROPY_PY_UBLUEPY diff --git a/ports/nrf/modules/uos/moduos.c b/ports/nrf/modules/uos/moduos.c index ea60df7a6..184f833ef 100644 --- a/ports/nrf/modules/uos/moduos.c +++ b/ports/nrf/modules/uos/moduos.c @@ -197,4 +197,4 @@ const mp_obj_module_t mp_module_uos = { .globals = (mp_obj_dict_t*)&os_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_uos, mp_module_uos, 1); +MP_REGISTER_MODULE(MP_QSTR_uos, mp_module_uos); diff --git a/ports/nrf/modules/utime/modutime.c b/ports/nrf/modules/utime/modutime.c index 6fe2da474..efbae3f58 100644 --- a/ports/nrf/modules/utime/modutime.c +++ b/ports/nrf/modules/utime/modutime.c @@ -55,4 +55,4 @@ const mp_obj_module_t mp_module_utime = { .globals = (mp_obj_dict_t*)&time_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1); +MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime); diff --git a/ports/pic16bit/modpyb.c b/ports/pic16bit/modpyb.c index 61955509e..9774105d6 100644 --- a/ports/pic16bit/modpyb.c +++ b/ports/pic16bit/modpyb.c @@ -69,4 +69,4 @@ const mp_obj_module_t pyb_module = { .globals = (mp_obj_dict_t *)&pyb_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_pyb, pyb_module, 1); +MP_REGISTER_MODULE(MP_QSTR_pyb, pyb_module); diff --git a/ports/qemu-arm/modmachine.c b/ports/qemu-arm/modmachine.c index 1168e74a1..515452f41 100644 --- a/ports/qemu-arm/modmachine.c +++ b/ports/qemu-arm/modmachine.c @@ -28,6 +28,8 @@ #include "extmod/machine_pinbase.h" #include "extmod/machine_signal.h" +#if MICROPY_PY_MACHINE + STATIC const mp_rom_map_elem_t machine_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_umachine) }, @@ -46,4 +48,6 @@ const mp_obj_module_t mp_module_machine = { .globals = (mp_obj_dict_t *)&machine_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE); +MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine); + +#endif // MICROPY_PY_MACHINE diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c index e505a49ff..cd6e75034 100644 --- a/ports/renesas-ra/modmachine.c +++ b/ports/renesas-ra/modmachine.c @@ -55,6 +55,7 @@ #include "spi.h" #include "uart.h" +#if MICROPY_PY_MACHINE #define PYB_RESET_SOFT (0) #define PYB_RESET_POWER_ON (1) @@ -303,4 +304,6 @@ const mp_obj_module_t mp_module_machine = { .globals = (mp_obj_dict_t *)&machine_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE); +MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine); + +#endif // MICROPY_PY_MACHINE diff --git a/ports/renesas-ra/modutime.c b/ports/renesas-ra/modutime.c index 2bd0adfa2..d0b670df4 100644 --- a/ports/renesas-ra/modutime.c +++ b/ports/renesas-ra/modutime.c @@ -35,6 +35,8 @@ #include "systick.h" #include "rtc.h" +#if MICROPY_PY_UTIME + /// \module time - time related functions /// /// The `time` module provides functions for getting the current time and date, @@ -157,4 +159,6 @@ const mp_obj_module_t mp_module_utime = { .globals = (mp_obj_dict_t *)&time_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, MICROPY_PY_UTIME); +MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime); + +#endif // MICROPY_PY_UTIME diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c index d6941bcfe..fbaf29ee1 100644 --- a/ports/rp2/modmachine.c +++ b/ports/rp2/modmachine.c @@ -43,6 +43,8 @@ #include "pico/stdlib.h" #include "pico/unique_id.h" +#if MICROPY_PY_MACHINE + #define RP2_RESET_PWRON (1) #define RP2_RESET_WDT (3) @@ -188,4 +190,6 @@ const mp_obj_module_t mp_module_machine = { .globals = (mp_obj_dict_t *)&machine_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE); +MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine); + +#endif // MICROPY_PY_MACHINE diff --git a/ports/rp2/modrp2.c b/ports/rp2/modrp2.c index 9c5223587..5dc066d65 100644 --- a/ports/rp2/modrp2.c +++ b/ports/rp2/modrp2.c @@ -43,4 +43,4 @@ const mp_obj_module_t mp_module_rp2 = { .globals = (mp_obj_dict_t *)&rp2_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR__rp2, mp_module_rp2, 1); +MP_REGISTER_MODULE(MP_QSTR__rp2, mp_module_rp2); diff --git a/ports/rp2/modutime.c b/ports/rp2/modutime.c index b73eacf87..ac291c893 100644 --- a/ports/rp2/modutime.c +++ b/ports/rp2/modutime.c @@ -126,4 +126,4 @@ const mp_obj_module_t mp_module_utime = { .globals = (mp_obj_dict_t *)&mp_module_time_globals, }; -MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1); +MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime); diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c index 8da83b7d2..74e357175 100644 --- a/ports/samd/modmachine.c +++ b/ports/samd/modmachine.c @@ -35,6 +35,8 @@ #include "hpl_gclk_base.h" #include "hpl_pm_base.h" +#if MICROPY_PY_MACHINE + #if defined(MCU_SAMD21) #define DBL_TAP_ADDR ((volatile uint32_t *)(0x20000000 + 32 * 1024 - 4)) #elif defined(MCU_SAMD51) @@ -129,4 +131,6 @@ const mp_obj_module_t mp_module_machine = { .globals = (mp_obj_dict_t *)&machine_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE); +MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine); + +#endif // MICROPY_PY_MACHINE diff --git a/ports/samd/modsamd.c b/ports/samd/modsamd.c index 387ced5cf..68fd6b53e 100644 --- a/ports/samd/modsamd.c +++ b/ports/samd/modsamd.c @@ -40,4 +40,4 @@ const mp_obj_module_t mp_module_samd = { .globals = (mp_obj_dict_t *)&samd_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_samd, mp_module_samd, 1); +MP_REGISTER_MODULE(MP_QSTR_samd, mp_module_samd); diff --git a/ports/samd/modutime.c b/ports/samd/modutime.c index 0b872a297..bbeedcfda 100644 --- a/ports/samd/modutime.c +++ b/ports/samd/modutime.c @@ -100,4 +100,4 @@ const mp_obj_module_t mp_module_utime = { .globals = (mp_obj_dict_t *)&time_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1); +MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime); diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c index 20140ed10..5fca9b3e0 100644 --- a/ports/stm32/modmachine.c +++ b/ports/stm32/modmachine.c @@ -396,6 +396,8 @@ STATIC mp_obj_t machine_reset_cause(void) { } STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause); +#if MICROPY_PY_MACHINE + STATIC const mp_rom_map_elem_t machine_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_umachine) }, { MP_ROM_QSTR(MP_QSTR_info), MP_ROM_PTR(&machine_info_obj) }, @@ -481,4 +483,6 @@ const mp_obj_module_t mp_module_machine = { .globals = (mp_obj_dict_t *)&machine_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE); +MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine); + +#endif // MICROPY_PY_MACHINE diff --git a/ports/stm32/modpyb.c b/ports/stm32/modpyb.c index d23065e4b..96e719c6b 100644 --- a/ports/stm32/modpyb.c +++ b/ports/stm32/modpyb.c @@ -58,6 +58,8 @@ char pyb_country_code[2]; +#if MICROPY_PY_PYB + STATIC mp_obj_t pyb_fault_debug(mp_obj_t value) { pyb_hard_fault_debug = mp_obj_is_true(value); return mp_const_none; @@ -266,4 +268,6 @@ const mp_obj_module_t pyb_module = { .globals = (mp_obj_dict_t *)&pyb_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_pyb, pyb_module, MICROPY_PY_PYB); +MP_REGISTER_MODULE(MP_QSTR_pyb, pyb_module); + +#endif // MICROPY_PY_PYB diff --git a/ports/stm32/modstm.c b/ports/stm32/modstm.c index 185ec1a2f..94d56d4d0 100644 --- a/ports/stm32/modstm.c +++ b/ports/stm32/modstm.c @@ -60,6 +60,6 @@ const mp_obj_module_t stm_module = { .globals = (mp_obj_dict_t *)&stm_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_stm, stm_module, MICROPY_PY_STM); +MP_REGISTER_MODULE(MP_QSTR_stm, stm_module); #endif // MICROPY_PY_STM diff --git a/ports/stm32/modutime.c b/ports/stm32/modutime.c index d8ac156de..72a2be303 100644 --- a/ports/stm32/modutime.c +++ b/ports/stm32/modutime.c @@ -129,6 +129,8 @@ STATIC mp_obj_t time_time(void) { } MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time); +#if MICROPY_PY_UTIME + STATIC const mp_rom_map_elem_t time_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) }, @@ -154,4 +156,6 @@ const mp_obj_module_t mp_module_utime = { .globals = (mp_obj_dict_t *)&time_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, MICROPY_PY_UTIME); +MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime); + +#endif // MICROPY_PY_UTIME diff --git a/ports/teensy/modpyb.c b/ports/teensy/modpyb.c index b8fcfaaa5..3939607ad 100644 --- a/ports/teensy/modpyb.c +++ b/ports/teensy/modpyb.c @@ -361,4 +361,4 @@ const mp_obj_module_t pyb_module = { .globals = (mp_obj_dict_t *)&pyb_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_pyb, pyb_module, 1); +MP_REGISTER_MODULE(MP_QSTR_pyb, pyb_module); diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c index b692af4df..d82d5270f 100644 --- a/ports/unix/modffi.c +++ b/ports/unix/modffi.c @@ -38,6 +38,8 @@ #include "py/objint.h" #include "py/gc.h" +#if MICROPY_PY_FFI + /* * modffi uses character codes to encode a value type, based on "struct" * module type codes, with some extensions and overridings. @@ -632,4 +634,6 @@ const mp_obj_module_t mp_module_ffi = { .globals = (mp_obj_dict_t *)&mp_module_ffi_globals, }; -MP_REGISTER_MODULE(MP_QSTR_ffi, mp_module_ffi, MICROPY_PY_FFI); +MP_REGISTER_MODULE(MP_QSTR_ffi, mp_module_ffi); + +#endif // MICROPY_PY_FFI diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c index 5d2beaa8d..c86f30653 100644 --- a/ports/unix/modjni.c +++ b/ports/unix/modjni.c @@ -35,6 +35,8 @@ #include <jni.h> +#if MICROPY_PY_JNI + #define JJ(call, ...) (*env)->call(env, __VA_ARGS__) #define JJ1(call) (*env)->call(env) #define MATCH(s, static) (!strncmp(s, static, sizeof(static) - 1)) @@ -713,4 +715,6 @@ const mp_obj_module_t mp_module_jni = { .globals = (mp_obj_dict_t *)&mp_module_jni_globals, }; -MP_REGISTER_MODULE(MP_QSTR_jni, mp_module_jni, MICROPY_PY_JNI); +MP_REGISTER_MODULE(MP_QSTR_jni, mp_module_jni); + +#endif // MICROPY_PY_JNI diff --git a/ports/unix/modmachine.c b/ports/unix/modmachine.c index 3d4d9eebc..542ff5002 100644 --- a/ports/unix/modmachine.c +++ b/ports/unix/modmachine.c @@ -110,6 +110,6 @@ const mp_obj_module_t mp_module_machine = { .globals = (mp_obj_dict_t *)&machine_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE); +MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine); #endif // MICROPY_PY_MACHINE diff --git a/ports/unix/modtermios.c b/ports/unix/modtermios.c index cce8c28ab..687bf1abf 100644 --- a/ports/unix/modtermios.c +++ b/ports/unix/modtermios.c @@ -33,6 +33,8 @@ #include "py/runtime.h" #include "py/mphal.h" +#if MICROPY_PY_TERMIOS + STATIC mp_obj_t mod_termios_tcgetattr(mp_obj_t fd_in) { struct termios term; int fd = mp_obj_get_int(fd_in); @@ -149,4 +151,6 @@ const mp_obj_module_t mp_module_termios = { .globals = (mp_obj_dict_t *)&mp_module_termios_globals, }; -MP_REGISTER_MODULE(MP_QSTR_termios, mp_module_termios, MICROPY_PY_TERMIOS); +MP_REGISTER_MODULE(MP_QSTR_termios, mp_module_termios); + +#endif // MICROPY_PY_TERMIOS diff --git a/ports/unix/modtime.c b/ports/unix/modtime.c index 00b3f9436..c9eb09c15 100644 --- a/ports/unix/modtime.c +++ b/ports/unix/modtime.c @@ -232,6 +232,6 @@ const mp_obj_module_t mp_module_time = { .globals = (mp_obj_dict_t *)&mp_module_time_globals, }; -MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_time, MICROPY_PY_UTIME); +MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_time); #endif // MICROPY_PY_UTIME diff --git a/ports/unix/moduselect.c b/ports/unix/moduselect.c index d3e0eff03..2de4a316e 100644 --- a/ports/unix/moduselect.c +++ b/ports/unix/moduselect.c @@ -351,6 +351,6 @@ const mp_obj_module_t mp_module_uselect = { .globals = (mp_obj_dict_t *)&mp_module_select_globals, }; -MP_REGISTER_MODULE(MP_QSTR_uselect, mp_module_uselect, MICROPY_PY_USELECT_POSIX); +MP_REGISTER_MODULE(MP_QSTR_uselect, mp_module_uselect); #endif // MICROPY_PY_USELECT_POSIX diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c index 7526d9679..03d069cb8 100644 --- a/ports/unix/modusocket.c +++ b/ports/unix/modusocket.c @@ -49,6 +49,8 @@ #include "extmod/vfs.h" #include <poll.h> +#if MICROPY_PY_SOCKET + /* The idea of this module is to implement reasonable minimum of socket-related functions to write typical clients and servers. @@ -702,4 +704,6 @@ const mp_obj_module_t mp_module_socket = { .globals = (mp_obj_dict_t *)&mp_module_socket_globals, }; -MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_socket, MICROPY_PY_SOCKET); +MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_socket); + +#endif // MICROPY_PY_SOCKET diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c index c8b07c023..f4b1c0849 100644 --- a/ports/zephyr/modmachine.c +++ b/ports/zephyr/modmachine.c @@ -89,6 +89,6 @@ const mp_obj_module_t mp_module_machine = { .globals = (mp_obj_dict_t *)&machine_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE); +MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine); #endif // MICROPY_PY_MACHINE diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c index fbcd7e87a..29240ad15 100644 --- a/ports/zephyr/modusocket.c +++ b/ports/zephyr/modusocket.c @@ -472,6 +472,6 @@ const mp_obj_module_t mp_module_usocket = { .globals = (mp_obj_dict_t *)&mp_module_usocket_globals, }; -MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket, MICROPY_PY_USOCKET); +MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket); #endif // MICROPY_PY_USOCKET diff --git a/ports/zephyr/modutime.c b/ports/zephyr/modutime.c index c9864a443..16ac9af6e 100644 --- a/ports/zephyr/modutime.c +++ b/ports/zephyr/modutime.c @@ -64,6 +64,6 @@ const mp_obj_module_t mp_module_time = { .globals = (mp_obj_dict_t *)&mp_module_time_globals, }; -MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_time, MICROPY_PY_UTIME); +MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_time); #endif // MICROPY_PY_UTIME diff --git a/ports/zephyr/modzephyr.c b/ports/zephyr/modzephyr.c index fc883ddc4..541dfe0b3 100644 --- a/ports/zephyr/modzephyr.c +++ b/ports/zephyr/modzephyr.c @@ -89,6 +89,6 @@ const mp_obj_module_t mp_module_zephyr = { .globals = (mp_obj_dict_t *)&mp_module_time_globals, }; -MP_REGISTER_MODULE(MP_QSTR_zephyr, mp_module_zephyr, MICROPY_PY_ZEPHYR); +MP_REGISTER_MODULE(MP_QSTR_zephyr, mp_module_zephyr); #endif // MICROPY_PY_ZEPHYR diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c index 2286a46fd..6e8a5ca07 100644 --- a/ports/zephyr/modzsensor.c +++ b/ports/zephyr/modzsensor.c @@ -142,6 +142,6 @@ const mp_obj_module_t mp_module_zsensor = { .globals = (mp_obj_dict_t *)&mp_module_zsensor_globals, }; -MP_REGISTER_MODULE(MP_QSTR_zsensor, mp_module_zsensor, MICROPY_PY_ZSENSOR); +MP_REGISTER_MODULE(MP_QSTR_zsensor, mp_module_zsensor); #endif // MICROPY_PY_UHASHLIB |