From 90d57368d11da8907cdf9f33a6088a008b25c7db Mon Sep 17 00:00:00 2001
From: wgzAIIT <820906721@qq.com>
Date: Mon, 11 Apr 2022 18:48:15 +0800
Subject: [PATCH] change XIDATONG_SDHC_AUTOMOUNT to XIDATONG_SDIO_AUTOMOUNT for
 sd card

---
 .../aiit_board/xidatong/Kconfig               | 28 +++++++++----------
 .../aiit_board/xidatong/src/Makefile          |  2 +-
 .../aiit_board/xidatong/src/imxrt_bringup.c   |  2 +-
 .../xidatong/src/imxrt_sdhc_automount.c       | 10 +++----
 .../aiit_board/xidatong/src/xidatong.h        |  2 +-
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/Kconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/Kconfig
index 2b2af9d3c..e9b8024af 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/Kconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/Kconfig
@@ -24,34 +24,34 @@ config XIDATONG_SDRAM
 	---help---
 		Activate DCD configuration of SDRAM
 
-config XIDATONG_SDHC_AUTOMOUNT
-  bool "SDHC automounter"
+config XIDATONG_SDIO_AUTOMOUNT
+  bool "SD card automounter"
   default n
   depends on FS_AUTOMOUNTER && IMXRT_USDHC
 
-if XIDATONG_SDHC_AUTOMOUNT
+if XIDATONG_SDIO_AUTOMOUNT
 
-config XIDATONG_SDHC_AUTOMOUNT_FSTYPE
-  string "SDHC file system type"
+config XIDATONG_SDIO_AUTOMOUNT_FSTYPE
+  string "SD card file system type"
   default "vfat"
 
-config XIDATONG_SDHC_AUTOMOUNT_BLKDEV
-  string "SDHC block device"
+config XIDATONG_SDIO_AUTOMOUNT_BLKDEV
+  string "SD card block device"
   default "/dev/mmcsd0"
 
-config XIDATONG_SDHC_AUTOMOUNT_MOUNTPOINT
-  string "SDHC mount point"
+config XIDATONG_SDIO_AUTOMOUNT_MOUNTPOINT
+  string "SD card mount point"
   default "/mnt/sdcard"
 
-config XIDATONG_SDHC_AUTOMOUNT_DDELAY
-  int "SDHC debounce delay (milliseconds)"
+config XIDATONG_SDIO_AUTOMOUNT_DDELAY
+  int "SD card debounce delay (milliseconds)"
   default 1000
 
-config XIDATONG_SDHC_AUTOMOUNT_UDELAY
-  int "SDHC unmount retry delay (milliseconds)"
+config XIDATONG_SDIO_AUTOMOUNT_UDELAY
+  int "SD card unmount retry delay (milliseconds)"
   default 2000
 
-endif # XIDATONG_SDHC_AUTOMOUNT
+endif # XIDATONG_SDIO_AUTOMOUNT
 
 config XIDATONG_USB_AUTOMOUNT
 	bool "USB Mass Storage automounter"
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/Makefile b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/Makefile
index 9a45eccc2..90d754261 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/Makefile
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/Makefile
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_USBHOST),y)
 CSRCS += imxrt_usbhost.c
 endif
 
-ifeq ($(CONFIG_XIDATONG_SDHC_AUTOMOUNT),y)
+ifeq ($(CONFIG_XIDATONG_SDIO_AUTOMOUNT),y)
 CSRCS += imxrt_sdhc_automount.c
 endif
 
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_bringup.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_bringup.c
index 9b42db76b..5ada5b0ce 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_bringup.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_bringup.c
@@ -119,7 +119,7 @@ static int nsh_sdmmc_initialize(void)
                  ret);
         }
 
-#ifdef CONFIG_XIDATONG_SDHC_AUTOMOUNT
+#ifdef CONFIG_XIDATONG_SDIO_AUTOMOUNT
       imxrt_automount_initialize();
       imxrt_usdhc_set_sdio_card_isr(sdmmc, imxrt_sdhc_automount_event, NULL);
 #else
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_sdhc_automount.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_sdhc_automount.c
index 18612e7ae..84b8e539b 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_sdhc_automount.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_sdhc_automount.c
@@ -94,11 +94,11 @@ static const struct imxrt_automount_config_s g_sdhc_config =
 {
   .lower        =
     {
-    .fstype     = CONFIG_XIDATONG_SDHC_AUTOMOUNT_FSTYPE,
-    .blockdev   = CONFIG_XIDATONG_SDHC_AUTOMOUNT_BLKDEV,
-    .mountpoint = CONFIG_XIDATONG_SDHC_AUTOMOUNT_MOUNTPOINT,
-    .ddelay     = MSEC2TICK(CONFIG_XIDATONG_SDHC_AUTOMOUNT_DDELAY),
-    .udelay     = MSEC2TICK(CONFIG_XIDATONG_SDHC_AUTOMOUNT_UDELAY),
+    .fstype     = CONFIG_XIDATONG_SDIO_AUTOMOUNT_FSTYPE,
+    .blockdev   = CONFIG_XIDATONG_SDIO_AUTOMOUNT_BLKDEV,
+    .mountpoint = CONFIG_XIDATONG_SDIO_AUTOMOUNT_MOUNTPOINT,
+    .ddelay     = MSEC2TICK(CONFIG_XIDATONG_SDIO_AUTOMOUNT_DDELAY),
+    .udelay     = MSEC2TICK(CONFIG_XIDATONG_SDIO_AUTOMOUNT_UDELAY),
     .attach     = imxrt_sdhc_attach,
     .enable     = imxrt_sdhc_enable,
     .inserted   = imxrt_sdhc_inserted
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/xidatong.h b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/xidatong.h
index 355b5d359..b01903cb5 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/xidatong.h
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/xidatong.h
@@ -208,7 +208,7 @@ int imxrt_usbhost_initialize(void);
 int imxrt_mmcsd_initialize(void);
 #endif
 
-#ifdef CONFIG_XIDATONG_SDHC_AUTOMOUNT
+#ifdef CONFIG_XIDATONG_SDIO_AUTOMOUNT
 int imxrt_sdhc_automount_event(void *arg);
 void imxrt_automount_initialize(void);
 #endif