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

arch/arm/src/stm32f7/stm32_sdmmc.c: Fix syslog formats

Browse Source
This commit is contained in:
YAMAMOTO Takashi
2020-11-22 20:55:33 +09:00
committed by Xiang Xiao
parent 5a4a960a79
commit 505d7a5728
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/stm32f7/stm32_sdmmc.c
+14 -11
View File
@@ -41,6 +41,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <inttypes.h>
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
@@ -836,7 +837,7 @@ static inline void stm32_setclkcr(struct stm32_dev_s *priv, uint32_t clkcr)
regval |= clkcr; regval |= clkcr;
sdmmc_putreg32(priv, regval, STM32_SDMMC_CLKCR_OFFSET); sdmmc_putreg32(priv, regval, STM32_SDMMC_CLKCR_OFFSET);
mcinfo("CLKCR: %08x PWR: %08x\n", mcinfo("CLKCR: %08" PRIx32 "PWR: %08" PRIx32 "\n",
sdmmc_getreg32(priv, STM32_SDMMC_CLKCR_OFFSET), sdmmc_getreg32(priv, STM32_SDMMC_CLKCR_OFFSET),
sdmmc_getreg32(priv, STM32_SDMMC_POWER_OFFSET)); sdmmc_getreg32(priv, STM32_SDMMC_POWER_OFFSET));
} }
@@ -1940,7 +1941,7 @@ static void stm32_reset(FAR struct sdio_dev_s *dev)
stm32_setpwrctrl(priv, STM32_SDMMC_POWER_PWRCTRL_ON); stm32_setpwrctrl(priv, STM32_SDMMC_POWER_PWRCTRL_ON);
leave_critical_section(flags); leave_critical_section(flags);
mcinfo("CLCKR: %08x POWER: %08x\n", mcinfo("CLCKR: %08" PRIx32 " POWER: %08" PRIx32 "\n",
sdmmc_getreg32(priv, STM32_SDMMC_CLKCR_OFFSET), sdmmc_getreg32(priv, STM32_SDMMC_CLKCR_OFFSET),
sdmmc_getreg32(priv, STM32_SDMMC_POWER_OFFSET)); sdmmc_getreg32(priv, STM32_SDMMC_POWER_OFFSET));
} }
@@ -2188,7 +2189,8 @@ static int stm32_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd,
cmdidx = (cmd & MMCSD_CMDIDX_MASK) >> MMCSD_CMDIDX_SHIFT; cmdidx = (cmd & MMCSD_CMDIDX_MASK) >> MMCSD_CMDIDX_SHIFT;
regval |= cmdidx | STM32_SDMMC_CMD_CPSMEN; regval |= cmdidx | STM32_SDMMC_CMD_CPSMEN;
mcinfo("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval); mcinfo("cmd: %08" PRIx32 " arg: %08" PRIx32
" regval: %08" PRIx32 "\n", cmd, arg, regval);
/* Write the SDIO CMD */ /* Write the SDIO CMD */
@@ -2449,8 +2451,9 @@ static int stm32_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
{ {
if (--timeout <= 0) if (--timeout <= 0)
{ {
mcerr("ERROR: Timeout cmd: %08x events: %08x STA: %08x\n", mcerr("ERROR: Timeout cmd: %08" PRIx32
cmd, events, sdmmc_getreg32(priv, STM32_SDMMC_STA_OFFSET)); " events: %08" PRIx32 " STA: %08" PRIx32 "\n",
cmd, events, sdmmc_getreg32(priv, STM32_SDMMC_STA_OFFSET));
return -ETIMEDOUT; return -ETIMEDOUT;
} }
@@ -2539,12 +2542,12 @@ static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd,
regval = sdmmc_getreg32(priv, STM32_SDMMC_STA_OFFSET); regval = sdmmc_getreg32(priv, STM32_SDMMC_STA_OFFSET);
if ((regval & STM32_SDMMC_STA_CTIMEOUT) != 0) if ((regval & STM32_SDMMC_STA_CTIMEOUT) != 0)
{ {
mcerr("ERROR: Command timeout: %08x\n", regval); mcerr("ERROR: Command timeout: %08" PRIx32 "\n", regval);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
} }
else if ((regval & STM32_SDMMC_STA_CCRCFAIL) != 0) else if ((regval & STM32_SDMMC_STA_CCRCFAIL) != 0)
{ {
mcerr("ERROR: CRC failure: %08x\n", regval); mcerr("ERROR: CRC failure: %08" PRIx32 "\n", regval);
ret = -EIO; ret = -EIO;
} }
#ifdef CONFIG_DEBUG_FEATURES #ifdef CONFIG_DEBUG_FEATURES
@@ -2605,12 +2608,12 @@ static int stm32_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd,
regval = sdmmc_getreg32(priv, STM32_SDMMC_STA_OFFSET); regval = sdmmc_getreg32(priv, STM32_SDMMC_STA_OFFSET);
if (regval & STM32_SDMMC_STA_CTIMEOUT) if (regval & STM32_SDMMC_STA_CTIMEOUT)
{ {
mcerr("ERROR: Timeout STA: %08x\n", regval); mcerr("ERROR: Timeout STA: %08" PRIx32 "\n", regval);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
} }
else if (regval & STM32_SDMMC_STA_CCRCFAIL) else if (regval & STM32_SDMMC_STA_CCRCFAIL)
{ {
mcerr("ERROR: CRC fail STA: %08x\n", regval); mcerr("ERROR: CRC fail STA: %08" PRIx32 "\n", regval);
ret = -EIO; ret = -EIO;
} }
} }
@@ -2653,7 +2656,7 @@ static int stm32_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd,
(cmd & MMCSD_RESPONSE_MASK) != MMCSD_R4_RESPONSE && (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R4_RESPONSE &&
(cmd & MMCSD_RESPONSE_MASK) != MMCSD_R7_RESPONSE) (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R7_RESPONSE)
{ {
mcerr("ERROR: Wrong response CMD=%08x\n", cmd); mcerr("ERROR: Wrong response CMD=%08" PRIx32 "\n", cmd);
ret = -EINVAL; ret = -EINVAL;
} }
else else
@@ -2666,7 +2669,7 @@ static int stm32_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd,
regval = sdmmc_getreg32(priv, STM32_SDMMC_STA_OFFSET); regval = sdmmc_getreg32(priv, STM32_SDMMC_STA_OFFSET);
if (regval & STM32_SDMMC_STA_CTIMEOUT) if (regval & STM32_SDMMC_STA_CTIMEOUT)
{ {
mcerr("ERROR: Timeout STA: %08x\n", regval); mcerr("ERROR: Timeout STA: %08" PRIx32 "\n", regval);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
} }
} }