Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Replace all occurrences of vdbg with vinfo

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-11 11:59:51 -06:00
parent 3a74a438d9
commit fc3540cffe
845 changed files with 5817 additions and 5817 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/mmcsd/mmcsd.h
+1 -1
View File
@@ -87,7 +87,7 @@ extern "C" {
#endif
#ifdef CONFIG_MMCSD_DUMPALL
# define mmcsd_dumpbuffer(m,b,l) fvdbgdumpbuffer(m,b,l)
# define mmcsd_dumpbuffer(m,b,l) finfodumpbuffer(m,b,l)
#else
# define mmcsd_dumpbuffer(m,b,l)
#endif
drivers/mmcsd/mmcsd_debug.c
+40 -40
View File
@@ -87,90 +87,90 @@ void mmcsd_dmpcsd(FAR const uint8_t *csd, uint8_t cardtype)
bool mmc = (cardtype == MMCSD_CARDTYPE_MMC);
bool sd2 = (MMCSD_CSD_CSDSTRUCT(csd) == 1);
fvdbg("CSD\n");
fvdbg(" CSD_STRUCTURE: 1.%d\n", MMCSD_CSD_CSDSTRUCT(csd));
finfo("CSD\n");
finfo(" CSD_STRUCTURE: 1.%d\n", MMCSD_CSD_CSDSTRUCT(csd));
if (mmc)
{
fvdbg(" MMC SPEC_VERS: %d\n", MMC_CSD_SPECVERS(csd));
finfo(" MMC SPEC_VERS: %d\n", MMC_CSD_SPECVERS(csd));
}
fvdbg(" TAAC:\n",
finfo(" TAAC:\n",
sd2 ? SD20_CSD_TAC_TIMEVALUE(csd) : MMCSD_CSD_TAAC_TIMEVALUE(csd));
fvdbg(" TIME_VALUE: 0x%02x\n",
finfo(" TIME_VALUE: 0x%02x\n",
sd2 ? SD20_CSD_TAC_TIMEVALUE(csd) : MMCSD_CSD_TAAC_TIMEVALUE(csd));
fvdbg(" TIME_UNIT: 0x%02x\n",
finfo(" TIME_UNIT: 0x%02x\n",
sd2 ? SD20_CSD_TAC_TIMEUNIT(csd) : MMCSD_CSD_TAAC_TIMEUNIT(csd));
fvdbg(" NSAC: 0x%02x\n",
finfo(" NSAC: 0x%02x\n",
sd2 ? SD20_CSD_NSAC(csd) : MMCSD_CSD_NSAC(csd));
fvdbg(" TRAN_SPEED:\n");
fvdbg(" TIME_VALUE: 0x%02x\n",
finfo(" TRAN_SPEED:\n");
finfo(" TIME_VALUE: 0x%02x\n",
sd2 ? SD20_CSD_TRANSPEED_TIMEVALUE(csd) : MMCSD_CSD_TRANSPEED_TIMEVALUE(csd));
fvdbg(" RATE_UNIT: 0x%02x\n",
finfo(" RATE_UNIT: 0x%02x\n",
sd2 ? SD20_CSD_TRANSPEED_TRANSFERRATEUNIT(csd) : MMCSD_CSD_TRANSPEED_TRANSFERRATEUNIT(csd));
fvdbg(" CCC: 0x%03x\n",
finfo(" CCC: 0x%03x\n",
sd2 ? SD20_CSD_CCC(csd) : MMCSD_CSD_CCC(csd));
fvdbg(" READ_BL_LEN: %d\n",
finfo(" READ_BL_LEN: %d\n",
sd2 ? SD20_CSD_READBLLEN(csd) : MMCSD_CSD_READBLLEN(csd));
fvdbg(" READ_BL_PARTIAL: %d\n",
finfo(" READ_BL_PARTIAL: %d\n",
sd2 ? SD20_CSD_READBLPARTIAL(csd) : MMCSD_CSD_READBLPARTIAL(csd));
fvdbg(" WRITE_BLK_MISALIGN: %d\n",
finfo(" WRITE_BLK_MISALIGN: %d\n",
sd2 ? SD20_CSD_WRITEBLKMISALIGN(csd) : MMCSD_CSD_WRITEBLKMISALIGN(csd));
fvdbg(" READ_BLK_MISALIGN: %d\n",
finfo(" READ_BLK_MISALIGN: %d\n",
sd2 ? SD20_CSD_READBLKMISALIGN(csd) : MMCSD_CSD_READBLKMISALIGN(csd));
fvdbg(" DSR_IMP: %d\n",
finfo(" DSR_IMP: %d\n",
sd2 ? SD20_CSD_DSRIMP(csd) : MMCSD_CSD_DSRIMP(csd));
fvdbg(" C_SIZE: %d\n",
finfo(" C_SIZE: %d\n",
sd2 ? SD20_CSD_CSIZE(csd) : MMCSD_CSD_CSIZE(csd));
fvdbg(" VDD_R_CURR_MIN: %d\n",
finfo(" VDD_R_CURR_MIN: %d\n",
sd2 ? SD20_CSD_VDDRCURRMIN(csd) : MMCSD_CSD_VDDRCURRMIN(csd));
fvdbg(" VDD_R_CURR_MAX: %d\n",
finfo(" VDD_R_CURR_MAX: %d\n",
sd2 ? SD20_CSD_VDDRCURRMAX(csd) : MMCSD_CSD_VDDRCURRMAX(csd));
fvdbg(" VDD_W_CURR_MIN: %d\n",
finfo(" VDD_W_CURR_MIN: %d\n",
sd2 ? SD20_CSD_VDDWCURRMIN(csd) : MMCSD_CSD_VDDWCURRMIN(csd));
fvdbg(" VDD_W_CURR_MAX: %d\n",
finfo(" VDD_W_CURR_MAX: %d\n",
sd2 ? SD20_CSD_VDDWCURRMAX(csd) : MMCSD_CSD_VDDWCURRMAX(csd));
fvdbg(" C_SIZE_MULT: %d\n",
finfo(" C_SIZE_MULT: %d\n",
sd2 ? SD20_CSD_CSIZEMULT(csd) : MMCSD_CSD_CSIZEMULT(csd));
if (mmc)
{
fvdbg(" MMC SECTOR_SIZE: %d\n", MMC_CSD_SECTORSIZE(csd));
fvdbg(" MMC ER_GRP_SIZE: %d\n", MMC_CSD_ERGRPSIZE(csd));
fvdbg(" MMC WP_GRP_SIZE: %d\n", MMC_CSD_WPGRPSIZE(csd));
fvdbg(" MMC DFLT_ECC: %d\n", MMC_CSD_DFLTECC(csd));
finfo(" MMC SECTOR_SIZE: %d\n", MMC_CSD_SECTORSIZE(csd));
finfo(" MMC ER_GRP_SIZE: %d\n", MMC_CSD_ERGRPSIZE(csd));
finfo(" MMC WP_GRP_SIZE: %d\n", MMC_CSD_WPGRPSIZE(csd));
finfo(" MMC DFLT_ECC: %d\n", MMC_CSD_DFLTECC(csd));
}
else
{
fvdbg(" SD ER_BLK_EN: %d\n",
finfo(" SD ER_BLK_EN: %d\n",
sd2 ? SD20_CSD_SDERBLKEN(csd) : SD_CSD_SDERBLKEN(csd));
fvdbg(" SD SECTOR_SIZE: %d\n",
finfo(" SD SECTOR_SIZE: %d\n",
sd2 ? SD20_CSD_SECTORSIZE(csd) : SD_CSD_SECTORSIZE(csd));
fvdbg(" SD WP_GRP_SIZE: %d\n",
finfo(" SD WP_GRP_SIZE: %d\n",
sd2 ? SD_CSD_WPGRPSIZE(csd) : SD_CSD_WPGRPSIZE(csd));
}
fvdbg(" WP_GRP_EN: %d\n",
finfo(" WP_GRP_EN: %d\n",
sd2 ? SD20_WPGRPEN(csd) : MMCSD_WPGRPEN(csd));
fvdbg(" R2W_FACTOR: %d\n",
finfo(" R2W_FACTOR: %d\n",
sd2 ? SD20_CSD_R2WFACTOR(csd) : MMCSD_CSD_R2WFACTOR(csd));
fvdbg(" WRITE_BL_LEN: %d\n",
finfo(" WRITE_BL_LEN: %d\n",
sd2 ? SD20_CSD_WRITEBLLEN(csd) : MMCSD_CSD_WRITEBLLEN(csd));
fvdbg(" WRITE_BL_PARTIAL: %d\n",
finfo(" WRITE_BL_PARTIAL: %d\n",
sd2 ? SD20_CSD_WRITEBLPARTIAL(csd) : MMCSD_CSD_WRITEBLPARTIAL(csd));
fvdbg(" FILE_FORMAT_GROUP: %d\n",
finfo(" FILE_FORMAT_GROUP: %d\n",
sd2 ? SD20_CSD_FILEFORMATGRP(csd) : MMCSD_CSD_FILEFORMATGRP(csd));
fvdbg(" COPY: %d\n",
finfo(" COPY: %d\n",
sd2 ? SD20_CSD_COPY(csd) : MMCSD_CSD_COPY(csd));
fvdbg(" PERM_WRITE_PROTECT: %d\n",
finfo(" PERM_WRITE_PROTECT: %d\n",
sd2 ? SD20_CSD_PERMWRITEPROTECT(csd) : MMCSD_CSD_PERMWRITEPROTECT(csd));
fvdbg(" TMP_WRITE_PROTECT: %d\n",
finfo(" TMP_WRITE_PROTECT: %d\n",
sd2 ?SD20_CSD_TMPWRITEPROTECT(csd) : MMCSD_CSD_TMPWRITEPROTECT(csd));
fvdbg(" FILE_FORMAT: %d\n",
finfo(" FILE_FORMAT: %d\n",
sd2 ? SD20_CSD_FILEFORMAT(csd) : MMCSD_CSD_FILEFORMAT(csd));
if (mmc)
{
fvdbg(" MMC ECC: %d\n",
finfo(" MMC ECC: %d\n",
sd2 ? MMC_CSD_ECC(csd) : MMC_CSD_ECC(csd));
}
fvdbg(" CRC: %02x\n",
finfo(" CRC: %02x\n",
sd2 ? SD20_CSD_CRC(csd) : MMCSD_CSD_CRC(csd));
}
#endif
drivers/mmcsd/mmcsd_sdio.c
+75 -75
View File
@@ -413,7 +413,7 @@ static int mmcsd_recvR1(FAR struct mmcsd_state_s *priv, uint32_t cmd)
* indication for later use.
*/
fvdbg("ERROR: R1=%08x\n", r1);
finfo("ERROR: R1=%08x\n", r1);
priv->locked = ((r1 & MMCSD_R1_CARDISLOCKED) != 0);
ret = -EIO;
}
@@ -767,69 +767,69 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4])
decoded.mmcecc = (csd[3] >> 8) & 3;
decoded.crc = (csd[3] >> 1) & 0x7f;
fvdbg("CSD:\n");
fvdbg(" CSD_STRUCTURE: %d SPEC_VERS: %d (MMC)\n",
finfo("CSD:\n");
finfo(" CSD_STRUCTURE: %d SPEC_VERS: %d (MMC)\n",
decoded.csdstructure, decoded.mmcspecvers);
fvdbg(" TAAC {TIME_UNIT: %d TIME_VALUE: %d} NSAC: %d\n",
finfo(" TAAC {TIME_UNIT: %d TIME_VALUE: %d} NSAC: %d\n",
decoded.taac.timeunit, decoded.taac.timevalue, decoded.nsac);
fvdbg(" TRAN_SPEED {TRANSFER_RATE_UNIT: %d TIME_VALUE: %d}\n",
finfo(" TRAN_SPEED {TRANSFER_RATE_UNIT: %d TIME_VALUE: %d}\n",
decoded.transpeed.transferrateunit, decoded.transpeed.timevalue);
fvdbg(" CCC: %d\n", decoded.ccc);
fvdbg(" READ_BL_LEN: %d READ_BL_PARTIAL: %d\n",
finfo(" CCC: %d\n", decoded.ccc);
finfo(" READ_BL_LEN: %d READ_BL_PARTIAL: %d\n",
decoded.readbllen, decoded.readblpartial);
fvdbg(" WRITE_BLK_MISALIGN: %d READ_BLK_MISALIGN: %d\n",
finfo(" WRITE_BLK_MISALIGN: %d READ_BLK_MISALIGN: %d\n",
decoded.writeblkmisalign, decoded.readblkmisalign);
fvdbg(" DSR_IMP: %d\n",
finfo(" DSR_IMP: %d\n",
decoded.dsrimp);
if (IS_BLOCK(priv->type))
{
fvdbg(" SD Block Addressing:\n");
fvdbg(" C_SIZE: %d SD_ER_BLK_EN: %d\n",
finfo(" SD Block Addressing:\n");
finfo(" C_SIZE: %d SD_ER_BLK_EN: %d\n",
decoded.u.sdblock.csize, decoded.u.sdblock.sderblen);
fvdbg(" SD_SECTOR_SIZE: %d SD_WP_GRP_SIZE: %d\n",
finfo(" SD_SECTOR_SIZE: %d SD_WP_GRP_SIZE: %d\n",
decoded.u.sdblock.sdsectorsize, decoded.u.sdblock.sdwpgrpsize);
}
else if (IS_SD(priv->type))
{
fvdbg(" SD Byte Addressing:\n");
fvdbg(" C_SIZE: %d C_SIZE_MULT: %d\n",
finfo(" SD Byte Addressing:\n");
finfo(" C_SIZE: %d C_SIZE_MULT: %d\n",
decoded.u.sdbyte.csize, decoded.u.sdbyte.csizemult);
fvdbg(" VDD_R_CURR_MIN: %d VDD_R_CURR_MAX: %d\n",
finfo(" VDD_R_CURR_MIN: %d VDD_R_CURR_MAX: %d\n",
decoded.u.sdbyte.vddrcurrmin, decoded.u.sdbyte.vddrcurrmax);
fvdbg(" VDD_W_CURR_MIN: %d VDD_W_CURR_MAX: %d\n",
finfo(" VDD_W_CURR_MIN: %d VDD_W_CURR_MAX: %d\n",
decoded.u.sdbyte.vddwcurrmin, decoded.u.sdbyte.vddwcurrmax);
fvdbg(" SD_ER_BLK_EN: %d SD_SECTOR_SIZE: %d (SD) SD_WP_GRP_SIZE: %d\n",
finfo(" SD_ER_BLK_EN: %d SD_SECTOR_SIZE: %d (SD) SD_WP_GRP_SIZE: %d\n",
decoded.u.sdbyte.sderblen, decoded.u.sdbyte.sdsectorsize, decoded.u.sdbyte.sdwpgrpsize);
}
#ifdef CONFIG_MMCSD_MMCSUPPORT
else if (IS_MMC(priv->type))
{
fvdbg(" MMC:\n");
fvdbg(" C_SIZE: %d C_SIZE_MULT: %d\n",
finfo(" MMC:\n");
finfo(" C_SIZE: %d C_SIZE_MULT: %d\n",
decoded.u.mmc.csize, decoded.u.mmc.csizemult);
fvdbg(" VDD_R_CURR_MIN: %d VDD_R_CURR_MAX: %d\n",
finfo(" VDD_R_CURR_MIN: %d VDD_R_CURR_MAX: %d\n",
decoded.u.mmc.vddrcurrmin, decoded.u.mmc.vddrcurrmax);
fvdbg(" VDD_W_CURR_MIN: %d VDD_W_CURR_MAX: %d\n",
finfo(" VDD_W_CURR_MIN: %d VDD_W_CURR_MAX: %d\n",
decoded.u.mmc.vddwcurrmin, decoded.u.mmc.vddwcurrmax);
fvdbg(" MMC_SECTOR_SIZE: %d MMC_ER_GRP_SIZE: %d MMC_WP_GRP_SIZE: %d\n",
finfo(" MMC_SECTOR_SIZE: %d MMC_ER_GRP_SIZE: %d MMC_WP_GRP_SIZE: %d\n",
decoded.u.mmc.er.mmc22.sectorsize, decoded.u.mmc.er.mmc22.ergrpsize,
decoded.u.mmc.mmcwpgrpsize);
}
#endif
fvdbg(" WP_GRP_EN: %d MMC DFLT_ECC: %d (MMC) R2W_FACTOR: %d\n",
finfo(" WP_GRP_EN: %d MMC DFLT_ECC: %d (MMC) R2W_FACTOR: %d\n",
decoded.wpgrpen, decoded.mmcdfltecc, decoded.r2wfactor);
fvdbg(" WRITE_BL_LEN: %d WRITE_BL_PARTIAL: %d\n",
finfo(" WRITE_BL_LEN: %d WRITE_BL_PARTIAL: %d\n",
decoded.writebllen, decoded.writeblpartial);
fvdbg(" FILE_FORMAT_GROUP: %d COPY: %d\n",
finfo(" FILE_FORMAT_GROUP: %d COPY: %d\n",
decoded.fileformatgrp, decoded.copy);
fvdbg(" PERM_WRITE_PROTECT: %d TMP_WRITE_PROTECT: %d\n",
finfo(" PERM_WRITE_PROTECT: %d TMP_WRITE_PROTECT: %d\n",
decoded.permwriteprotect, decoded.tmpwriteprotect);
fvdbg(" FILE_FORMAT: %d ECC: %d (MMC) CRC: %d\n",
finfo(" FILE_FORMAT: %d ECC: %d (MMC) CRC: %d\n",
decoded.fileformat, decoded.mmcecc, decoded.crc);
fvdbg("Capacity: %luKb, Block size: %db, nblocks: %d wrprotect: %d\n",
finfo("Capacity: %luKb, Block size: %db, nblocks: %d wrprotect: %d\n",
(unsigned long)(priv->capacity / 1024), priv->blocksize,
priv->nblocks, priv->wrprotect);
#endif
@@ -893,7 +893,7 @@ static void mmcsd_decodeCID(FAR struct mmcsd_state_s *priv, uint32_t cid[4])
decoded.mdt = (cid[3] >> 8) & 0x0fff;
decoded.crc = (cid[3] >> 1) & 0x7f;
fvdbg("mid: %02x oid: %04x pnm: %s prv: %d psn: %d mdt: %02x crc: %02x\n",
finfo("mid: %02x oid: %04x pnm: %s prv: %d psn: %d mdt: %02x crc: %02x\n",
decoded.mid, decoded.oid, decoded.pnm, decoded.prv,
decoded.psn, decoded.mdt, decoded.crc);
}
@@ -955,12 +955,12 @@ struct mmcsd_scr_s decoded;
#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
decoded.mfgdata = scr[1]; /* Might be byte reversed! */
fvdbg("SCR:\n");
fvdbg(" SCR_STRUCTURE: %d SD_VERSION: %d\n",
finfo("SCR:\n");
finfo(" SCR_STRUCTURE: %d SD_VERSION: %d\n",
decoded.scrversion, decoded.sdversion);
fvdbg(" DATA_STATE_AFTER_ERASE: %d SD_SECURITY: %d SD_BUS_WIDTHS: %x\n",
finfo(" DATA_STATE_AFTER_ERASE: %d SD_SECURITY: %d SD_BUS_WIDTHS: %x\n",
decoded.erasestate, decoded.security, decoded.buswidth);
fvdbg(" Manufacturing data: %08x\n",
finfo(" Manufacturing data: %08x\n",
decoded.mfgdata);
#endif
}
@@ -1288,7 +1288,7 @@ static ssize_t mmcsd_readsingle(FAR struct mmcsd_state_s *priv,
off_t offset;
int ret;
fvdbg("startblock=%d\n", startblock);
finfo("startblock=%d\n", startblock);
DEBUGASSERT(priv != NULL && buffer != NULL);
/* Check if the card is locked */
@@ -1342,7 +1342,7 @@ static ssize_t mmcsd_readsingle(FAR struct mmcsd_state_s *priv,
offset = startblock << priv->blockshift;
}
fvdbg("offset=%d\n", offset);
finfo("offset=%d\n", offset);
/* Select the block size for the card */
@@ -1365,7 +1365,7 @@ static ssize_t mmcsd_readsingle(FAR struct mmcsd_state_s *priv,
ret = SDIO_DMARECVSETUP(priv->dev, buffer, priv->blocksize);
if (ret != OK)
{
fvdbg("SDIO_DMARECVSETUP: error %d\n", ret);
finfo("SDIO_DMARECVSETUP: error %d\n", ret);
return ret;
}
}
@@ -1422,7 +1422,7 @@ static ssize_t mmcsd_readmultiple(FAR struct mmcsd_state_s *priv,
off_t offset;
int ret;
fvdbg("startblock=%d nblocks=%d\n", startblock, nblocks);
finfo("startblock=%d nblocks=%d\n", startblock, nblocks);
DEBUGASSERT(priv != NULL && buffer != NULL && nblocks > 1);
/* Check if the card is locked */
@@ -1476,7 +1476,7 @@ static ssize_t mmcsd_readmultiple(FAR struct mmcsd_state_s *priv,
{
offset = startblock << priv->blockshift;
}
fvdbg("nbytes=%d byte offset=%d\n", nbytes, offset);
finfo("nbytes=%d byte offset=%d\n", nbytes, offset);
/* Select the block size for the card */
@@ -1499,7 +1499,7 @@ static ssize_t mmcsd_readmultiple(FAR struct mmcsd_state_s *priv,
ret = SDIO_DMARECVSETUP(priv->dev, buffer, nbytes);
if (ret != OK)
{
fvdbg("SDIO_DMARECVSETUP: error %d\n", ret);
finfo("SDIO_DMARECVSETUP: error %d\n", ret);
return ret;
}
}
@@ -1625,7 +1625,7 @@ static ssize_t mmcsd_writesingle(FAR struct mmcsd_state_s *priv,
off_t offset;
int ret;
fvdbg("startblock=%d\n", startblock);
finfo("startblock=%d\n", startblock);
DEBUGASSERT(priv != NULL && buffer != NULL);
/* Check if the card is locked or write protected (either via software or
@@ -1681,7 +1681,7 @@ static ssize_t mmcsd_writesingle(FAR struct mmcsd_state_s *priv,
offset = startblock << priv->blockshift;
}
fvdbg("offset=%d\n", offset);
finfo("offset=%d\n", offset);
/* Select the block size for the card */
@@ -1713,7 +1713,7 @@ static ssize_t mmcsd_writesingle(FAR struct mmcsd_state_s *priv,
ret = SDIO_DMASENDSETUP(priv->dev, buffer, priv->blocksize);
if (ret != OK)
{
fvdbg("SDIO_DMASENDSETUP: error %d\n", ret);
finfo("SDIO_DMASENDSETUP: error %d\n", ret);
return ret;
}
}
@@ -1768,7 +1768,7 @@ static ssize_t mmcsd_writemultiple(FAR struct mmcsd_state_s *priv,
size_t nbytes;
int ret;
fvdbg("startblock=%d nblocks=%d\n", startblock, nblocks);
finfo("startblock=%d nblocks=%d\n", startblock, nblocks);
DEBUGASSERT(priv != NULL && buffer != NULL && nblocks > 1);
/* Check if the card is locked or write protected (either via software or
@@ -1825,7 +1825,7 @@ static ssize_t mmcsd_writemultiple(FAR struct mmcsd_state_s *priv,
offset = startblock << priv->blockshift;
}
fvdbg("nbytes=%d byte offset=%d\n", nbytes, offset);
finfo("nbytes=%d byte offset=%d\n", nbytes, offset);
/* Select the block size for the card */
@@ -1876,7 +1876,7 @@ static ssize_t mmcsd_writemultiple(FAR struct mmcsd_state_s *priv,
ret = SDIO_DMASENDSETUP(priv->dev, buffer, nbytes);
if (ret != OK)
{
fvdbg("SDIO_DMASENDSETUP: error %d\n", ret);
finfo("SDIO_DMASENDSETUP: error %d\n", ret);
return ret;
}
}
@@ -2003,7 +2003,7 @@ static int mmcsd_open(FAR struct inode *inode)
{
FAR struct mmcsd_state_s *priv;
fvdbg("Entry\n");
finfo("Entry\n");
DEBUGASSERT(inode && inode->i_private);
priv = (FAR struct mmcsd_state_s *)inode->i_private;
@@ -2027,7 +2027,7 @@ static int mmcsd_close(FAR struct inode *inode)
{
FAR struct mmcsd_state_s *priv;
fvdbg("Entry\n");
finfo("Entry\n");
DEBUGASSERT(inode && inode->i_private);
priv = (FAR struct mmcsd_state_s *)inode->i_private;
@@ -2061,7 +2061,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
DEBUGASSERT(inode && inode->i_private);
priv = (FAR struct mmcsd_state_s *)inode->i_private;
fvdbg("startsector: %d nsectors: %d sectorsize: %d\n",
finfo("startsector: %d nsectors: %d sectorsize: %d\n",
startsector, nsectors, priv->blocksize);
if (nsectors > 0)
@@ -2137,7 +2137,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, FAR const unsigned char *buf
DEBUGASSERT(inode && inode->i_private);
priv = (FAR struct mmcsd_state_s *)inode->i_private;
fvdbg("sector: %lu nsectors: %u sectorsize: %u\n",
finfo("sector: %lu nsectors: %u sectorsize: %u\n",
(unsigned long)startsector, nsectors, priv->blocksize);
mmcsd_takesem(priv);
@@ -2200,7 +2200,7 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
FAR struct mmcsd_state_s *priv;
int ret = -EINVAL;
fvdbg("Entry\n");
finfo("Entry\n");
DEBUGASSERT(inode && inode->i_private);
if (geometry)
@@ -2213,7 +2213,7 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
{
/* No.. return ENODEV */
fvdbg("IS_EMPTY\n");
finfo("IS_EMPTY\n");
ret = -ENODEV;
}
else
@@ -2230,10 +2230,10 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
geometry->geo_nsectors = priv->nblocks;
geometry->geo_sectorsize = priv->blocksize;
fvdbg("available: true mediachanged: %s writeenabled: %s\n",
finfo("available: true mediachanged: %s writeenabled: %s\n",
geometry->geo_mediachanged ? "true" : "false",
geometry->geo_writeenabled ? "true" : "false");
fvdbg("nsectors: %lu sectorsize: %d\n",
finfo("nsectors: %lu sectorsize: %d\n",
(long)geometry->geo_nsectors, geometry->geo_sectorsize);
priv->mediachanged = false;
@@ -2258,7 +2258,7 @@ static int mmcsd_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
FAR struct mmcsd_state_s *priv;
int ret;
fvdbg("Entry\n");
finfo("Entry\n");
DEBUGASSERT(inode && inode->i_private);
priv = (FAR struct mmcsd_state_s *)inode->i_private;
@@ -2269,7 +2269,7 @@ static int mmcsd_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
{
case BIOC_PROBE: /* Check for media in the slot */
{
fvdbg("BIOC_PROBE\n");
finfo("BIOC_PROBE\n");
/* Probe the MMC/SD slot for media */
@@ -2283,7 +2283,7 @@ static int mmcsd_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
case BIOC_EJECT: /* Media has been removed from the slot */
{
fvdbg("BIOC_EJECT\n");
finfo("BIOC_EJECT\n");
/* Process the removal of the card */
@@ -2330,7 +2330,7 @@ static void mmcsd_mediachange(FAR void *arg)
{
FAR struct mmcsd_state_s *priv = (FAR struct mmcsd_state_s *)arg;
fvdbg("arg: %p\n", arg);
finfo("arg: %p\n", arg);
DEBUGASSERT(priv);
/* Is there a card present in the slot? */
@@ -2411,7 +2411,7 @@ static int mmcsd_widebus(FAR struct mmcsd_state_s *priv)
ret = mmcsd_recvR1(priv, SD_ACMD42);
if (ret != OK)
{
fvdbg("WARNING: SD card does not support ACMD42: %d\n", ret);
finfo("WARNING: SD card does not support ACMD42: %d\n", ret);
return ret;
}
@@ -2438,7 +2438,7 @@ static int mmcsd_widebus(FAR struct mmcsd_state_s *priv)
/* Configure the SDIO peripheral */
fvdbg("Wide bus operation selected\n");
finfo("Wide bus operation selected\n");
SDIO_WIDEBUS(priv->dev, true);
priv->widebus = true;
@@ -2454,7 +2454,7 @@ static int mmcsd_widebus(FAR struct mmcsd_state_s *priv)
#else /* CONFIG_SDIO_WIDTH_D1_ONLY */
fvdbg("Wide-bus operation is disabled\n");
finfo("Wide-bus operation is disabled\n");
return -ENOSYS;
#endif /* CONFIG_SDIO_WIDTH_D1_ONLY */
@@ -2615,7 +2615,7 @@ static int mmcsd_sdinitialize(FAR struct mmcsd_state_s *priv)
return ret;
}
fvdbg("RCA: %04x\n", priv->rca);
finfo("RCA: %04x\n", priv->rca);
/* This should have caused a transition to standby state. However, this will
* not be reflected in the present R1 status. R1/6 contains the state of
@@ -2729,7 +2729,7 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv)
if (!SDIO_PRESENT(priv->dev))
{
fvdbg("No card present\n");
finfo("No card present\n");
return -ENODEV;
}
@@ -2779,7 +2779,7 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv)
if (((response & MMCSD_R7VOLTAGE_MASK) == MMCSD_R7VOLTAGE_27) &&
((response & MMCSD_R7ECHO_MASK) == MMCSD_R7CHECKPATTERN))
{
fvdbg("SD V2.x card\n");
finfo("SD V2.x card\n");
priv->type = MMCSD_CARDTYPE_SDV2;
sdcapacity = MMCSD_ACMD41_HIGHCAPACITY;
}
@@ -2844,10 +2844,10 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv)
* an SD V2.x (via CMD8), then this must be SD V1.x
*/
fvdbg("R3: %08x\n", response);
finfo("R3: %08x\n", response);
if (priv->type == MMCSD_CARDTYPE_UNKNOWN)
{
fvdbg("SD V1.x card\n");
finfo("SD V1.x card\n");
priv->type = MMCSD_CARDTYPE_SDV1;
}
@@ -2869,7 +2869,7 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv)
if ((response & MMCSD_R3_HIGHCAPACITY) != 0)
{
fvdbg("SD V2.x card with block addressing\n");
finfo("SD V2.x card with block addressing\n");
DEBUGASSERT(priv->type == MMCSD_CARDTYPE_SDV2);
priv->type |= MMCSD_CARDTYPE_BLOCK;
}
@@ -2977,7 +2977,7 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv)
{
int ret;
fvdbg("type: %d probed: %d\n", priv->type, priv->probed);
finfo("type: %d probed: %d\n", priv->type, priv->probed);
/* If we have reliable card detection events and if we have
* already probed the card, then we don't need to do anything
@@ -3045,7 +3045,7 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv)
{
/* Yes... */
fvdbg("Capacity: %lu Kbytes\n", (unsigned long)(priv->capacity / 1024));
finfo("Capacity: %lu Kbytes\n", (unsigned long)(priv->capacity / 1024));
priv->mediachanged = true;
/* Set up to receive asynchronous, media removal events */
@@ -3066,7 +3066,7 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv)
{
/* There is no card in the slot */
fvdbg("No card\n");
finfo("No card\n");
#ifdef CONFIG_MMCSD_HAVECARDDETECT
SDIO_CALLBACKENABLE(priv->dev, SDIOMEDIA_INSERTED);
#endif
@@ -3088,7 +3088,7 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv)
static int mmcsd_removed(FAR struct mmcsd_state_s *priv)
{
fvdbg("type: %d present: %d\n", priv->type, SDIO_PRESENT(priv->dev));
finfo("type: %d present: %d\n", priv->type, SDIO_PRESENT(priv->dev));
/* Forget the card geometry, pretend the slot is empty (it might not
* be), and that the card has never been initialized.
@@ -3131,7 +3131,7 @@ static int mmcsd_hwinitialize(FAR struct mmcsd_state_s *priv)
/* Does this architecture support DMA with the MMC/SD device? */
priv->dma = SDIO_DMASUPPORTED(priv->dev);
fvdbg("DMA supported: %d\n", priv->dma);
finfo("DMA supported: %d\n", priv->dma);
#endif
/* Attach and prepare MMC/SD interrupts */
@@ -3143,7 +3143,7 @@ static int mmcsd_hwinitialize(FAR struct mmcsd_state_s *priv)
return -EBUSY;
}
fvdbg("Attached MMC/SD interrupts\n");
finfo("Attached MMC/SD interrupts\n");
/* Register a callback so that we get informed if media is inserted or
* removed from the slot (Initially all callbacks are disabled).
@@ -3174,7 +3174,7 @@ static int mmcsd_hwinitialize(FAR struct mmcsd_state_s *priv)
ret = mmcsd_probe(priv);
if (ret != OK)
{
fvdbg("Slot not empty, but initialization failed: %d\n", ret);
finfo("Slot not empty, but initialization failed: %d\n", ret);
/* NOTE: The failure to initialize a card does not mean that
* initialization has failed! A card could be installed in the slot
@@ -3247,7 +3247,7 @@ int mmcsd_slotinitialize(int minor, FAR struct sdio_dev_s *dev)
char devname[16];
int ret = -ENOMEM;
fvdbg("minor: %d\n", minor);
finfo("minor: %d\n", minor);
/* Sanity check */
@@ -3293,7 +3293,7 @@ int mmcsd_slotinitialize(int minor, FAR struct sdio_dev_s *dev)
SDIO_CALLBACKENABLE(priv->dev, SDIOMEDIA_INSERTED);
fvdbg("MMC/SD slot is empty\n");
finfo("MMC/SD slot is empty\n");
}
else
{
drivers/mmcsd/mmcsd_spi.c
+41 -41
View File
@@ -535,7 +535,7 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot,
return (uint32_t)-1;
}
fvdbg("CMD%d[%08x] R1B=%02x\n",
finfo("CMD%d[%08x] R1B=%02x\n",
cmd->cmd & 0x3f, arg, response);
}
break;
@@ -544,7 +544,7 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot,
case MMCSD_CMDRESP_R1:
{
fvdbg("CMD%d[%08x] R1=%02x\n",
finfo("CMD%d[%08x] R1=%02x\n",
cmd->cmd & 0x3f, arg, response);
}
break;
@@ -556,7 +556,7 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot,
result = ((uint32_t)(response & 0xff) << 8);
result |= SPI_SEND(spi, 0xff) & 0xff;
fvdbg("CMD%d[%08x] R2=%04x\n",
finfo("CMD%d[%08x] R2=%04x\n",
cmd->cmd & 0x3f, arg, result);
}
break;
@@ -570,7 +570,7 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot,
slot->ocr |= ((uint32_t)(SPI_SEND(spi, 0xff) & 0xff) << 8);
slot->ocr |= SPI_SEND(spi, 0xff) & 0xff;
fvdbg("CMD%d[%08x] R1=%02x OCR=%08x\n",
finfo("CMD%d[%08x] R1=%02x OCR=%08x\n",
cmd->cmd & 0x3f, arg, response, slot->ocr);
}
break;
@@ -585,7 +585,7 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot,
slot->r7 |= ((uint32_t)(SPI_SEND(spi, 0xff) & 0xff) << 8);
slot->r7 |= SPI_SEND(spi, 0xff) & 0xff;
fvdbg("CMD%d[%08x] R1=%02x R7=%08x\n",
finfo("CMD%d[%08x] R1=%02x R7=%08x\n",
cmd->cmd & 0x3f, arg, response, slot->r7);
}
break;
@@ -609,7 +609,7 @@ static void mmcsd_setblklen(FAR struct mmcsd_slot_s *slot, uint32_t length)
{
uint32_t response;
fvdbg("Set block length to %d\n", length);
finfo("Set block length to %d\n", length);
response = mmcsd_sendcmd(slot, &g_cmd16, length);
if (response != MMCSD_SPIR1_OK)
{
@@ -750,11 +750,11 @@ static void mmcsd_decodecsd(FAR struct mmcsd_slot_s *slot, uint8_t *csd)
slot->twrite = SD_WRITEACCESS;
}
fvdbg("SPI Frequency\n");
fvdbg(" Maximum: %d Hz\n", maxfrequency);
fvdbg(" Actual: %d Hz\n", frequency);
fvdbg("Read access time: %d ticks\n", slot->taccess);
fvdbg("Write access time: %d ticks\n", slot->twrite);
finfo("SPI Frequency\n");
finfo(" Maximum: %d Hz\n", maxfrequency);
finfo(" Actual: %d Hz\n", frequency);
finfo("Read access time: %d ticks\n", slot->taccess);
finfo("Write access time: %d ticks\n", slot->twrite);
/* Get the physical geometry of the card: sector size and number of
* sectors. The card's total capacity is computed from
@@ -822,8 +822,8 @@ static void mmcsd_decodecsd(FAR struct mmcsd_slot_s *slot, uint8_t *csd)
slot->sectorsize = 1 << readbllen;
#endif
slot->nsectors = csize << csizemult;
fvdbg("Sector size: %d\n", SECTORSIZE(slot));
fvdbg("Number of sectors: %d\n", slot->nsectors);
finfo("Sector size: %d\n", SECTORSIZE(slot));
finfo("Number of sectors: %d\n", slot->nsectors);
}
/****************************************************************************
@@ -889,7 +889,7 @@ static int mmcsd_getcardinfo(FAR struct mmcsd_slot_s *slot, uint8_t *buffer,
for (i = 0; i < 8; i++)
{
response = SPI_SEND(spi, 0xff);
fvdbg("%d. SPI send returned %02x\n", i, response);
finfo("%d. SPI send returned %02x\n", i, response);
/* If a read operation fails and the card cannot provide the requested
* data, it will send a data error token instead. The 4 least
@@ -1029,7 +1029,7 @@ static int mmcsd_open(FAR struct inode *inode)
FAR struct spi_dev_s *spi;
int ret;
fvdbg("Entry\n");
finfo("Entry\n");
#ifdef CONFIG_DEBUG
if (!inode || !inode->i_private)
@@ -1067,7 +1067,7 @@ static int mmcsd_open(FAR struct inode *inode)
ret = mmcsd_mediainitialize(slot);
if (ret < 0)
{
fvdbg("Failed to initialize card\n");
finfo("Failed to initialize card\n");
goto errout_with_sem;
}
}
@@ -1093,7 +1093,7 @@ errout_with_sem:
static int mmcsd_close(FAR struct inode *inode)
{
fvdbg("Entry\n");
finfo("Entry\n");
return OK;
}
@@ -1114,7 +1114,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
uint8_t response;
int i;
fvdbg("start_sector=%d nsectors=%d\n", start_sector, nsectors);
finfo("start_sector=%d nsectors=%d\n", start_sector, nsectors);
#ifdef CONFIG_DEBUG
if (!buffer)
@@ -1166,12 +1166,12 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
if (IS_BLOCK(slot->type))
{
offset = start_sector;
fvdbg("nbytes=%d sector offset=%d\n", nbytes, offset);
finfo("nbytes=%d sector offset=%d\n", nbytes, offset);
}
else
{
offset = start_sector * SECTORSIZE(slot);
fvdbg("nbytes=%d byte offset=%d\n", nbytes, offset);
finfo("nbytes=%d byte offset=%d\n", nbytes, offset);
}
/* Select the slave */
@@ -1239,7 +1239,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
SPI_SEND(spi, 0xff);
mmcsd_semgive(slot);
fvdbg("Read %d bytes:\n", nbytes);
finfo("Read %d bytes:\n", nbytes);
mmcsd_dumpbuffer("Read buffer", buffer, nbytes);
return nsectors;
@@ -1268,7 +1268,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
uint8_t response;
int i;
fvdbg("start_sector=%d nsectors=%d\n", start_sector, nsectors);
finfo("start_sector=%d nsectors=%d\n", start_sector, nsectors);
#ifdef CONFIG_DEBUG
if (!buffer)
@@ -1328,12 +1328,12 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
if (IS_BLOCK(slot->type))
{
offset = start_sector;
fvdbg("nbytes=%d sector offset=%d\n", nbytes, offset);
finfo("nbytes=%d sector offset=%d\n", nbytes, offset);
}
else
{
offset = start_sector * SECTORSIZE(slot);
fvdbg("nbytes=%d byte offset=%d\n", nbytes, offset);
finfo("nbytes=%d byte offset=%d\n", nbytes, offset);
}
mmcsd_dumpbuffer("Write buffer", buffer, nbytes);
@@ -1519,11 +1519,11 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
slot->state &= ~MMCSD_SLOTSTATUS_MEDIACHGD;
mmcsd_semgive(slot);
fvdbg("geo_available: %d\n", geometry->geo_available);
fvdbg("geo_mediachanged: %d\n", geometry->geo_mediachanged);
fvdbg("geo_writeenabled: %d\n", geometry->geo_writeenabled);
fvdbg("geo_nsectors: %d\n", geometry->geo_nsectors);
fvdbg("geo_sectorsize: %d\n", geometry->geo_sectorsize);
finfo("geo_available: %d\n", geometry->geo_available);
finfo("geo_mediachanged: %d\n", geometry->geo_mediachanged);
finfo("geo_writeenabled: %d\n", geometry->geo_writeenabled);
finfo("geo_nsectors: %d\n", geometry->geo_nsectors);
finfo("geo_sectorsize: %d\n", geometry->geo_sectorsize);
return OK;
}
@@ -1601,14 +1601,14 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
* show IDLE STATE
*/
fvdbg("Send CMD0\n");
finfo("Send CMD0\n");
SPI_SELECT(spi, SPIDEV_MMCSD, true);
result = mmcsd_sendcmd(slot, &g_cmd0, 0);
if (result == MMCSD_SPIR1_IDLESTATE)
{
/* Break out of the loop with card selected */
fvdbg("Card is in IDLE state\n");
finfo("Card is in IDLE state\n");
break;
}
@@ -1633,7 +1633,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
* MMC.
*/
fvdbg("Send CMD8\n");
finfo("Send CMD8\n");
result = mmcsd_sendcmd(slot, &g_cmd8, 0x1aa);
if (result == MMCSD_SPIR1_IDLESTATE)
{
@@ -1650,7 +1650,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
elapsed = 0;
do
{
fvdbg("%d. Send CMD55/ACMD41\n", elapsed);
finfo("%d. Send CMD55/ACMD41\n", elapsed);
result = mmcsd_sendcmd(slot, &g_cmd55, 0);
if (result == MMCSD_SPIR1_IDLESTATE || result == MMCSD_SPIR1_OK)
{
@@ -1669,13 +1669,13 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
if (elapsed < MMCSD_DELAY_1SEC)
{
fvdbg("Send CMD58\n");
finfo("Send CMD58\n");
SPI_SEND(spi, 0xff);
result = mmcsd_sendcmd(slot, &g_cmd58, 0);
if (result == MMCSD_SPIR1_OK)
{
fvdbg("OCR: %08x\n", slot->ocr);
finfo("OCR: %08x\n", slot->ocr);
if ((slot->ocr & MMCSD_OCR_CCS) != 0)
{
fdbg("Identified SD ver2 card/with block access\n");
@@ -1697,7 +1697,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
{
/* Both the MMC card and the SD card support CMD55 */
fvdbg("Send CMD55/ACMD41\n");
finfo("Send CMD55/ACMD41\n");
result = mmcsd_sendcmd(slot, &g_cmd55, 0);
if (result == MMCSD_SPIR1_IDLESTATE || result == MMCSD_SPIR1_OK)
{
@@ -1719,7 +1719,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
{
if (IS_SD(slot->type))
{
fvdbg("%d. Send CMD55/ACMD41\n", elapsed);
finfo("%d. Send CMD55/ACMD41\n", elapsed);
result = mmcsd_sendcmd(slot, &g_cmd55, 0);
if (result == MMCSD_SPIR1_IDLESTATE || result == MMCSD_SPIR1_OK)
{
@@ -1732,7 +1732,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
}
else
{
fvdbg("%d. Send CMD1\n", i);
finfo("%d. Send CMD1\n", i);
result = mmcsd_sendcmd(slot, &g_cmd1, 0);
if (result == MMCSD_SPIR1_OK)
{
@@ -1765,7 +1765,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
/* Read CSD. CSD must always be valid */
fvdbg("Get CSD\n");
finfo("Get CSD\n");
result = mmcsd_getcsd(slot, csd);
if (result != OK)
{
@@ -1879,7 +1879,7 @@ static void mmcsd_mediachanged(void *arg)
ret = mmcsd_mediainitialize(slot);
if (ret == 0)
{
fvdbg("mmcsd_mediainitialize returned OK\n");
finfo("mmcsd_mediainitialize returned OK\n");
slot->state |= MMCSD_SLOTSTATUS_MEDIACHGD;
}
}
@@ -1954,7 +1954,7 @@ int mmcsd_spislotinitialize(int minor, int slotno, FAR struct spi_dev_s *spi)
mmcsd_semgive(slot);
if (ret == 0)
{
fvdbg("mmcsd_mediainitialize returned OK\n");
finfo("mmcsd_mediainitialize returned OK\n");
slot->state |= MMCSD_SLOTSTATUS_MEDIACHGD;
}