diff --git a/ChangeLog b/ChangeLog index 6d00bdb72543db5f2cd4c0cfd37660be85d36a35..d60492160f86012cb7d5a44fde9678bc3be54da6 100644 --- a/ChangeLog +++ b/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/Documentation/NuttX.html b/Documentation/NuttX.html index f92069e539e96041f5fc3610eebcc6896f64b0f2..d14a755ce6cae59c07d43f43b9bde1b6b36db5db 100644 --- a/Documentation/NuttX.html +++ b/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 <spudmonkey@racsa.co.cr> 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 <spudmonkey@racsa.co.cr> diff --git a/arch/arm/src/stm32/Make.defs b/arch/arm/src/stm32/Make.defs index c220a8ec15fb44bdeb877bf33272fe20971ad2cc..2979407300cc88f3697bd246b84e69b24792c6cd 100755 --- a/arch/arm/src/stm32/Make.defs +++ b/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/drivers/mmcsd/mmcsd_sdio.c b/drivers/mmcsd/mmcsd_sdio.c index 8a0b6dea321e862afe2f612b185305daba54583e..c6e4fdb1998b9c9308a67febc0ee96efa57d7d5a 100644 --- a/drivers/mmcsd/mmcsd_sdio.c +++ b/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 */