feat(usb_wireless_disk): support 4bit sdcard

Author: leeebo

examples/usb/device/usb_msc_wireless_disk/main/Kconfig.projbuild

@@ -2,7 +2,7 @@ menu "USB MSC Device Demo"
 
     choice DEVELOPMENT_BOARD_SELECTION
         prompt "Select the development board you are using"
-        default ESP32_S3_USB_OTG if IDF_TARGET_ESP32S3
+        default ESP32_S3_GENERIC if IDF_TARGET_ESP32S3
         default ESP32_S2_GENERIC if IDF_TARGET_ESP32S2
         help
             Select this option to choose the board for the example.
@@ -46,44 +46,83 @@ menu "USB MSC Device Demo"
         config DISK_BLOCK_SIZE
             int "disk block size used for format"
             depends on USE_EXTERNAL_SDCARD
-            default 512
+            default 8192
 
         menu "SD Card PIN CONFIG"
 
         config SDCARD_SPI_CS_PIN
             int "SD Card SPI CS pin"
             depends on SDCARD_INTFC_SPI
-            default 34
+            default 34 if ESP32_S3_USB_OTG
+            default 10
 
         config SDCARD_SPI_CLK_PIN
             int "SD Card SPI CLK pin"
             depends on SDCARD_INTFC_SPI
-            default 36
+            default 36 if ESP32_S3_USB_OTG
+            default 12
 
         config SDCARD_SPI_DI_PIN
             int "SD Card SPI DI pin"
             depends on SDCARD_INTFC_SPI
-            default 35
+            default 35 if ESP32_S3_USB_OTG
+            default 11
 
         config SDCARD_SPI_DO_PIN
             int "SD Card SPI DO pin"
             depends on SDCARD_INTFC_SPI
-            default 37
+            default 37 if ESP32_S3_USB_OTG
+            default 13
 
-        config SDCARD_SDIO_DO_PIN
-            int "SD Card SDIO DO pin"
+        config SDCARD_SDIO_D0_PIN
+            int "SD Card SDIO D0 pin"
             depends on SDCARD_INTFC_SDIO
-            default 37
+            default 37 if ESP32_S3_USB_OTG
+            default 13
 
         config SDCARD_SDIO_CMD_PIN
             int "SD Card SDIO CMD pin"
             depends on SDCARD_INTFC_SDIO
-            default 35
+            default 35 if ESP32_S3_USB_OTG
+            default 11
 
         config SDCARD_SDIO_CLK_PIN
             int "SD Card SDIO CLK pin"
             depends on SDCARD_INTFC_SDIO
-            default 36
+            default 36 if ESP32_S3_USB_OTG
+            default 12
+
+        choice SDCARD_SDIO_DATA_WIDTH
+            prompt "SDIO Data Width"
+            depends on SDCARD_INTFC_SDIO
+            default SDCARD_SDIO_DATA_WIDTH_1
+            help
+                Select SDIO bus width: 1-line or 4-line.
+
+            config SDCARD_SDIO_DATA_WIDTH_1
+                bool "1-line mode"
+
+            config SDCARD_SDIO_DATA_WIDTH_4
+                bool "4-line mode"
+        endchoice
+
+        config SDCARD_SDIO_D1_PIN
+            int "SD Card SDIO D1 pin (for 4-line)"
+            depends on SDCARD_INTFC_SDIO && SDCARD_SDIO_DATA_WIDTH_4
+            default 38 if ESP32_S3_USB_OTG
+            default 14
+
+        config SDCARD_SDIO_D2_PIN
+            int "SD Card SDIO D2 pin (for 4-line)"
+            depends on SDCARD_INTFC_SDIO && SDCARD_SDIO_DATA_WIDTH_4
+            default 33 if ESP32_S3_USB_OTG
+            default 9
+
+        config SDCARD_SDIO_D3_PIN
+            int "SD Card SDIO D3 pin (for 4-line)"
+            depends on SDCARD_INTFC_SDIO && SDCARD_SDIO_DATA_WIDTH_4
+            default 34 if ESP32_S3_USB_OTG
+            default 10
         endmenu
     endchoice
 

examples/usb/device/usb_msc_wireless_disk/main/app_main.c

@@ -28,8 +28,15 @@ static const char *TAG = "usb_msc_wireless";
 #elif defined(CONFIG_SDCARD_INTFC_SDIO) && defined(SOC_SDMMC_HOST_SUPPORTED)
 #define SDCARD_SDIO_CLK_PIN      CONFIG_SDCARD_SDIO_CLK_PIN
 #define SDCARD_SDIO_CMD_PIN      CONFIG_SDCARD_SDIO_CMD_PIN
-#define SDCARD_SDIO_DO_PIN       CONFIG_SDCARD_SDIO_DO_PIN
+#define SDCARD_SDIO_D0_PIN       CONFIG_SDCARD_SDIO_D0_PIN
+#if CONFIG_SDCARD_SDIO_DATA_WIDTH_4
+#define SDCARD_SDIO_DATA_WIDTH   4
+#define SDCARD_SDIO_D1_PIN       CONFIG_SDCARD_SDIO_D1_PIN
+#define SDCARD_SDIO_D2_PIN       CONFIG_SDCARD_SDIO_D2_PIN
+#define SDCARD_SDIO_D3_PIN       CONFIG_SDCARD_SDIO_D3_PIN
+#else
 #define SDCARD_SDIO_DATA_WIDTH   1
+#endif
 #include "driver/sdmmc_host.h"
 #else
 #error "Not supported interface"
@@ -53,7 +60,7 @@ static esp_err_t init_fat(sdmmc_card_t **card_handle, const char *base_path)
     ESP_LOGI(TAG, "using internal flash");
     const esp_vfs_fat_mount_config_t mount_config = {
         .format_if_mount_failed = true,
-        .max_files = 9,
+        .max_files = 5,
         .allocation_unit_size = CONFIG_WL_SECTOR_SIZE
     };
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
@@ -102,15 +109,20 @@ static esp_err_t init_fat(sdmmc_card_t **card_handle, const char *base_path)
 #elif defined(CONFIG_SDCARD_INTFC_SDIO) && defined(SOC_SDMMC_HOST_SUPPORTED)
     ESP_LOGI(TAG, "Using SDIO Interface");
     sdmmc_host_t host = SDMMC_HOST_DEFAULT();
+    host.max_freq_khz = SDMMC_FREQ_HIGHSPEED;
 
     // This initializes the slot without card detect (CD) and write protect (WP) signals.
     // Modify slot_config.gpio_cd and slot_config.gpio_wp if your board has these signals.
     sdmmc_slot_config_t slot_config = SDMMC_SLOT_CONFIG_DEFAULT();
     slot_config.clk = SDCARD_SDIO_CLK_PIN;
     slot_config.cmd = SDCARD_SDIO_CMD_PIN;
-    slot_config.d0 = SDCARD_SDIO_DO_PIN;
-    // To use 1-line SD mode, change this to 1:
+    slot_config.d0 = SDCARD_SDIO_D0_PIN;
     slot_config.width = SDCARD_SDIO_DATA_WIDTH;
+#if CONFIG_SDCARD_SDIO_DATA_WIDTH_4
+    slot_config.d1 = SDCARD_SDIO_D1_PIN;
+    slot_config.d2 = SDCARD_SDIO_D2_PIN;
+    slot_config.d3 = SDCARD_SDIO_D3_PIN;
+#endif
     // Enable internal pullup on enabled pins. The internal pullup
     // are insufficient however, please make sure 10k external pullup are
     // connected on the bus. This is for debug / example purpose only.