Rename mmcsd.c to mmcsd_sdio.c

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2242 42af7a65-404d-4744-a932-0658087f49c3

4 files changed, 25 insertions, 6 deletions

diff --git a/nuttx/arch/arm/src/stm32/stm32_sdio.h b/nuttx/arch/arm/src/stm32/stm32_sdio.h
index e2b8e31cc..73a29d8cf 100755
--- a/nuttx/arch/arm/src/stm32/stm32_sdio.h
+++ b/nuttx/arch/arm/src/stm32/stm32_sdio.h
@@ -101,6 +101,8 @@
 #  define SDIO_POWER_PWRCTRL_RSVDPWRUP (2 << POWER_PWRCTRL_SHIFT) /* 10: Reserved power-up */
 #  define SDIO_POWER_PWRCTRL_ON        (3 << POWER_PWRCTRL_SHIFT) /* 11: Power-on: card is clocked */
 
+#define SDIO_POWER_RESET               (0)       /* Reset value */
+
 #define SDIO_CLKCR_CLKDIV_SHIFT        (0)       /* Bits 7-0: Clock divide factor */
 #define SDIO_CLKCR_CLKDIV_MASK         (0xff << SDIO_CLKCR_CLKDIV_SHIFT)
 #define SDIO_CLKCR_CLKEN               (1 << 8)  /* Bit 8: Clock enable bit */
@@ -114,6 +116,9 @@
 #define SDIO_CLKCR_NEGEDGE             (1 << 13) /* Bit 13: SDIO_CK dephasing selection bit */
 #define SDIO_CLKCR_HWFC_EN             (1 << 14) /* Bit 14: HW Flow Control enable */
 
+#define SDIO_CLKCR_RESET               (0)       /* Reset value */
+#define SDIO_ARG_RESET                 (0)       /* Reset value */
+
 #define SDIO_CMD_CMDINDEX_SHIFT        (0)
 #define SDIO_CMD_CMDINDEX_MASK         (0x3f << SDIO_CMD_CMDINDEX_SHIFT)
 #define SDIO_CMD_WAITRESP_SHIFT        (6)       /* Bits 7-6: Wait for response bits */
@@ -129,12 +134,18 @@
 #define SDIO_CMD_NIEN                  (1 << 13) /* Bit 13: not Interrupt Enable */
 #define SDIO_CMD_ATACMD                (1 << 14) /* Bit 14: CE-ATA command */
 
+#define SDIO_CMD_RESET                 (0)       /* Reset value */
+
 #define SDIO_RESPCMD_SHIFT             (0)
 #define SDIO_RESPCMD_MASK              (0x3f << SDIO_RESPCMD_SHIFT)
 
+#define SDIO_DTIMER_RESET              (0)       /* Reset value */
+
 #define SDIO_DLEN_SHIFT                (0)
 #define SDIO_DLEN_MASK                 (0x01ffffff << SDIO_DLEN_SHIFT)
 
+#define SDIO_DLEN_RESET                (0)       /* Reset value */
+
 #define SDIO_DCTRL_DTEN                (1 << 0)  /* Bit 0: Data transfer enabled bit */
 #define SDIO_DCTRL_DTDIR               (1 << 1)  /* Bit 1: Data transfer direction */
 #define SDIO_DCTRL_DTMODE              (1 << 2)  /* Bit 2: Data transfer mode */
@@ -161,6 +172,8 @@
 #define SDIO_DCTRL_RWMOD               (1 << 10) /* Bit 10: Read wait mode */
 #define SDIO_DCTRL_SDIOEN              (1 << 11) /* Bit 11: SD I/O enable functions */
 
+#define SDIO_DCTRL_RESET               (0)       /* Reset value */
+
 #define SDIO_DATACOUNT_SHIFT           (0)
 #define SDIO_DATACOUNT_MASK            (0x01ffffff << SDIO_DATACOUNT_SHIFT)
 
@@ -203,6 +216,8 @@
 #define SDIO_ICR_SDIOITC               (1 << 22) /* Bit 22: SDIOIT flag clear bit */
 #define SDIO_ICR_CEATAENDC             (1 << 23) /* Bit 23: CEATAEND flag clear bit */
 
+#define SDIO_ICR_RESET                 0x00c007ff
+
 #define SDIO_MASK_CCRCFAILIE           (1 << 0)  /* Bit 0: Command CRC fail interrupt enable */
 #define SDIO_MASK_DCRCFAILIE           (1 << 1)  /* Bit 1: Data CRC fail interrupt enable */
 #define SDIO_MASK_CTIMEOUTIE           (1 << 2)  /* Bit 2: Command timeout interrupt enable */
@@ -228,6 +243,8 @@
 #define SDIO_MASK_SDIOITIE             (1 << 22) /* Bit 22: SDIO mode interrupt received interrupt enable */
 #define SDIO_MASK_CEATAENDIE           (1 << 23) /* Bit 23: CE-ATA command completion interrupt enable */
 
+#define SDIO_MASK_RESET                (0)
+
 #define SDIO_FIFOCNT_SHIFT             (0)
 #define SDIO_FIFOCNT_MASK              (0x01ffffff << SDIO_FIFOCNT_SHIFT)
 
diff --git a/nuttx/drivers/mmcsd/Make.defs b/nuttx/drivers/mmcsd/Make.defs
index 37c82903f..6e7bf8080 100644
--- a/nuttx/drivers/mmcsd/Make.defs
+++ b/nuttx/drivers/mmcsd/Make.defs
@@ -34,5 +34,5 @@
 ############################################################################
 
 MMCSD_ASRCS  =
-MMCSD_CSRCS  = mmcsd.c mmcsd_spi.c mmcsd_debug.c
+MMCSD_CSRCS  = mmcsd_sdio.c mmcsd_spi.c mmcsd_debug.c
 
diff --git a/nuttx/drivers/mmcsd/mmcsd.c b/nuttx/drivers/mmcsd/mmcsd_sdio.c
index 348c46321..8a0b6dea3 100644
--- a/nuttx/drivers/mmcsd/mmcsd.c
+++ b/nuttx/drivers/mmcsd/mmcsd_sdio.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/mmcsd/mmcsd.c
+ * drivers/mmcsd/mmcsd_sdio.c
  *
  *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
diff --git a/nuttx/include/nuttx/sdio.h b/nuttx/include/nuttx/sdio.h
index 8fe29c572..52205f79b 100755
--- a/nuttx/include/nuttx/sdio.h
+++ b/nuttx/include/nuttx/sdio.h
@@ -104,18 +104,20 @@
  * Name: SDIO_WIDEBUS
  *
  * Description:
- *   Enable/disable wide (4-bit) data bus
+ *   Called after change in Bus width has been selected (via ACMD6).  Most
+ *   controllers will need to perform some special operations to work
+ *   correctly in the new bus mode.
  *
  * Input Parameters:
- *   dev    - An instance of the MMC/SD device interface
- *   enable - TRUE: enable wide bus
+ *   dev  - An instance of the MMC/SD device interface
+ *   wide - TRUE: wide bus (4-bit) bus mode enabled
  *
  * Returned Value:
  *   None
  *
  ****************************************************************************/
 
-#define SDIO_WIDEBUS(dev,enable) ((dev)->widebus(dev,enable))
+#define SDIO_WIDEBUS(dev,wide) ((dev)->widebus(dev,wide))
 
 /****************************************************************************
  * Name: SDIO_CLOCK