Convert more modules to use MP_REGISTER_MODULE

capellini · capellini · commit 9002f351b46f · 2021-09-01T00:19:05.000-04:00
Convert _eve, _pew, aesio, alarm, audiopwmio, bitops, camera, canio, dualbank, gnss, i2cperipheral, imagecapture, ipaddress, memorymonitor, sdioio, socketpool, ssl, uheap, ustack, watchdog, and wifi modules to use MP_REGISTER_MODULE. Related to #5183.
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
diff --git a/shared-bindings/_eve/__init__.c b/shared-bindings/_eve/__init__.c
@@ -1105,3 +1105,5 @@ const mp_obj_module_t _eve_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module__eve_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR__eve, _eve_module, CIRCUITPY__EVE);
diff --git a/shared-bindings/_pew/__init__.c b/shared-bindings/_pew/__init__.c
@@ -63,3 +63,5 @@ const mp_obj_module_t pew_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&pew_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR__pew, pew_module, CIRCUITPY_PEW);
diff --git a/shared-bindings/aesio/__init__.c b/shared-bindings/aesio/__init__.c
@@ -63,3 +63,5 @@ const mp_obj_module_t aesio_module = {
     .base = {&mp_type_module},
     .globals = (mp_obj_dict_t *)&aesio_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_aesio, aesio_module, CIRCUITPY_AESIO);
diff --git a/shared-bindings/alarm/__init__.c b/shared-bindings/alarm/__init__.c
@@ -248,3 +248,5 @@ extern void port_idle_until_interrupt(void);
 MP_WEAK void common_hal_alarm_pretending_deep_sleep(void) {
     port_idle_until_interrupt();
 }
+
+MP_REGISTER_MODULE(MP_QSTR_alarm, alarm_module, CIRCUITPY_ALARM);
diff --git a/shared-bindings/audiopwmio/__init__.c b/shared-bindings/audiopwmio/__init__.c
@@ -57,3 +57,5 @@ const mp_obj_module_t audiopwmio_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&audiopwmio_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_audiopwmio, audiopwmio_module, CIRCUITPY_AUDIOPWMIO);
diff --git a/shared-bindings/bitops/__init__.c b/shared-bindings/bitops/__init__.c
@@ -99,3 +99,5 @@ const mp_obj_module_t bitops_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&bitops_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_bitops, bitops_module, CIRCUITPY_BITOPS);
diff --git a/shared-bindings/camera/__init__.c b/shared-bindings/camera/__init__.c
@@ -48,3 +48,5 @@ const mp_obj_module_t camera_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&camera_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_camera, camera_module, CIRCUITPY_CAMERA);
diff --git a/shared-bindings/canio/__init__.c b/shared-bindings/canio/__init__.c
@@ -108,6 +108,7 @@ MAKE_PRINTER(canio, canio_bus_state);
 MAKE_ENUM_TYPE(canio, BusState, canio_bus_state);
 
 STATIC const mp_rom_map_elem_t canio_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_canio) },
     { MP_ROM_QSTR(MP_QSTR_BusState), MP_ROM_PTR(&canio_bus_state_type) },
     { MP_ROM_QSTR(MP_QSTR_CAN), MP_ROM_PTR(&canio_can_type) },
     { MP_ROM_QSTR(MP_QSTR_Listener), MP_ROM_PTR(&canio_listener_type) },
@@ -123,3 +124,5 @@ const mp_obj_module_t canio_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&canio_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_canio, canio_module, CIRCUITPY_CANIO);
diff --git a/shared-bindings/dualbank/__init__.c b/shared-bindings/dualbank/__init__.c
@@ -113,3 +113,5 @@ const mp_obj_module_t dualbank_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&dualbank_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_dualbank, dualbank_module, CIRCUITPY_DUALBANK);
diff --git a/shared-bindings/gnss/__init__.c b/shared-bindings/gnss/__init__.c
@@ -29,3 +29,5 @@ const mp_obj_module_t gnss_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&gnss_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_gnss, gnss_module, CIRCUITPY_GNSS);
diff --git a/shared-bindings/i2cperipheral/__init__.c b/shared-bindings/i2cperipheral/__init__.c
@@ -104,3 +104,5 @@ const mp_obj_module_t i2cperipheral_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&i2cperipheral_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_i2cperipheral, i2cperipheral_module, CIRCUITPY_I2CPERIPHERAL);
diff --git a/shared-bindings/imagecapture/__init__.c b/shared-bindings/imagecapture/__init__.c
@@ -45,3 +45,5 @@ const mp_obj_module_t imagecapture_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&imagecapture_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_imagecapture, imagecapture_module, CIRCUITPY_IMAGECAPTURE);
diff --git a/shared-bindings/ipaddress/__init__.c b/shared-bindings/ipaddress/__init__.c
@@ -111,3 +111,5 @@ const mp_obj_module_t ipaddress_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&ipaddress_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_ipaddress, ipaddress_module, CIRCUITPY_IPADDRESS);
diff --git a/shared-bindings/memorymonitor/__init__.c b/shared-bindings/memorymonitor/__init__.c
@@ -74,3 +74,5 @@ const mp_obj_module_t memorymonitor_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&memorymonitor_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_memorymonitor, memorymonitor_module, CIRCUITPY_MEMORYMONITOR);
diff --git a/shared-bindings/sdioio/__init__.c b/shared-bindings/sdioio/__init__.c
@@ -45,3 +45,5 @@ const mp_obj_module_t sdioio_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&sdioio_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_sdio, sdioio_module, CIRCUITPY_SDIOIO);
diff --git a/shared-bindings/socketpool/__init__.c b/shared-bindings/socketpool/__init__.c
@@ -51,3 +51,5 @@ const mp_obj_module_t socketpool_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&socketpool_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_socketpool, socketpool_module, CIRCUITPY_SOCKETPOOL);
diff --git a/shared-bindings/ssl/__init__.c b/shared-bindings/ssl/__init__.c
@@ -64,3 +64,5 @@ const mp_obj_module_t ssl_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&ssl_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_ssl, ssl_module, CIRCUITPY_SSL);
diff --git a/shared-bindings/uheap/__init__.c b/shared-bindings/uheap/__init__.c
@@ -57,3 +57,5 @@ const mp_obj_module_t uheap_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&uheap_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_uheap, uheap_module, CIRCUITPY_UHEAP);
diff --git a/shared-bindings/ustack/__init__.c b/shared-bindings/ustack/__init__.c
@@ -85,3 +85,5 @@ const mp_obj_module_t ustack_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&ustack_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_ustack, ustack_module, CIRCUITPY_USTACK);
diff --git a/shared-bindings/watchdog/__init__.c b/shared-bindings/watchdog/__init__.c
@@ -77,3 +77,5 @@ const mp_obj_module_t watchdog_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&watchdog_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_watchdog, watchdog_module, CIRCUITPY_WATCHDOG);
diff --git a/shared-bindings/wifi/__init__.c b/shared-bindings/wifi/__init__.c
@@ -70,3 +70,5 @@ const mp_obj_module_t wifi_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&wifi_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_wifi, wifi_module, CIRCUITPY_WIFI);

Original file line number	Diff line number	Diff line change
`@@ -248,3 +248,5 @@ extern void port_idle_until_interrupt(void);`
`248`	`248`	`MP_WEAK void common_hal_alarm_pretending_deep_sleep(void) {`
`249`	`249`	`port_idle_until_interrupt();`
`250`	`250`	`}`
	`251`	`+`
	`252`	`+MP_REGISTER_MODULE(MP_QSTR_alarm, alarm_module, CIRCUITPY_ALARM);`