ports/all: deinit builtin modules on soft-reset.

pi-anl · pi-anl · commit 27f2d9417b07 · 2024-10-23T11:51:46.000+11:00
Signed-off-by: Andrew Leech &lt;andrew.leech@planetinnovation.com.au&gt;
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
@@ -182,6 +182,10 @@ void mp_task(void *pvParameter) {
     mp_thread_deinit();
     #endif
 
+    #if MICROPY_MODULE_BUILTIN_INIT
+    mp_module_builtin_deinit();
+    #endif
+
     gc_sweep_all();
 
     // Free any native code pointers that point to iRAM.
diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c
@@ -88,6 +88,9 @@ static void mp_reset(void) {
 }
 
 void soft_reset(void) {
+    #if MICROPY_MODULE_BUILTIN_INIT
+    mp_module_builtin_deinit();
+    #endif
     gc_sweep_all();
     mp_hal_stdout_tx_str("MPY: soft reboot\r\n");
     mp_hal_delay_us(10000); // allow UART to flush output
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
@@ -159,6 +159,9 @@ int main(void) {
         machine_uart_deinit_all();
         machine_pwm_deinit_all();
         soft_timer_deinit();
+        #if MICROPY_MODULE_BUILTIN_INIT
+        mp_module_builtin_deinit();
+        #endif
         gc_sweep_all();
         mp_deinit();
     }
diff --git a/ports/nrf/main.c b/ports/nrf/main.c
@@ -292,6 +292,11 @@ void NORETURN _start(void) {
     pwm_deinit_all();
     #endif
 
+    #if MICROPY_MODULE_BUILTIN_INIT
+    mp_module_builtin_deinit();
+    #endif
+
+    gc_sweep_all();
     mp_deinit();
 
     printf("MPY: soft reboot\n");
diff --git a/ports/qemu/main.c b/ports/qemu/main.c
@@ -60,6 +60,9 @@ int main(int argc, char **argv) {
 
         mp_printf(&mp_plat_print, "MPY: soft reboot\n");
 
+        #if MICROPY_MODULE_BUILTIN_INIT
+        mp_module_builtin_deinit();
+        #endif
         gc_sweep_all();
         mp_deinit();
     }
diff --git a/ports/renesas-ra/main.c b/ports/renesas-ra/main.c
@@ -435,6 +435,10 @@ int main(void) {
     pyb_thread_deinit();
     #endif
 
+    #if MICROPY_MODULE_BUILTIN_INIT
+    mp_module_builtin_deinit();
+    #endif
+
     MICROPY_BOARD_END_SOFT_RESET(&state);
 
     gc_sweep_all();
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
@@ -242,6 +242,10 @@ int main(int argc, char **argv) {
         mp_usbd_deinit();
         #endif
 
+        #if MICROPY_MODULE_BUILTIN_INIT
+        mp_module_builtin_deinit();
+        #endif
+
         // Hook for resetting anything right at the end of a soft reset command.
         MICROPY_BOARD_END_SOFT_RESET();
 
diff --git a/ports/samd/main.c b/ports/samd/main.c
@@ -98,6 +98,9 @@ void samd_main(void) {
         #if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
         mp_usbd_deinit();
         #endif
+        #if MICROPY_MODULE_BUILTIN_INIT
+        mp_module_builtin_deinit();
+        #endif
         gc_sweep_all();
         #if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_UART
         sercom_deinit_all();
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
@@ -698,6 +698,10 @@ void stm32_main(uint32_t reset_mode) {
     MP_STATE_PORT(pyb_stdio_uart) = NULL;
     #endif
 
+    #if MICROPY_MODULE_BUILTIN_INIT
+    mp_module_builtin_deinit();
+    #endif
+
     MICROPY_BOARD_END_SOFT_RESET(&state);
 
     gc_sweep_all();
diff --git a/ports/unix/main.c b/ports/unix/main.c
@@ -774,6 +774,10 @@ MP_NOINLINE int main_(int argc, char **argv) {
     mp_thread_deinit();
     #endif
 
+    #if MICROPY_MODULE_BUILTIN_INIT
+    mp_module_builtin_deinit();
+    #endif
+
     #if defined(MICROPY_UNIX_COVERAGE)
     gc_sweep_all();
     #endif
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
@@ -172,6 +172,10 @@ int real_main(void) {
     gc_collect();
     #endif
 
+    #if MICROPY_MODULE_BUILTIN_INIT
+    mp_module_builtin_deinit();
+    #endif
+
     gc_sweep_all();
     mp_deinit();
 

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,9 @@ static void mp_reset(void) {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`void soft_reset(void) {`
	`91`	`+ #if MICROPY_MODULE_BUILTIN_INIT`
	`92`	`+ mp_module_builtin_deinit();`
	`93`	`+ #endif`
`91`	`94`	`gc_sweep_all();`
`92`	`95`	`mp_hal_stdout_tx_str("MPY: soft reboot\r\n");`
`93`	`96`	`mp_hal_delay_us(10000); // allow UART to flush output`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,9 @@ int main(int argc, char **argv) {`
`60`	`60`
`61`	`61`	`mp_printf(&mp_plat_print, "MPY: soft reboot\n");`
`62`	`62`
	`63`	`+ #if MICROPY_MODULE_BUILTIN_INIT`
	`64`	`+ mp_module_builtin_deinit();`
	`65`	`+ #endif`
`63`	`66`	`gc_sweep_all();`
`64`	`67`	`mp_deinit();`
`65`	`68`	`}`