update reset_board_busses()

- rename it to `reset_board_buses()`
- add deinited check before i2c and spi unlock

Author: microdev1

main.c

@@ -288,10 +288,10 @@ STATIC void cleanup_after_vm(supervisor_allocation *heap, mp_obj_t exception) {
     keypad_reset();
     #endif
 
-    // reset_board_busses() first because it may release pins from the never_reset state, so that
+    // reset_board_buses() first because it may release pins from the never_reset state, so that
     // reset_port() can reset them.
     #if CIRCUITPY_BOARD
-    reset_board_busses();
+    reset_board_buses();
     #endif
     reset_port();
     reset_board();

shared-module/board/__init__.c

@@ -168,7 +168,7 @@ mp_obj_t common_hal_board_create_uart(const mp_int_t instance) {
 }
 #endif
 
-void reset_board_busses(void) {
+void reset_board_buses(void) {
     #if CIRCUITPY_BOARD_I2C
     for (uint8_t instance = 0; instance < CIRCUITPY_BOARD_I2C; instance++) {
         bool display_using_i2c = false;
@@ -180,10 +180,12 @@ void reset_board_busses(void) {
             }
         }
         #endif
-        // make sure I2C lock is not held over a soft reset
-        common_hal_busio_i2c_unlock(&i2c_obj[instance]);
-        if (!display_using_i2c) {
-            common_hal_busio_i2c_deinit(&i2c_obj[instance]);
+        if (!common_hal_busio_i2c_deinited(&i2c_obj[instance])) {
+            // make sure I2C lock is not held over a soft reset
+            common_hal_busio_i2c_unlock(&i2c_obj[instance]);
+            if (!display_using_i2c) {
+                common_hal_busio_i2c_deinit(&i2c_obj[instance]);
+            }
         }
     }
     #endif
@@ -205,10 +207,12 @@ void reset_board_busses(void) {
             #endif
         }
         #endif
-        // make sure SPI lock is not held over a soft reset
-        common_hal_busio_spi_unlock(&spi_obj[instance]);
-        if (!display_using_spi) {
-            common_hal_busio_spi_deinit(&spi_obj[instance]);
+        if (!common_hal_busio_spi_deinited(&spi_obj[instance])) {
+            // make sure SPI lock is not held over a soft reset
+            common_hal_busio_spi_unlock(&spi_obj[instance]);
+            if (!display_using_spi) {
+                common_hal_busio_spi_deinit(&spi_obj[instance]);
+            }
         }
     }
     #endif

shared-module/board/__init__.h

@@ -27,6 +27,6 @@
 #ifndef MICROPY_INCLUDED_SHARED_MODULE_BOARD__INIT__H
 #define MICROPY_INCLUDED_SHARED_MODULE_BOARD__INIT__H
 
-void reset_board_busses(void);
+void reset_board_buses(void);
 
 #endif  // MICROPY_INCLUDED_SHARED_MODULE_BOARD__INIT__H