summaryrefslogtreecommitdiff
path: root/nuttx
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx')
-rw-r--r--nuttx/ChangeLog8
-rw-r--r--nuttx/Documentation/NuttX.html10
-rwxr-xr-xnuttx/arch/arm/src/stm32/Make.defs2
-rw-r--r--nuttx/drivers/mmcsd/mmcsd_sdio.c2
4 files changed, 19 insertions, 3 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 6d00bdb72..d60492160 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -955,5 +955,13 @@
and write buffering that can be used in any block driver.
* include/nuttx/wqueue.h -- Added a generic worker thread that can used to
defer processing from an interrupt to a task.
+ * include/nuttx/sdio.h -- Defines a generic SD/SDIO interface can can be
+ bound to a MMC/SD driver to provide SDIO-based MMC/SD support.
+ * drivers/mmcsd/mmcsd_sdio.c -- Provides a an SDIO-based MMC/SD driver.
+ * arch/arm/src/stm32/stm32_sdio.c -- Provides an STM32 implementation of
+ the SDIO interface defined in include/nuttx/sdio.h.
+
+ NOTE: On initial check-in, mmcsd_sdio.c and stm32_sdio.c are merely
+ skeleton frameworks for the driver.
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index f92069e53..d14a755ce 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -8,7 +8,7 @@
<tr align="center" bgcolor="#e4e4e4">
<td>
<h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
- <p>Last Updated: November 5, 2009</p>
+ <p>Last Updated: November 11, 2009</p>
</td>
</tr>
</table>
@@ -1603,6 +1603,14 @@ nuttx-0.4.14 2009-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
and write buffering that can be used in any block driver.
* include/nuttx/wqueue.h -- Added a generic worker thread that can used to
defer processing from an interrupt to a task.
+ * include/nuttx/sdio.h -- Defines a generic SD/SDIO interface can can be
+ bound to a MMC/SD driver to provide SDIO-based MMC/SD support.
+ * drivers/mmcsd/mmcsd_sdio.c -- Provides a an SDIO-based MMC/SD driver.
+ * arch/arm/src/stm32/stm32_sdio.c -- Provides an STM32 implementation of
+ the SDIO interface defined in include/nuttx/sdio.h.
+
+ NOTE: On initial check-in, mmcsd_sdio.c and stm32_sdio.c are merely
+ skeleton frameworks for the driver.
pascal-0.1.3 2009-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
diff --git a/nuttx/arch/arm/src/stm32/Make.defs b/nuttx/arch/arm/src/stm32/Make.defs
index c220a8ec1..297940730 100755
--- a/nuttx/arch/arm/src/stm32/Make.defs
+++ b/nuttx/arch/arm/src/stm32/Make.defs
@@ -47,5 +47,5 @@ CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c \
CHIP_ASRCS =
CHIP_CSRCS = stm32_start.c stm32_rcc.c stm32_gpio.c stm32_irq.c \
stm32_timerisr.c stm32_dma.c stm32_lowputc.c stm32_serial.c \
- stm32_spi.c stm32_usbdev.c
+ stm32_spi.c stm32_usbdev.c stm32_sdio.c
diff --git a/nuttx/drivers/mmcsd/mmcsd_sdio.c b/nuttx/drivers/mmcsd/mmcsd_sdio.c
index 8a0b6dea3..c6e4fdb19 100644
--- a/nuttx/drivers/mmcsd/mmcsd_sdio.c
+++ b/nuttx/drivers/mmcsd/mmcsd_sdio.c
@@ -67,7 +67,7 @@
struct mmcsd_state_s
{
- struct sdio_dev_s *dev; /* The MMCSD device bound to this instance */
+ struct sdio_dev_s *dev; /* The SDIO device bound to this instance */
ubyte crefs; /* Open references on the driver */
/* Status flags */