libs/hardware/SDCard: Fix SDCard initialization failure.

Signed-off-by: lbuque <[email protected]>

Author: lbuque

m5stack/libs/hardware/sdcard.py

@@ -1,20 +1,24 @@
 import machine, os
 
-sd = None
+def create_sdcard_closure():
+    sd = None
 
+    def SDCard(
+        slot=1, width=1, cd=None, wp=None, sck=None, miso=None, mosi=None, cs=None, freq=20000000
+    ):
+        nonlocal sd
+        try:
+            os.umount("/sd")
+            sd.deinit()
+        except Exception as e:
+            print(e)
+        finally:
+            sd = machine.SDCard(
+                slot=slot, width=width, cd=cd, wp=wp, sck=sck, miso=miso, mosi=mosi, cs=cs, freq=freq
+            )
+            sd.info()
+            os.mount(sd, "/sd")
 
-def SDCard(
-    slot=1, width=1, cd=None, wp=None, sck=None, miso=None, mosi=None, cs=None, freq=20000000
-):
-    global sd
-    try:
-        os.umount("/sd")
-        sd.deinit()
-    except Exception as e:
-        print(e)
-    finally:
-        sd = machine.SDCard(
-            slot=slot, width=width, cd=cd, wp=wp, sck=sck, miso=miso, mosi=mosi, cs=cs, freq=freq
-        )
-        sd.info()
-        os.mount(sd, "/sd")
+    return SDCard
+
+SDCard = create_sdcard_closure()

m5stack/machine_hw_spi.c

@@ -124,7 +124,7 @@ STATIC void machine_hw_spi_deinit_internal(machine_hw_spi_obj_t *self) {
         case ESP_ERR_INVALID_STATE:
             // NOTE:
             //     core2和cores3的屏幕和sd卡复用一个spi，
-            //     所以这里不需要对VSPI_HOST和SPI3_HOST进行初始化。
+            //     所以这里不需要对VSPI_HOST和SPI2_HOST进行初始化。
             if (self->host != SPI2_HOST) {
                 mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("SPI device already freed"));
                 return;
@@ -133,7 +133,7 @@ STATIC void machine_hw_spi_deinit_internal(machine_hw_spi_obj_t *self) {
 
     // NOTE:
     //     core2和cores3的屏幕和sd卡复用一个spi，
-    //     所以这里不需要对VSPI_HOST和SPI3_HOST进行初始化。
+    //     所以这里不需要对VSPI_HOST和SPI2_HOST进行初始化。
     if (self->host != SPI2_HOST) {
         switch (spi_bus_free(self->host)) {
             case ESP_ERR_INVALID_ARG:
@@ -275,7 +275,7 @@ STATIC void machine_hw_spi_init_internal(
         case ESP_ERR_INVALID_STATE:
             // NOTE:
             //     core2和cores3的屏幕和sd卡复用一个spi，
-            //     所以这里不需要对VSPI_HOST和SPI3_HOST进行初始化。
+            //     所以这里不需要对VSPI_HOST和SPI2_HOST进行初始化。
             if (self->host != SPI2_HOST) {
                 mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("SPI host already in use"));
                 return;

m5stack/machine_sdcard.c

@@ -277,11 +277,11 @@ STATIC mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
         #if CONFIG_IDF_TARGET_ESP32
         if (spi_host_id == HSPI_HOST) {
         #else
-        if (spi_host_id == SPI2_HOST) {
+        if (spi_host_id == SPI3_HOST) {
         #endif
             // NOTE:
             //     core2和cores3的屏幕和sd卡复用一个spi，
-            //     所以这里不需要对VSPI_HOST和SPI3_HOST进行初始化。
+            //     所以这里不需要对VSPI_HOST和SPI2_HOST进行初始化。
             DEBUG_printf("  Calling spi_bus_initialize()");
             check_esp_err(spi_bus_initialize(spi_host_id, &bus_config, dma_channel));
         }
@@ -339,9 +339,9 @@ STATIC mp_obj_t sd_deinit(mp_obj_t self_in) {
         if (self->host.flags & SDMMC_HOST_FLAG_SPI) {
             // SD card used a (dedicated) SPI bus, so free that SPI bus.
             #if CONFIG_IDF_TARGET_ESP32
-            if ((self->host.slot + 2) == HSPI_HOST) {
+            if (self->host.slot == HSPI_HOST) {
             #else
-            if ((self->host.slot + 2) == SPI2_HOST) {
+            if (self->host.slot == SPI3_HOST) {
             #endif
                 spi_bus_free(self->host.slot);
             }