sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged in david_s5/nuttx/master_rt_fix (pull request #936)

Browse Source 
imxrt:USDHC Stopgap Fix for build breakage

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
David Sidrane 2019-07-04 16:41:50 +00:00 committed by Gregory Nutt
parent b3a86e5ac6
commit a380a68680
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/arm/src/imxrt/imxrt_usdhc.c
View File

@ -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
*