lupyuen/local-nuttx-update
1
0
Fork 0
forked from nuttx/nuttx-update
Code Pull requests Activity

Eliminate new warnings found in build testing.

Browse source
This commit is contained in:
Gregory Nutt 2019-08-21 13:45:05 -06:00
parent 3ed844640d
commit 6ddd4752b0
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig
View file

@ -24,7 +24,6 @@ CONFIG_BOARD_LOOPSPERMSEC=2988
CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_HOST_WINDOWS=y
CONFIG_LPUART1_RXBUFSIZE=64
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_LPUART1_TXBUFSIZE=64

1
boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig
View file

@ -24,7 +24,6 @@ CONFIG_BOARD_LOOPSPERMSEC=2988
CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_HOST_WINDOWS=y
CONFIG_LPUART1_RXBUFSIZE=64
CONFIG_LPUART1_SERIAL_CONSOLE=y
CONFIG_LPUART1_TXBUFSIZE=64

9
drivers/mmcsd/mmcsd_sdio.c
View file

@ -671,8 +671,10 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4])
* read from extended CSD register.
*/
#ifdef CONFIG_DEBUG_FS_INFO
uint16_t csize = ((csd[1] & 0x03ff) << 2) | ((csd[2] >> 30) & 3);
uint8_t csizemult = (csd[2] >> 15) & 7;
#endif
priv->blockshift = readbllen;
priv->blocksize = (1 << readbllen);
@ -3017,7 +3019,9 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv)
{
uint32_t response;
uint32_t sdcapacity = MMCSD_ACMD41_STDCAPACITY;
#ifdef CONFIG_MMCSD_MMCSUPPORT
uint32_t mmccapacity = MMCSD_R3_HIGHCAPACITY;
#endif
clock_t start;
clock_t elapsed;
int ret;
@ -3053,9 +3057,8 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv)
up_udelay(MMCSD_IDLE_DELAY);
#ifdef CONFIG_MMCSD_MMCSUPPORT
/* send CMD3 which is supported only by MMC.
* if there is valid response then the card
* is definetly of MMC type
/* Send CMD3 which is supported only by MMC. if there is valid response
* then the card is definitely of MMC type
*/
mmcsd_sendcmdpoll(priv, MMC_CMD1, MMCSD_VDD_33_34 | mmccapacity);