You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/04/04 16:13:56 UTC
[incubator-nuttx] 01/02: SDIO: Make interface field names conform
to standard.
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch pr720
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit bf20a675c59e329180e6341ae9447944cf95f89d
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Fri Apr 3 20:02:25 2020 -0600
SDIO: Make interface field names conform to standard.
The SDIO interface structure includes fields with names like recvR1 and others. These cause "Mixed case identifier" errors from nxstyle in all places they are uses.
This change performs a mass substition of recvR with recv_r to correct this coding standard violation.
---
Documentation/NuttxPortingGuide.html | 16 +++++++--------
arch/arm/src/cxd56xx/cxd56_sdhci.c | 16 +++++++--------
arch/arm/src/imxrt/imxrt_usdhc.c | 30 ++++++++++++++---------------
arch/arm/src/kinetis/kinetis_sdhc.c | 16 +++++++--------
arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c | 16 +++++++--------
arch/arm/src/lpc43xx/lpc43_sdmmc.c | 16 +++++++--------
arch/arm/src/lpc54xx/lpc54_sdmmc.c | 16 +++++++--------
arch/arm/src/sam34/sam_hsmci.c | 16 +++++++--------
arch/arm/src/sama5/sam_hsmci.c | 16 +++++++--------
arch/arm/src/samv7/sam_hsmci.c | 16 +++++++--------
arch/arm/src/stm32/stm32_sdio.c | 16 +++++++--------
arch/arm/src/stm32f7/stm32_sdmmc.c | 30 ++++++++++++++---------------
arch/arm/src/stm32h7/stm32_sdmmc.c | 30 ++++++++++++++---------------
arch/arm/src/stm32l4/stm32l4_sdmmc.c | 30 ++++++++++++++---------------
drivers/mmcsd/mmcsd_sdio.c | 2 +-
include/nuttx/sdio.h | 28 +++++++++++++--------------
16 files changed, 155 insertions(+), 155 deletions(-)
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 7282af8..a015584 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -240,7 +240,7 @@
<h1><big><font color="#3c34ec">
<i>NuttX RTOS Porting Guide</i>
</font></big></h1>
- <p>Last Updated: August 8, 2019</p>
+ <p>Last Updated: April 2, 2020</p>
</td>
</tr>
</table>
@@ -6220,13 +6220,13 @@ int kbd_decode(FAR struct lib_instream_s *stream, FAR struct kbd_getstate_s *sta
<code>int (*sendsetup)(FAR struct sdio_dev_s *dev, FAR const uint8_t *buffer, size_t nbytes);</code><br>
<code>int (*cancel)(FAR struct sdio_dev_s *dev);</code><br>
<code>int (*waitresponse)(FAR struct sdio_dev_s *dev, uint32_t cmd);</code><br>
- <code>int (*recvR1)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R1);</code><br>
- <code>int (*recvR2)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t R2[4]);</code><br>
- <code>int (*recvR3)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R3);</code><br>
- <code>int (*recvR4)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R4);</code><br>
- <code>int (*recvR5)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R5);</code><br>
- <code>int (*recvR6)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R6);</code><br>
- <code>int (*recvR7)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R7);</code></p>
+ <code>int (*recv_r1)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R1);</code><br>
+ <code>int (*recv_r2)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t R2[4]);</code><br>
+ <code>int (*recv_r3)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R3);</code><br>
+ <code>int (*recv_r4)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R4);</code><br>
+ <code>int (*recv_r5)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R5);</code><br>
+ <code>int (*recv_r6)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R6);</code><br>
+ <code>int (*recv_r7)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R7);</code></p>
</ul>
<p>
Event/Callback support:
diff --git a/arch/arm/src/cxd56xx/cxd56_sdhci.c b/arch/arm/src/cxd56xx/cxd56_sdhci.c
index 4b4e625..c92d36a 100644
--- a/arch/arm/src/cxd56xx/cxd56_sdhci.c
+++ b/arch/arm/src/cxd56xx/cxd56_sdhci.c
@@ -501,13 +501,13 @@ struct cxd56_sdiodev_s g_sdhcdev =
.sendsetup = cxd56_sdio_sendsetup,
.cancel = cxd56_sdio_cancel,
.waitresponse = cxd56_sdio_waitresponse,
- .recvR1 = cxd56_sdio_recvshortcrc,
- .recvR2 = cxd56_sdio_recvlong,
- .recvR3 = cxd56_sdio_recvshort,
- .recvR4 = cxd56_sdio_recvshort,
- .recvR5 = cxd56_sdio_recvshort,
- .recvR6 = cxd56_sdio_recvshortcrc,
- .recvR7 = cxd56_sdio_recvshort,
+ .recv_r1 = cxd56_sdio_recvshortcrc,
+ .recv_r2 = cxd56_sdio_recvlong,
+ .recv_r3 = cxd56_sdio_recvshort,
+ .recv_r4 = cxd56_sdio_recvshort,
+ .recv_r5 = cxd56_sdio_recvshort,
+ .recv_r6 = cxd56_sdio_recvshortcrc,
+ .recv_r7 = cxd56_sdio_recvshort,
.waitenable = cxd56_sdio_waitenable,
.eventwait = cxd56_sdio_eventwait,
.callbackenable = cxd56_sdio_callbackenable,
@@ -2280,7 +2280,7 @@ static int cxd56_sdio_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
}
/****************************************************************************
- * Name: cxd56_sdio_recvRx
+ * Name: cxd56_sdio_recv*
*
* Description:
* Receive response to SDIO command. Only the critical payload is
diff --git a/arch/arm/src/imxrt/imxrt_usdhc.c b/arch/arm/src/imxrt/imxrt_usdhc.c
index b703929..9201a3b 100644
--- a/arch/arm/src/imxrt/imxrt_usdhc.c
+++ b/arch/arm/src/imxrt/imxrt_usdhc.c
@@ -406,13 +406,13 @@ struct imxrt_dev_s g_sdhcdev[IMXRT_MAX_SDHC_DEV_SLOTS] =
#endif
.cancel = imxrt_cancel,
.waitresponse = imxrt_waitresponse,
- .recvR1 = imxrt_recvshortcrc,
- .recvR2 = imxrt_recvlong,
- .recvR3 = imxrt_recvshort,
- .recvR4 = imxrt_recvshort,
- .recvR5 = imxrt_recvshortcrc,
- .recvR6 = imxrt_recvshortcrc,
- .recvR7 = imxrt_recvshort,
+ .recv_r1 = imxrt_recvshortcrc,
+ .recv_r2 = imxrt_recvlong,
+ .recv_r3 = imxrt_recvshort,
+ .recv_r4 = imxrt_recvshort,
+ .recv_r5 = imxrt_recvshortcrc,
+ .recv_r6 = imxrt_recvshortcrc,
+ .recv_r7 = imxrt_recvshort,
.waitenable = imxrt_waitenable,
.eventwait = imxrt_eventwait,
.callbackenable = imxrt_callbackenable,
@@ -464,13 +464,13 @@ struct imxrt_dev_s g_sdhcdev[IMXRT_MAX_SDHC_DEV_SLOTS] =
#endif
.cancel = imxrt_cancel,
.waitresponse = imxrt_waitresponse,
- .recvR1 = imxrt_recvshortcrc,
- .recvR2 = imxrt_recvlong,
- .recvR3 = imxrt_recvshort,
- .recvR4 = imxrt_recvshort,
- .recvR5 = imxrt_recvshortcrc,
- .recvR6 = imxrt_recvshortcrc,
- .recvR7 = imxrt_recvshort,
+ .recv_r1 = imxrt_recvshortcrc,
+ .recv_r2 = imxrt_recvlong,
+ .recv_r3 = imxrt_recvshort,
+ .recv_r4 = imxrt_recvshort,
+ .recv_r5 = imxrt_recvshortcrc,
+ .recv_r6 = imxrt_recvshortcrc,
+ .recv_r7 = imxrt_recvshort,
.waitenable = imxrt_waitenable,
.eventwait = imxrt_eventwait,
.callbackenable = imxrt_callbackenable,
@@ -2372,7 +2372,7 @@ static int imxrt_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
}
/****************************************************************************
- * Name: imxrt_recvRx
+ * Name: imxrt_recv*
*
* Description:
* Receive response to SDIO command. Only the critical payload is
diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c
index 58d912b..47885ca 100644
--- a/arch/arm/src/kinetis/kinetis_sdhc.c
+++ b/arch/arm/src/kinetis/kinetis_sdhc.c
@@ -374,13 +374,13 @@ struct kinetis_dev_s g_sdhcdev =
#endif
.cancel = kinetis_cancel,
.waitresponse = kinetis_waitresponse,
- .recvR1 = kinetis_recvshortcrc,
- .recvR2 = kinetis_recvlong,
- .recvR3 = kinetis_recvshort,
- .recvR4 = kinetis_recvnotimpl,
- .recvR5 = kinetis_recvnotimpl,
- .recvR6 = kinetis_recvshortcrc,
- .recvR7 = kinetis_recvshort,
+ .recv_r1 = kinetis_recvshortcrc,
+ .recv_r2 = kinetis_recvlong,
+ .recv_r3 = kinetis_recvshort,
+ .recv_r4 = kinetis_recvnotimpl,
+ .recv_r5 = kinetis_recvnotimpl,
+ .recv_r6 = kinetis_recvshortcrc,
+ .recv_r7 = kinetis_recvshort,
.waitenable = kinetis_waitenable,
.eventwait = kinetis_eventwait,
.callbackenable = kinetis_callbackenable,
@@ -2140,7 +2140,7 @@ static int kinetis_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
}
/****************************************************************************
- * Name: kinetis_recvRx
+ * Name: kinetis_recv*
*
* Description:
* Receive response to SDIO command. Only the critical payload is
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c
index 6f352c4..f5754b0 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c
@@ -440,13 +440,13 @@ struct lpc17_40_dev_s g_scard_dev =
.sendsetup = lpc17_40_sendsetup,
.cancel = lpc17_40_cancel,
.waitresponse = lpc17_40_waitresponse,
- .recvR1 = lpc17_40_recvshortcrc,
- .recvR2 = lpc17_40_recvlong,
- .recvR3 = lpc17_40_recvshort,
- .recvR4 = lpc17_40_recvnotimpl,
- .recvR5 = lpc17_40_recvnotimpl,
- .recvR6 = lpc17_40_recvshortcrc,
- .recvR7 = lpc17_40_recvshort,
+ .recv_r1 = lpc17_40_recvshortcrc,
+ .recv_r2 = lpc17_40_recvlong,
+ .recv_r3 = lpc17_40_recvshort,
+ .recv_r4 = lpc17_40_recvnotimpl,
+ .recv_r5 = lpc17_40_recvnotimpl,
+ .recv_r6 = lpc17_40_recvshortcrc,
+ .recv_r7 = lpc17_40_recvshort,
.waitenable = lpc17_40_waitenable,
.eventwait = lpc17_40_eventwait,
.callbackenable = lpc17_40_callbackenable,
@@ -1998,7 +1998,7 @@ static int lpc17_40_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
}
/****************************************************************************
- * Name: lpc17_40_recvRx
+ * Name: lpc17_40_recv*
*
* Description:
* Receive response to SD card command. Only the critical payload is
diff --git a/arch/arm/src/lpc43xx/lpc43_sdmmc.c b/arch/arm/src/lpc43xx/lpc43_sdmmc.c
index f961335..10f8a30 100644
--- a/arch/arm/src/lpc43xx/lpc43_sdmmc.c
+++ b/arch/arm/src/lpc43xx/lpc43_sdmmc.c
@@ -381,13 +381,13 @@ struct lpc43_dev_s g_scard_dev =
.sendsetup = lpc43_sendsetup,
.cancel = lpc43_cancel,
.waitresponse = lpc43_waitresponse,
- .recvR1 = lpc43_recvshortcrc,
- .recvR2 = lpc43_recvlong,
- .recvR3 = lpc43_recvshort,
- .recvR4 = lpc43_recvnotimpl,
- .recvR5 = lpc43_recvnotimpl,
- .recvR6 = lpc43_recvshortcrc,
- .recvR7 = lpc43_recvshort,
+ .recv_r1 = lpc43_recvshortcrc,
+ .recv_r2 = lpc43_recvlong,
+ .recv_r3 = lpc43_recvshort,
+ .recv_r4 = lpc43_recvnotimpl,
+ .recv_r5 = lpc43_recvnotimpl,
+ .recv_r6 = lpc43_recvshortcrc,
+ .recv_r7 = lpc43_recvshort,
.waitenable = lpc43_waitenable,
.eventwait = lpc43_eventwait,
.callbackenable = lpc43_callbackenable,
@@ -1938,7 +1938,7 @@ static int lpc43_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
}
/****************************************************************************
- * Name: lpc43_recvRx
+ * Name: lpc43_recv*
*
* Description:
* Receive response to SD card command. Only the critical payload is
diff --git a/arch/arm/src/lpc54xx/lpc54_sdmmc.c b/arch/arm/src/lpc54xx/lpc54_sdmmc.c
index bae4b8d..86fdd9d 100644
--- a/arch/arm/src/lpc54xx/lpc54_sdmmc.c
+++ b/arch/arm/src/lpc54xx/lpc54_sdmmc.c
@@ -385,13 +385,13 @@ struct lpc54_dev_s g_scard_dev =
.sendsetup = lpc54_sendsetup,
.cancel = lpc54_cancel,
.waitresponse = lpc54_waitresponse,
- .recvR1 = lpc54_recvshortcrc,
- .recvR2 = lpc54_recvlong,
- .recvR3 = lpc54_recvshort,
- .recvR4 = lpc54_recvnotimpl,
- .recvR5 = lpc54_recvnotimpl,
- .recvR6 = lpc54_recvshortcrc,
- .recvR7 = lpc54_recvshort,
+ .recv_r1 = lpc54_recvshortcrc,
+ .recv_r2 = lpc54_recvlong,
+ .recv_r3 = lpc54_recvshort,
+ .recv_r4 = lpc54_recvnotimpl,
+ .recv_r5 = lpc54_recvnotimpl,
+ .recv_r6 = lpc54_recvshortcrc,
+ .recv_r7 = lpc54_recvshort,
.waitenable = lpc54_waitenable,
.eventwait = lpc54_eventwait,
.callbackenable = lpc54_callbackenable,
@@ -1938,7 +1938,7 @@ static int lpc54_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
}
/****************************************************************************
- * Name: lpc54_recvRx
+ * Name: lpc54_recv*
*
* Description:
* Receive response to SD card command. Only the critical payload is
diff --git a/arch/arm/src/sam34/sam_hsmci.c b/arch/arm/src/sam34/sam_hsmci.c
index f6f01c2..683b7d5 100644
--- a/arch/arm/src/sam34/sam_hsmci.c
+++ b/arch/arm/src/sam34/sam_hsmci.c
@@ -531,13 +531,13 @@ struct sam_dev_s g_sdiodev =
.sendsetup = sam_dmasendsetup,
.cancel = sam_cancel,
.waitresponse = sam_waitresponse,
- .recvR1 = sam_recvshort,
- .recvR2 = sam_recvlong,
- .recvR3 = sam_recvshort,
- .recvR4 = sam_recvnotimpl,
- .recvR5 = sam_recvnotimpl,
- .recvR6 = sam_recvshort,
- .recvR7 = sam_recvshort,
+ .recv_r1 = sam_recvshort,
+ .recv_r2 = sam_recvlong,
+ .recv_r3 = sam_recvshort,
+ .recv_r4 = sam_recvnotimpl,
+ .recv_r5 = sam_recvnotimpl,
+ .recv_r6 = sam_recvshort,
+ .recv_r7 = sam_recvshort,
.waitenable = sam_waitenable,
.eventwait = sam_eventwait,
.callbackenable = sam_callbackenable,
@@ -1985,7 +1985,7 @@ static int sam_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
}
/****************************************************************************
- * Name: sam_recvRx
+ * Name: sam_recv*
*
* Description:
* Receive response to SDIO command. Only the critical payload is
diff --git a/arch/arm/src/sama5/sam_hsmci.c b/arch/arm/src/sama5/sam_hsmci.c
index 2cb84ce..39659cc 100644
--- a/arch/arm/src/sama5/sam_hsmci.c
+++ b/arch/arm/src/sama5/sam_hsmci.c
@@ -616,13 +616,13 @@ static const struct sdio_dev_s g_callbacks =
.sendsetup = sam_sendsetup,
.cancel = sam_cancel,
.waitresponse = sam_waitresponse,
- .recvR1 = sam_recvshort,
- .recvR2 = sam_recvlong,
- .recvR3 = sam_recvshort,
- .recvR4 = sam_recvnotimpl,
- .recvR5 = sam_recvnotimpl,
- .recvR6 = sam_recvshort,
- .recvR7 = sam_recvshort,
+ .recv_r1 = sam_recvshort,
+ .recv_r2 = sam_recvlong,
+ .recv_r3 = sam_recvshort,
+ .recv_r4 = sam_recvnotimpl,
+ .recv_r5 = sam_recvnotimpl,
+ .recv_r6 = sam_recvshort,
+ .recv_r7 = sam_recvshort,
.waitenable = sam_waitenable,
.eventwait = sam_eventwait,
.callbackenable = sam_callbackenable,
@@ -2414,7 +2414,7 @@ static int sam_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
}
/****************************************************************************
- * Name: sam_recvRx
+ * Name: sam_recv*
*
* Description:
* Receive response to SDIO command. Only the critical payload is
diff --git a/arch/arm/src/samv7/sam_hsmci.c b/arch/arm/src/samv7/sam_hsmci.c
index f75ba5c..7ff6ac3 100644
--- a/arch/arm/src/samv7/sam_hsmci.c
+++ b/arch/arm/src/samv7/sam_hsmci.c
@@ -551,13 +551,13 @@ static const struct sdio_dev_s g_callbacks =
.sendsetup = sam_sendsetup,
.cancel = sam_cancel,
.waitresponse = sam_waitresponse,
- .recvR1 = sam_recvshort,
- .recvR2 = sam_recvlong,
- .recvR3 = sam_recvshort,
- .recvR4 = sam_recvnotimpl,
- .recvR5 = sam_recvnotimpl,
- .recvR6 = sam_recvshort,
- .recvR7 = sam_recvshort,
+ .recv_r1 = sam_recvshort,
+ .recv_r2 = sam_recvlong,
+ .recv_r3 = sam_recvshort,
+ .recv_r4 = sam_recvnotimpl,
+ .recv_r5 = sam_recvnotimpl,
+ .recv_r6 = sam_recvshort,
+ .recv_r7 = sam_recvshort,
.waitenable = sam_waitenable,
.eventwait = sam_eventwait,
.callbackenable = sam_callbackenable,
@@ -2456,7 +2456,7 @@ static int sam_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
}
/****************************************************************************
- * Name: sam_recvRx
+ * Name: sam_recv*
*
* Description:
* Receive response to SDIO command. Only the critical payload is
diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c
index 693b098..9e5bf45 100644
--- a/arch/arm/src/stm32/stm32_sdio.c
+++ b/arch/arm/src/stm32/stm32_sdio.c
@@ -538,13 +538,13 @@ struct stm32_dev_s g_sdiodev =
.sendsetup = stm32_sendsetup,
.cancel = stm32_cancel,
.waitresponse = stm32_waitresponse,
- .recvR1 = stm32_recvshortcrc,
- .recvR2 = stm32_recvlong,
- .recvR3 = stm32_recvshort,
- .recvR4 = stm32_recvshort,
- .recvR5 = stm32_recvshortcrc,
- .recvR6 = stm32_recvshortcrc,
- .recvR7 = stm32_recvshort,
+ .recv_r1 = stm32_recvshortcrc,
+ .recv_r2 = stm32_recvlong,
+ .recv_r3 = stm32_recvshort,
+ .recv_r4 = stm32_recvshort,
+ .recv_r5 = stm32_recvshortcrc,
+ .recv_r6 = stm32_recvshortcrc,
+ .recv_r7 = stm32_recvshort,
.waitenable = stm32_waitenable,
.eventwait = stm32_eventwait,
.callbackenable = stm32_callbackenable,
@@ -2213,7 +2213,7 @@ static int stm32_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
}
/****************************************************************************
- * Name: stm32_recvRx
+ * Name: stm32_recv*
*
* Description:
* Receive response to SDIO command. Only the critical payload is
diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.c b/arch/arm/src/stm32f7/stm32_sdmmc.c
index de4b83d..21f9dc4 100644
--- a/arch/arm/src/stm32f7/stm32_sdmmc.c
+++ b/arch/arm/src/stm32f7/stm32_sdmmc.c
@@ -617,13 +617,13 @@ struct stm32_dev_s g_sdmmcdev1 =
.sendsetup = stm32_sendsetup,
.cancel = stm32_cancel,
.waitresponse = stm32_waitresponse,
- .recvR1 = stm32_recvshortcrc,
- .recvR2 = stm32_recvlong,
- .recvR3 = stm32_recvshort,
- .recvR4 = stm32_recvshort,
- .recvR5 = stm32_recvshortcrc,
- .recvR6 = stm32_recvshortcrc,
- .recvR7 = stm32_recvshort,
+ .recv_r1 = stm32_recvshortcrc,
+ .recv_r2 = stm32_recvlong,
+ .recv_r3 = stm32_recvshort,
+ .recv_r4 = stm32_recvshort,
+ .recv_r5 = stm32_recvshortcrc,
+ .recv_r6 = stm32_recvshortcrc,
+ .recv_r7 = stm32_recvshort,
.waitenable = stm32_waitenable,
.eventwait = stm32_eventwait,
.callbackenable = stm32_callbackenable,
@@ -687,13 +687,13 @@ struct stm32_dev_s g_sdmmcdev2 =
.sendsetup = stm32_sendsetup,
.cancel = stm32_cancel,
.waitresponse = stm32_waitresponse,
- .recvR1 = stm32_recvshortcrc,
- .recvR2 = stm32_recvlong,
- .recvR3 = stm32_recvshort,
- .recvR4 = stm32_recvshort,
- .recvR5 = stm32_recvshortcrc,
- .recvR6 = stm32_recvshortcrc,
- .recvR7 = stm32_recvshort,
+ .recv_r1 = stm32_recvshortcrc,
+ .recv_r2 = stm32_recvlong,
+ .recv_r3 = stm32_recvshort,
+ .recv_r4 = stm32_recvshort,
+ .recv_r5 = stm32_recvshortcrc,
+ .recv_r6 = stm32_recvshortcrc,
+ .recv_r7 = stm32_recvshort,
.waitenable = stm32_waitenable,
.eventwait = stm32_eventwait,
.callbackenable = stm32_callbackenable,
@@ -2475,7 +2475,7 @@ static int stm32_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
}
/****************************************************************************
- * Name: stm32_recvRx
+ * Name: stm32_recv*
*
* Description:
* Receive response to SDIO command. Only the critical payload is
diff --git a/arch/arm/src/stm32h7/stm32_sdmmc.c b/arch/arm/src/stm32h7/stm32_sdmmc.c
index cccc2eb..fd0c2de 100644
--- a/arch/arm/src/stm32h7/stm32_sdmmc.c
+++ b/arch/arm/src/stm32h7/stm32_sdmmc.c
@@ -537,13 +537,13 @@ struct stm32_dev_s g_sdmmcdev1 =
.sendsetup = stm32_sendsetup,
.cancel = stm32_cancel,
.waitresponse = stm32_waitresponse,
- .recvR1 = stm32_recvshortcrc,
- .recvR2 = stm32_recvlong,
- .recvR3 = stm32_recvshort,
- .recvR4 = stm32_recvshort,
- .recvR5 = stm32_recvshortcrc,
- .recvR6 = stm32_recvshortcrc,
- .recvR7 = stm32_recvshort,
+ .recv_r1 = stm32_recvshortcrc,
+ .recv_r2 = stm32_recvlong,
+ .recv_r3 = stm32_recvshort,
+ .recv_r4 = stm32_recvshort,
+ .recv_r5 = stm32_recvshortcrc,
+ .recv_r6 = stm32_recvshortcrc,
+ .recv_r7 = stm32_recvshort,
.waitenable = stm32_waitenable,
.eventwait = stm32_eventwait,
.callbackenable = stm32_callbackenable,
@@ -589,13 +589,13 @@ struct stm32_dev_s g_sdmmcdev2 =
.sendsetup = stm32_sendsetup,
.cancel = stm32_cancel,
.waitresponse = stm32_waitresponse,
- .recvR1 = stm32_recvshortcrc,
- .recvR2 = stm32_recvlong,
- .recvR3 = stm32_recvshort,
- .recvR4 = stm32_recvshort,
- .recvR5 = stm32_recvshortcrc,
- .recvR6 = stm32_recvshortcrc,
- .recvR7 = stm32_recvshort,
+ .recv_r1 = stm32_recvshortcrc,
+ .recv_r2 = stm32_recvlong,
+ .recv_r3 = stm32_recvshort,
+ .recv_r4 = stm32_recvshort,
+ .recv_r5 = stm32_recvshortcrc,
+ .recv_r6 = stm32_recvshortcrc,
+ .recv_r7 = stm32_recvshort,
.waitenable = stm32_waitenable,
.eventwait = stm32_eventwait,
.callbackenable = stm32_callbackenable,
@@ -2366,7 +2366,7 @@ static int stm32_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
}
/****************************************************************************
- * Name: stm32_recvRx
+ * Name: stm32_recv*
*
* Description:
* Receive response to SDIO command. Only the critical payload is
diff --git a/arch/arm/src/stm32l4/stm32l4_sdmmc.c b/arch/arm/src/stm32l4/stm32l4_sdmmc.c
index 6d251b2..333f481 100644
--- a/arch/arm/src/stm32l4/stm32l4_sdmmc.c
+++ b/arch/arm/src/stm32l4/stm32l4_sdmmc.c
@@ -552,13 +552,13 @@ struct stm32_dev_s g_sdmmcdev1 =
.sendsetup = stm32_sendsetup,
.cancel = stm32_cancel,
.waitresponse = stm32_waitresponse,
- .recvR1 = stm32_recvshortcrc,
- .recvR2 = stm32_recvlong,
- .recvR3 = stm32_recvshort,
- .recvR4 = stm32_recvnotimpl,
- .recvR5 = stm32_recvnotimpl,
- .recvR6 = stm32_recvshortcrc,
- .recvR7 = stm32_recvshort,
+ .recv_r1 = stm32_recvshortcrc,
+ .recv_r2 = stm32_recvlong,
+ .recv_r3 = stm32_recvshort,
+ .recv_r4 = stm32_recvnotimpl,
+ .recv_r5 = stm32_recvnotimpl,
+ .recv_r6 = stm32_recvshortcrc,
+ .recv_r7 = stm32_recvshort,
.waitenable = stm32_waitenable,
.eventwait = stm32_eventwait,
.callbackenable = stm32_callbackenable,
@@ -613,13 +613,13 @@ struct stm32_dev_s g_sdmmcdev2 =
.sendsetup = stm32_sendsetup,
.cancel = stm32_cancel,
.waitresponse = stm32_waitresponse,
- .recvR1 = stm32_recvshortcrc,
- .recvR2 = stm32_recvlong,
- .recvR3 = stm32_recvshort,
- .recvR4 = stm32_recvnotimpl,
- .recvR5 = stm32_recvnotimpl,
- .recvR6 = stm32_recvshortcrc,
- .recvR7 = stm32_recvshort,
+ .recv_r1 = stm32_recvshortcrc,
+ .recv_r2 = stm32_recvlong,
+ .recv_r3 = stm32_recvshort,
+ .recv_r4 = stm32_recvnotimpl,
+ .recv_r5 = stm32_recvnotimpl,
+ .recv_r6 = stm32_recvshortcrc,
+ .recv_r7 = stm32_recvshort,
.waitenable = stm32_waitenable,
.eventwait = stm32_eventwait,
.callbackenable = stm32_callbackenable,
@@ -2253,7 +2253,7 @@ static int stm32_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
}
/****************************************************************************
- * Name: stm32_recvRx
+ * Name: stm32_recv*
*
* Description:
* Receive response to SDIO command. Only the critical payload is
diff --git a/drivers/mmcsd/mmcsd_sdio.c b/drivers/mmcsd/mmcsd_sdio.c
index 3504316..7883dca 100644
--- a/drivers/mmcsd/mmcsd_sdio.c
+++ b/drivers/mmcsd/mmcsd_sdio.c
@@ -2946,7 +2946,7 @@ static int mmcsd_sdinitialize(FAR struct mmcsd_state_s *priv)
ret = mmsd_recv_r6(priv, SD_CMD3);
if (ret != OK)
{
- ferr("ERROR: mmcsd_recvR2 for SD RCA failed: %d\n", ret);
+ ferr("ERROR: mmsd_recv_r6 for SD RCA failed: %d\n", ret);
return ret;
}
diff --git a/include/nuttx/sdio.h b/include/nuttx/sdio.h
index aac175c..9cfd178 100644
--- a/include/nuttx/sdio.h
+++ b/include/nuttx/sdio.h
@@ -653,13 +653,13 @@
*
****************************************************************************/
-#define SDIO_RECVR1(dev,cmd,R1) ((dev)->recvR1(dev,cmd,R1)) /* 48-bit */
-#define SDIO_RECVR2(dev,cmd,R2) ((dev)->recvR2(dev,cmd,R2)) /* 136-bit */
-#define SDIO_RECVR3(dev,cmd,R3) ((dev)->recvR3(dev,cmd,R3)) /* 48-bit */
-#define SDIO_RECVR4(dev,cmd,R4) ((dev)->recvR4(dev,cmd,R4)) /* 48-bit */
-#define SDIO_RECVR5(dev,cmd,R5) ((dev)->recvR5(dev,cmd,R5)) /* 48-bit */
-#define SDIO_RECVR6(dev,cmd,R6) ((dev)->recvR6(dev,cmd,R6)) /* 48-bit */
-#define SDIO_RECVR7(dev,cmd,R7) ((dev)->recvR7(dev,cmd,R7)) /* 48-bit */
+#define SDIO_RECVR1(dev,cmd,R1) ((dev)->recv_r1(dev,cmd,R1)) /* 48-bit */
+#define SDIO_RECVR2(dev,cmd,R2) ((dev)->recv_r2(dev,cmd,R2)) /* 136-bit */
+#define SDIO_RECVR3(dev,cmd,R3) ((dev)->recv_r3(dev,cmd,R3)) /* 48-bit */
+#define SDIO_RECVR4(dev,cmd,R4) ((dev)->recv_r4(dev,cmd,R4)) /* 48-bit */
+#define SDIO_RECVR5(dev,cmd,R5) ((dev)->recv_r5(dev,cmd,R5)) /* 48-bit */
+#define SDIO_RECVR6(dev,cmd,R6) ((dev)->recv_r6(dev,cmd,R6)) /* 48-bit */
+#define SDIO_RECVR7(dev,cmd,R7) ((dev)->recv_r7(dev,cmd,R7)) /* 48-bit */
/****************************************************************************
* Name: SDIO_WAITENABLE
@@ -948,13 +948,13 @@ struct sdio_dev_s
int (*cancel)(FAR struct sdio_dev_s *dev);
int (*waitresponse)(FAR struct sdio_dev_s *dev, uint32_t cmd);
- int (*recvR1)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R1);
- int (*recvR2)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t R2[4]);
- int (*recvR3)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R3);
- int (*recvR4)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R4);
- int (*recvR5)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R5);
- int (*recvR6)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R6);
- int (*recvR7)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R7);
+ int (*recv_r1)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R1);
+ int (*recv_r2)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t R2[4]);
+ int (*recv_r3)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R3);
+ int (*recv_r4)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R4);
+ int (*recv_r5)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R5);
+ int (*recv_r6)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R6);
+ int (*recv_r7)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R7);
/* Event/Callback support */