From a380a68680da5d5f714e3da84fdd4429569d71b8 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Thu, 4 Jul 2019 16:41:50 +0000 Subject: [PATCH] Merged in david_s5/nuttx/master_rt_fix (pull request #936) imxrt:USDHC Stopgap Fix for build breakage Approved-by: Gregory Nutt --- arch/arm/src/imxrt/imxrt_usdhc.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/arch/arm/src/imxrt/imxrt_usdhc.c b/arch/arm/src/imxrt/imxrt_usdhc.c index 7583823c79..de2fa5fc50 100644 --- a/arch/arm/src/imxrt/imxrt_usdhc.c +++ b/arch/arm/src/imxrt/imxrt_usdhc.c @@ -77,8 +77,15 @@ /* Configuration ************************************************************/ +/* Fixme: This is a temporary fix to default to how this worked before, + * and still allow an override to 2 slots for testing. + * + * Once Dave changes this to be keyed off CONFIG_IMXRT_USDHC1 and 2 + * delete this. + */ + #if !defined(CONFIG_IMXRT_MAX_SDHCDEV_SLOTS) -# define CONFIG_IMXRT_MAX_SDHCDEV_SLOTS 2 +# define CONFIG_IMXRT_MAX_SDHCDEV_SLOTS 1 #endif #if !defined(CONFIG_IMXRT_USDHC_DMA) @@ -336,8 +343,6 @@ static int imxrt_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong[4]); static int imxrt_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort); -static int imxrt_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd, - uint32_t *rnotimpl); /* EVENT handler */ @@ -2471,16 +2476,6 @@ static int imxrt_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, return ret; } -/* MMC responses not supported */ - -static int imxrt_recvnotimpl(FAR struct sdio_dev_s *dev, - uint32_t cmd, uint32_t *rnotimpl) -{ - /* Just return an error */ - - return -ENOSYS; -} - /**************************************************************************** * Name: imxrt_waitenable *