luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drivers/mmcsd: Fix minor bugs

Browse source 
- Add missing cancel process when the send command fails
- Make it possible to recover from SD initialization error
- Reduce time in changing transfer mode to 5msec from 500msec.
  Replace usleep function instead of up_udelay in other to avoid
  blocking other tasks from working.
This commit is contained in:
SPRESENSE 2020-07-22 17:39:40 +09:00 • committed by Xiang Xiao
parent fd220e7a6c
commit e4b50c4ba0
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/mmcsd/mmcsd_sdio.c
View file

@ -68,7 +68,7 @@
#define MMCSD_POWERUP_DELAY ((useconds_t)250) /* 74 clock cycles @ 400KHz = 185uS */
#define MMCSD_IDLE_DELAY ((useconds_t)50000) /* Short delay to allow change to IDLE state */
#define MMCSD_DSR_DELAY ((useconds_t)100000) /* Time to wait after setting DSR */
#define MMCSD_CLK_DELAY ((useconds_t)500000) /* Delay after changing clock speeds */
#define MMCSD_CLK_DELAY ((useconds_t)5000) /* Delay after changing clock speeds */
/* Data delays (all in units of milliseconds).
*
@ -1830,6 +1830,7 @@ static ssize_t mmcsd_writesingle(FAR struct mmcsd_state_s *priv,
if (ret != OK)
{
ferr("ERROR: mmsd_recv_r1 for CMD24 failed: %d\n", ret);
SDIO_CANCEL(priv->dev);
return ret;
}
}
@ -2036,6 +2037,7 @@ static ssize_t mmcsd_writemultiple(FAR struct mmcsd_state_s *priv,
if (ret != OK)
{
ferr("ERROR: mmsd_recv_r1 for CMD25 failed: %d\n", ret);
SDIO_CANCEL(priv->dev);
return ret;
}
}
@ -2630,7 +2632,7 @@ static int mmcsd_widebus(FAR struct mmcsd_state_s *priv)
priv->widebus = true;
SDIO_CLOCK(priv->dev, CLOCK_SD_TRANSFER_4BIT);
up_udelay(MMCSD_CLK_DELAY);
usleep(MMCSD_CLK_DELAY);
return OK;
}
@ -2762,7 +2764,7 @@ static int mmcsd_mmcinitialize(FAR struct mmcsd_state_s *priv)
/* Select high speed MMC clocking (which may depend on the DSR setting) */
SDIO_CLOCK(priv->dev, CLOCK_MMC_TRANSFER);
up_udelay(MMCSD_CLK_DELAY);
usleep(MMCSD_CLK_DELAY);
return OK;
}
@ -3480,12 +3482,12 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv)
(unsigned long)(priv->capacity / 1024));
priv->mediachanged = true;
}
/* When the card is identified, we have probed this card */
priv->probed = true;
}
/* In any event, we have probed this card */
priv->probed = true;
/* Regardless of whether or not a card was successfully initialized,
* there is apparently a card inserted. If it wasn't successfully
* initialized, there's nothing we can do about it now. Perhaps it's