diff --git a/arch/arm/src/lpc17xx/lpc17_sdcard.c b/arch/arm/src/lpc17xx/lpc17_sdcard.c index 532c8ed35d9..b4b555f5ded 100644 --- a/arch/arm/src/lpc17xx/lpc17_sdcard.c +++ b/arch/arm/src/lpc17xx/lpc17_sdcard.c @@ -2086,6 +2086,7 @@ static int lpc17_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlo rlong[2] = getreg32(LPC17_SDCARD_RESP2); rlong[3] = getreg32(LPC17_SDCARD_RESP3); } + return ret; } diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c index 9d93a432c03..f4b6b6ce877 100644 --- a/arch/arm/src/stm32/stm32_sdio.c +++ b/arch/arm/src/stm32/stm32_sdio.c @@ -2209,6 +2209,7 @@ static int stm32_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlo rlong[2] = getreg32(STM32_SDIO_RESP3); rlong[3] = getreg32(STM32_SDIO_RESP4); } + return ret; } diff --git a/drivers/mmcsd/mmcsd_sdio.c b/drivers/mmcsd/mmcsd_sdio.c index ae4bb7a0d15..9c93cefd4ba 100644 --- a/drivers/mmcsd/mmcsd_sdio.c +++ b/drivers/mmcsd/mmcsd_sdio.c @@ -100,20 +100,6 @@ #define IS_EMPTY(priv) (priv->type == MMCSD_CARDTYPE_UNKNOWN) -/* Handle endian-ness */ - -#ifdef CONFIG_ENDIAN_BIG -# define NDXA 3 /* Bits n through n+7 */ -# define NDXB 2 /* Bits n+8 through n+15 */ -# define NDXC 1 /* Bits n+16 through n+23 */ -# define NDXD 0 /* Bits n+24 through n+31 */ -#else -# define NDXA 0 /* Bits n through n+7 */ -# define NDXB 1 /* Bits n+8 through n+15 */ -# define NDXC 2 /* Bits n+16 through n+23 */ -# define NDXD 3 /* Bits n+24 through n+31 */ -#endif - /**************************************************************************** * Private Types ****************************************************************************/ @@ -594,13 +580,13 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4]) #ifdef CONFIG_DEBUG_FS_INFO memset(&decoded, 0, sizeof(struct mmcsd_csd_s)); - decoded.csdstructure = csd[NDXD] >> 30; - decoded.mmcspecvers = (csd[NDXD] >> 26) & 0x0f; - decoded.taac.timevalue = (csd[NDXD] >> 19) & 0x0f; - decoded.taac.timeunit = (csd[NDXD] >> 16) & 7; - decoded.nsac = (csd[NDXD] >> 8) & 0xff; - decoded.transpeed.timevalue = (csd[NDXD] >> 3) & 0x0f; - decoded.transpeed.transferrateunit = csd[NDXD] & 7; + decoded.csdstructure = csd[0] >> 30; + decoded.mmcspecvers = (csd[0] >> 26) & 0x0f; + decoded.taac.timevalue = (csd[0] >> 19) & 0x0f; + decoded.taac.timeunit = (csd[0] >> 16) & 7; + decoded.nsac = (csd[0] >> 8) & 0xff; + decoded.transpeed.timevalue = (csd[0] >> 3) & 0x0f; + decoded.transpeed.transferrateunit = csd[0] & 7; #endif /* Word 2: Bits 64:95 @@ -617,15 +603,15 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4]) * C_SIZE 48:69 Device size */ - priv->dsrimp = (csd[NDXC] >> 12) & 1; - readbllen = (csd[NDXC] >> 16) & 0x0f; + priv->dsrimp = (csd[1] >> 12) & 1; + readbllen = (csd[1] >> 16) & 0x0f; #ifdef CONFIG_DEBUG_FS_INFO - decoded.ccc = (csd[NDXC] >> 20) & 0x0fff; - decoded.readbllen = (csd[NDXC] >> 16) & 0x0f; - decoded.readblpartial = (csd[NDXC] >> 15) & 1; - decoded.writeblkmisalign = (csd[NDXC] >> 14) & 1; - decoded.readblkmisalign = (csd[NDXC] >> 13) & 1; + decoded.ccc = (csd[1] >> 20) & 0x0fff; + decoded.readbllen = (csd[1] >> 16) & 0x0f; + decoded.readblpartial = (csd[1] >> 15) & 1; + decoded.writeblkmisalign = (csd[1] >> 14) & 1; + decoded.readblkmisalign = (csd[1] >> 13) & 1; decoded.dsrimp = priv->dsrimp; #endif @@ -671,7 +657,7 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4]) * 512*1024 = (1 << 19) */ - uint32_t csize = ((csd[NDXC] & 0x3f) << 16) | (csd[NDXB] >> 16); + uint32_t csize = ((csd[1] & 0x3f) << 16) | (csd[2] >> 16); #ifdef CONFIG_HAVE_LONG_LONG priv->capacity = ((uint64_t)(csize + 1)) << 19; #else @@ -683,9 +669,9 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4]) #ifdef CONFIG_DEBUG_FS_INFO decoded.u.sdblock.csize = csize; - decoded.u.sdblock.sderblen = (csd[NDXB] >> 14) & 1; - decoded.u.sdblock.sdsectorsize = (csd[NDXB] >> 7) & 0x7f; - decoded.u.sdblock.sdwpgrpsize = csd[NDXB] & 0x7f; + decoded.u.sdblock.sderblen = (csd[2] >> 14) & 1; + decoded.u.sdblock.sdsectorsize = (csd[2] >> 7) & 0x7f; + decoded.u.sdblock.sdwpgrpsize = csd[2] & 0x7f; #endif } else @@ -695,8 +681,8 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4]) * C_SIZE: 73:64 from Word 2 and 63:62 from Word 3 */ - uint16_t csize = ((csd[NDXC] & 0x03ff) << 2) | ((csd[NDXB] >> 30) & 3); - uint8_t csizemult = (csd[NDXB] >> 15) & 7; + uint16_t csize = ((csd[1] & 0x03ff) << 2) | ((csd[2] >> 30) & 3); + uint8_t csizemult = (csd[2] >> 15) & 7; priv->nblocks = ((uint32_t)csize + 1) * (1 << (csizemult + 2)); priv->blockshift = readbllen; @@ -721,27 +707,27 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4]) if (IS_SD(priv->type)) { decoded.u.sdbyte.csize = csize; - decoded.u.sdbyte.vddrcurrmin = (csd[NDXB] >> 27) & 7; - decoded.u.sdbyte.vddrcurrmax = (csd[NDXB] >> 24) & 7; - decoded.u.sdbyte.vddwcurrmin = (csd[NDXB] >> 21) & 7; - decoded.u.sdbyte.vddwcurrmax = (csd[NDXB] >> 18) & 7; + decoded.u.sdbyte.vddrcurrmin = (csd[2] >> 27) & 7; + decoded.u.sdbyte.vddrcurrmax = (csd[2] >> 24) & 7; + decoded.u.sdbyte.vddwcurrmin = (csd[2] >> 21) & 7; + decoded.u.sdbyte.vddwcurrmax = (csd[2] >> 18) & 7; decoded.u.sdbyte.csizemult = csizemult; - decoded.u.sdbyte.sderblen = (csd[NDXB] >> 14) & 1; - decoded.u.sdbyte.sdsectorsize = (csd[NDXB] >> 7) & 0x7f; - decoded.u.sdbyte.sdwpgrpsize = csd[NDXB] & 0x7f; + decoded.u.sdbyte.sderblen = (csd[2] >> 14) & 1; + decoded.u.sdbyte.sdsectorsize = (csd[2] >> 7) & 0x7f; + decoded.u.sdbyte.sdwpgrpsize = csd[2] & 0x7f; } #ifdef CONFIG_MMCSD_MMCSUPPORT else if (IS_MMC(priv->type)) { decoded.u.mmc.csize = csize; - decoded.u.mmc.vddrcurrmin = (csd[NDXB] >> 27) & 7; - decoded.u.mmc.vddrcurrmax = (csd[NDXB] >> 24) & 7; - decoded.u.mmc.vddwcurrmin = (csd[NDXB] >> 21) & 7; - decoded.u.mmc.vddwcurrmax = (csd[NDXB] >> 18) & 7; + decoded.u.mmc.vddrcurrmin = (csd[2] >> 27) & 7; + decoded.u.mmc.vddrcurrmax = (csd[2] >> 24) & 7; + decoded.u.mmc.vddwcurrmin = (csd[2] >> 21) & 7; + decoded.u.mmc.vddwcurrmax = (csd[2] >> 18) & 7; decoded.u.mmc.csizemult = csizemult; - decoded.u.mmc.er.mmc22.sectorsize = (csd[NDXB] >> 10) & 0x1f; - decoded.u.mmc.er.mmc22.ergrpsize = (csd[NDXB] >> 5) & 0x1f; - decoded.u.mmc.mmcwpgrpsize = csd[NDXB] & 0x1f; + decoded.u.mmc.er.mmc22.sectorsize = (csd[2] >> 10) & 0x1f; + decoded.u.mmc.er.mmc22.ergrpsize = (csd[2] >> 5) & 0x1f; + decoded.u.mmc.mmcwpgrpsize = csd[2] & 0x1f; } #endif #endif @@ -763,23 +749,23 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4]) * Not used 0:0 */ - permwriteprotect = (csd[NDXA] >> 13) & 1; - tmpwriteprotect = (csd[NDXA] >> 12) & 1; + permwriteprotect = (csd[3] >> 13) & 1; + tmpwriteprotect = (csd[3] >> 12) & 1; priv->wrprotect = (permwriteprotect || tmpwriteprotect); #ifdef CONFIG_DEBUG_FS_INFO - decoded.wpgrpen = csd[NDXA] >> 31; - decoded.mmcdfltecc = (csd[NDXA] >> 29) & 3; - decoded.r2wfactor = (csd[NDXA] >> 26) & 7; - decoded.writebllen = (csd[NDXA] >> 22) & 0x0f; - decoded.writeblpartial = (csd[NDXA] >> 21) & 1; - decoded.fileformatgrp = (csd[NDXA] >> 15) & 1; - decoded.copy = (csd[NDXA] >> 14) & 1; + decoded.wpgrpen = csd[3] >> 31; + decoded.mmcdfltecc = (csd[3] >> 29) & 3; + decoded.r2wfactor = (csd[3] >> 26) & 7; + decoded.writebllen = (csd[3] >> 22) & 0x0f; + decoded.writeblpartial = (csd[3] >> 21) & 1; + decoded.fileformatgrp = (csd[3] >> 15) & 1; + decoded.copy = (csd[3] >> 14) & 1; decoded.permwriteprotect = permwriteprotect; decoded.tmpwriteprotect = tmpwriteprotect; - decoded.fileformat = (csd[NDXA] >> 10) & 3; - decoded.mmcecc = (csd[NDXA] >> 8) & 3; - decoded.crc = (csd[NDXA] >> 1) & 0x7f; + decoded.fileformat = (csd[3] >> 10) & 3; + decoded.mmcecc = (csd[3] >> 8) & 3; + decoded.crc = (csd[3] >> 1) & 0x7f; finfo("CSD:\n"); finfo(" CSD_STRUCTURE: %d SPEC_VERS: %d (MMC)\n", @@ -870,9 +856,9 @@ static void mmcsd_decodeCID(FAR struct mmcsd_state_s *priv, uint32_t cid[4]) * pnm[0] 103:96 */ - decoded.mid = cid[NDXD] >> 24; - decoded.oid = (cid[NDXD] >> 8) & 0xffff; - decoded.pnm[0] = cid[NDXD] & 0xff; + decoded.mid = cid[0] >> 24; + decoded.oid = (cid[0] >> 8) & 0xffff; + decoded.pnm[0] = cid[0] & 0xff; /* Word 2: Bits 64:95 * pnm - 103-64 40-bit Product Name (ascii) + null terminator @@ -882,10 +868,10 @@ static void mmcsd_decodeCID(FAR struct mmcsd_state_s *priv, uint32_t cid[4]) * pnm[4] 71:64 */ - decoded.pnm[1] = cid[NDXC] >> 24; - decoded.pnm[2] = (cid[NDXC] >> 16) & 0xff; - decoded.pnm[3] = (cid[NDXC] >> 8) & 0xff; - decoded.pnm[4] = cid[NDXC] & 0xff; + decoded.pnm[1] = cid[1] >> 24; + decoded.pnm[2] = (cid[1] >> 16) & 0xff; + decoded.pnm[3] = (cid[1] >> 8) & 0xff; + decoded.pnm[4] = cid[1] & 0xff; decoded.pnm[5] = '\0'; /* Word 3: Bits 32-63 @@ -893,8 +879,8 @@ static void mmcsd_decodeCID(FAR struct mmcsd_state_s *priv, uint32_t cid[4]) * psn - 55-24 32-bit Product serial number */ - decoded.prv = cid[NDXB] >> 24; - decoded.psn = cid[NDXB] << 8; + decoded.prv = cid[2] >> 24; + decoded.psn = cid[2] << 8; /* Word 4: Bits 0-31 * psn - 55-24 32-bit Product serial number @@ -903,9 +889,9 @@ static void mmcsd_decodeCID(FAR struct mmcsd_state_s *priv, uint32_t cid[4]) * crc - 7:1 7-bit CRC7 */ - decoded.psn |= cid[NDXA] >> 24; - decoded.mdt = (cid[NDXA] >> 8) & 0x0fff; - decoded.crc = (cid[NDXA] >> 1) & 0x7f; + decoded.psn |= cid[3] >> 24; + decoded.mdt = (cid[3] >> 8) & 0x0fff; + decoded.crc = (cid[3] >> 1) & 0x7f; finfo("mid: %02x oid: %04x pnm: %s prv: %d psn: %lu mdt: %02x crc: %02x\n", decoded.mid, decoded.oid, decoded.pnm, decoded.prv, @@ -938,26 +924,26 @@ struct mmcsd_scr_s decoded; */ #ifdef CONFIG_ENDIAN_BIG /* Card transfers SCR in big-endian order */ - priv->buswidth = (scr[NDXA] >> 16) & 15; + priv->buswidth = (scr[0] >> 16) & 15; #else - priv->buswidth = (scr[NDXA] >> 8) & 15; + priv->buswidth = (scr[0] >> 8) & 15; #endif #ifdef CONFIG_DEBUG_FS_INFO #ifdef CONFIG_ENDIAN_BIG /* Card SCR is big-endian order / CPU also big-endian * 60 56 52 48 44 40 36 32 * VVVV SSSS ESSS BBBB RRRR RRRR RRRR RRRR */ - decoded.scrversion = scr[NDXA] >> 28; - decoded.sdversion = (scr[NDXA] >> 24) & 15; - decoded.erasestate = (scr[NDXA] >> 23) & 1; - decoded.security = (scr[NDXA] >> 20) & 7; + decoded.scrversion = scr[0] >> 28; + decoded.sdversion = (scr[0] >> 24) & 15; + decoded.erasestate = (scr[0] >> 23) & 1; + decoded.security = (scr[0] >> 20) & 7; #else /* Card SCR is big-endian order / CPU is little-endian * 36 32 44 40 52 48 60 56 * RRRR RRRR RRRR RRRR ESSS BBBB VVVV SSSS */ - decoded.scrversion = (scr[NDXA] >> 4) & 15; - decoded.sdversion = scr[NDXA] & 15; - decoded.erasestate = (scr[NDXA] >> 15) & 1; - decoded.security = (scr[NDXA] >> 12) & 7; + decoded.scrversion = (scr[0] >> 4) & 15; + decoded.sdversion = scr[0] & 15; + decoded.erasestate = (scr[0] >> 15) & 1; + decoded.security = (scr[0] >> 12) & 7; #endif decoded.buswidth = priv->buswidth; #endif @@ -967,7 +953,7 @@ struct mmcsd_scr_s decoded; */ #ifdef CONFIG_DEBUG_FS_INFO - decoded.mfgdata = scr[NDXB]; /* Might be byte reversed! */ + decoded.mfgdata = scr[1]; /* Might be byte reversed! */ finfo("SCR:\n"); finfo(" SCR_STRUCTURE: %d SD_VERSION: %d\n",