Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-09-28 03:09:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix mount problem

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1835 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2009-05-29 13:32:00 +00:00
parent 45456750bf
commit 9f478308f7
6 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/mmcsd/mmcsd_spi.c
+35 -7
View File
@@ -431,8 +431,17 @@ static uint32 mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot,
FAR struct spi_dev_s *spi = slot->spi;
uint32 result;
ubyte response = 0xff;
int ret;
int i;
/* Wait until the card is not busy */
ret = mmcsd_waitready(slot);
if (ret != OK)
{
return ret;
}
/* Send command code */
SPI_SEND(spi, cmd->cmd);
@@ -1012,15 +1021,34 @@ static int mmcsd_open(FAR struct inode *inode)
}
#endif
/* Select the slave */
/* Verify that an MMC/SD card has been inserted */
ret = -ENODEV;
mmcsd_semtake(&slot->sem);
SPI_SELECT(spi, SPIDEV_MMCSD, TRUE);
if ((SPI_STATUS(spi, SPIDEV_MMCSD) & SPI_STATUS_PRESENT) != 0)
{
/* Yes.. a card is present. Has it been initialized? */
/* Verify that the MMC/SD card is alive and ready for business */
if (slot->type == MMCSD_CARDTYPE_UNKNOWN)
{
/* Ininitialize for the media in the slot */
ret = mmcsd_waitready(slot);
SPI_SELECT(spi, SPIDEV_MMCSD, FALSE);
ret = mmcsd_mediainitialize(slot);
if (ret < 0)
{
fvdbg("Failed to initialize card\n");
goto errout_with_sem;
}
}
/* Make sure that the card is ready */
SPI_SELECT(spi, SPIDEV_MMCSD, TRUE);
ret = mmcsd_waitready(slot);
SPI_SELECT(spi, SPIDEV_MMCSD, FALSE);
}
errout_with_sem:
mmcsd_semgive(&slot->sem);
return ret;
}
@@ -1084,7 +1112,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
}
#endif
/* Verify that card is availabled */
/* Verify that card is available */
if (slot->state & MMCSD_SLOTSTATUS_NOTREADY)
{
@@ -1237,7 +1265,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
}
#endif
/* Verify that card is availabled */
/* Verify that card is available */
if (slot->state & MMCSD_SLOTSTATUS_NOTREADY)
{