From 03ad60426dd8b7eae3649052d74e6684774e103c Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 26 Aug 2013 08:54:46 -0600 Subject: [PATCH] #17 Fix if CONFIG_SDIO_BLOCKSETUP defined, OS will crash. From CCTSAO --- ChangeLog | 4 ++++ arch/arm/src/stm32/stm32_sdio.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index dc97fe1d117..3e29450a2bb 100644 --- a/ChangeLog +++ b/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/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c index ba556b4968e..8b8d4d1de54 100644 --- a/arch/arm/src/stm32/stm32_sdio.c +++ b/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,