summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-08-26 08:54:46 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-08-26 08:54:46 -0600
commitf239b84ba842e1b7937ac6c863e2df6bb39ced66 (patch)
treeb4911a1d78685457e4951e673f4b9da57658e942
parentcb1647d6295692faa023f252745a411a7bef291f (diff)
downloadnuttx-f239b84ba842e1b7937ac6c863e2df6bb39ced66.tar.gz
nuttx-f239b84ba842e1b7937ac6c863e2df6bb39ced66.tar.bz2
nuttx-f239b84ba842e1b7937ac6c863e2df6bb39ced66.zip
#17 Fix if CONFIG_SDIO_BLOCKSETUP defined, OS will crash. From CCTSAO
-rw-r--r--nuttx/ChangeLog4
-rw-r--r--nuttx/arch/arm/src/stm32/stm32_sdio.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index dc97fe1d1..3e29450a2 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -5453,4 +5453,8 @@
* fs/romfs/fs_romfsutil.c: Fix an error where long (>15) file names
were read incorrectly from a ROMFS file system. From Mike Smit
(2013-8-25).
+ * arch/arm/src/stm32/stm32_sdio.c: SourceForge bug #17 Fix if
+ CONFIG_SDIO_BLOCKSETUP defined, OS will crash". Generate an error
+ if CONFIG_SDIO_BLOCKSETUP is defined; that option is not yet supported
+ by the STM32 SDIO driver. From CCTSAO (2013-6-26)
diff --git a/nuttx/arch/arm/src/stm32/stm32_sdio.c b/nuttx/arch/arm/src/stm32/stm32_sdio.c
index ba556b496..8b8d4d1de 100644
--- a/nuttx/arch/arm/src/stm32/stm32_sdio.c
+++ b/nuttx/arch/arm/src/stm32/stm32_sdio.c
@@ -481,6 +481,9 @@ struct stm32_dev_s g_sdiodev =
.clock = stm32_clock,
.attach = stm32_attach,
.sendcmd = stm32_sendcmd,
+#ifdef CONFIG_SDIO_BLOCKSETUP
+ .blocksetup = stm32_blocksetup, /* Not implemented yet */
+#endif
.recvsetup = stm32_recvsetup,
.sendsetup = stm32_sendsetup,
.cancel = stm32_cancel,