sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/arm/src/kinetis/kinetis_sdhc.c: Fix syslog formats

Browse Source
This commit is contained in:
YAMAMOTO Takashi 2020-11-29 17:02:11 +09:00 committed by Xiang Xiao
parent ef45af84f6
commit b03e01807b
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
arch/arm/src/kinetis/kinetis_sdhc.c
View File

@ -24,6 +24,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>
@ -1088,7 +1089,8 @@ static int kinetis_interrupt(int irq, void *context, FAR void *arg)
regval = getreg32(KINETIS_SDHC_IRQSIGEN); regval = getreg32(KINETIS_SDHC_IRQSIGEN);
enabled = getreg32(KINETIS_SDHC_IRQSTAT) & regval; enabled = getreg32(KINETIS_SDHC_IRQSTAT) & regval;
mcinfo("IRQSTAT: %08x IRQSIGEN %08x enabled: %08x\n", mcinfo("IRQSTAT: %08" PRIx32 " IRQSIGEN %08" PRIx32
" enabled: %08" PRIx32 "\n",
getreg32(KINETIS_SDHC_IRQSTAT), regval, enabled); getreg32(KINETIS_SDHC_IRQSTAT), regval, enabled);
/* Disable card interrupts to clear the card interrupt to the host /* Disable card interrupts to clear the card interrupt to the host
@ -1276,7 +1278,8 @@ static void kinetis_reset(FAR struct sdio_dev_s *dev)
putreg32(SDHC_INT_ALL, KINETIS_SDHC_IRQSTATEN); putreg32(SDHC_INT_ALL, KINETIS_SDHC_IRQSTATEN);
mcinfo("SYSCTL: %08x PRSSTAT: %08x IRQSTATEN: %08x\n", mcinfo("SYSCTL: %08" PRIx32 " PRSSTAT: %08" PRIx32
" IRQSTATEN: %08" PRIx32 "\n",
getreg32(KINETIS_SDHC_SYSCTL), getreg32(KINETIS_SDHC_PRSSTAT), getreg32(KINETIS_SDHC_SYSCTL), getreg32(KINETIS_SDHC_PRSSTAT),
getreg32(KINETIS_SDHC_IRQSTATEN)); getreg32(KINETIS_SDHC_IRQSTATEN));
@ -1612,7 +1615,7 @@ static void kinetis_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate)
regval = getreg32(KINETIS_SDHC_SYSCTL); regval = getreg32(KINETIS_SDHC_SYSCTL);
regval &= ~SDHC_SYSCTL_SDCLKEN; regval &= ~SDHC_SYSCTL_SDCLKEN;
putreg32(regval, KINETIS_SDHC_SYSCTL); putreg32(regval, KINETIS_SDHC_SYSCTL);
mcinfo("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL)); mcinfo("SYSCTRL: %08" PRIx32 "\n", getreg32(KINETIS_SDHC_SYSCTL));
/* Clear the old prescaler and divisor values so that new ones can be ORed /* Clear the old prescaler and divisor values so that new ones can be ORed
* in. * in.
@ -1640,7 +1643,7 @@ static void kinetis_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate)
~(SDHC_SYSCTL_IPGEN | SDHC_SYSCTL_HCKEN | SDHC_SYSCTL_PEREN); ~(SDHC_SYSCTL_IPGEN | SDHC_SYSCTL_HCKEN | SDHC_SYSCTL_PEREN);
putreg32(regval, KINETIS_SDHC_SYSCTL); putreg32(regval, KINETIS_SDHC_SYSCTL);
mcinfo("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL)); mcinfo("SYSCTRL: %08" PRIx32 "\n", getreg32(KINETIS_SDHC_SYSCTL));
return; return;
} }
@ -1686,7 +1689,7 @@ static void kinetis_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate)
} }
putreg32(regval, KINETIS_SDHC_SYSCTL); putreg32(regval, KINETIS_SDHC_SYSCTL);
mcinfo("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL)); mcinfo("SYSCTRL: %08" PRIx32 "\n", getreg32(KINETIS_SDHC_SYSCTL));
} }
#endif #endif
@ -1853,7 +1856,9 @@ static int kinetis_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd,
/* Other bits? What about CMDTYP? */ /* Other bits? What about CMDTYP? */
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);
/* The Command Inhibit (CIHB) bit is set in the PRSSTAT bit immediately /* The Command Inhibit (CIHB) bit is set in the PRSSTAT bit immediately
* after the transfer type register is written. This bit is cleared when * after the transfer type register is written. This bit is cleared when
@ -1874,7 +1879,8 @@ static int kinetis_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd,
elapsed = clock_systime_ticks() - start; elapsed = clock_systime_ticks() - start;
if (elapsed >= timeout) if (elapsed >= timeout)
{ {
mcerr("ERROR: Timeout cmd: %08x PRSSTAT: %08x\n", mcerr("ERROR: Timeout cmd: %08" PRIx32
" PRSSTAT: %08" PRIx32 "\n",
cmd, getreg32(KINETIS_SDHC_PRSSTAT)); cmd, getreg32(KINETIS_SDHC_PRSSTAT));
return -EBUSY; return -EBUSY;
@ -2157,7 +2163,8 @@ static int kinetis_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
elapsed = clock_systime_ticks() - start; elapsed = clock_systime_ticks() - start;
if (elapsed >= timeout) if (elapsed >= timeout)
{ {
mcerr("ERROR: Timeout cmd: %08x IRQSTAT: %08x\n", mcerr("ERROR: Timeout cmd: %08" PRIx32
" IRQSTAT: %08" PRIx32 "\n",
cmd, getreg32(KINETIS_SDHC_IRQSTAT)); cmd, getreg32(KINETIS_SDHC_IRQSTAT));
return -ETIMEDOUT; return -ETIMEDOUT;
@ -2168,7 +2175,8 @@ static int kinetis_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
if ((getreg32(KINETIS_SDHC_IRQSTAT) & errors) != 0) if ((getreg32(KINETIS_SDHC_IRQSTAT) & errors) != 0)
{ {
mcerr("ERROR: cmd: %08x errors: %08x IRQSTAT: %08x\n", mcerr("ERROR: cmd: %08" PRIx32 " errors: %08" PRIx32
" IRQSTAT: %08" PRIx32 "\n",
cmd, errors, getreg32(KINETIS_SDHC_IRQSTAT)); cmd, errors, getreg32(KINETIS_SDHC_IRQSTAT));
ret = -EIO; ret = -EIO;
} }
@ -2253,12 +2261,12 @@ static int kinetis_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd,
regval = getreg32(KINETIS_SDHC_IRQSTAT); regval = getreg32(KINETIS_SDHC_IRQSTAT);
if ((regval & SDHC_INT_CTOE) != 0) if ((regval & SDHC_INT_CTOE) != 0)
{ {
mcerr("ERROR: Command timeout: %08x\n", regval); mcerr("ERROR: Command timeout: %08" PRIx32 "\n", regval);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
} }
else if ((regval & SDHC_INT_CCE) != 0) else if ((regval & SDHC_INT_CCE) != 0)
{ {
mcerr("ERROR: CRC failure: %08x\n", regval); mcerr("ERROR: CRC failure: %08" PRIx32 "\n", regval);
ret = -EIO; ret = -EIO;
} }
} }
@ -2292,7 +2300,7 @@ static int kinetis_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd,
if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE) if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
{ {
mcerr("ERROR: Wrong response CMD=%08x\n", cmd); mcerr("ERROR: Wrong response CMD=%08" PRIx32 "\n", cmd);
ret = -EINVAL; ret = -EINVAL;
} }
else else
@ -2303,12 +2311,12 @@ static int kinetis_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd,
regval = getreg32(KINETIS_SDHC_IRQSTAT); regval = getreg32(KINETIS_SDHC_IRQSTAT);
if (regval & SDHC_INT_CTOE) if (regval & SDHC_INT_CTOE)
{ {
mcerr("ERROR: Timeout IRQSTAT: %08x\n", regval); mcerr("ERROR: Timeout IRQSTAT: %08" PRIx32 "\n", regval);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
} }
else if (regval & SDHC_INT_CCE) else if (regval & SDHC_INT_CCE)
{ {
mcerr("ERROR: CRC fail IRQSTAT: %08x\n", regval); mcerr("ERROR: CRC fail IRQSTAT: %08" PRIx32 "\n", regval);
ret = -EIO; ret = -EIO;
} }
} }
@ -2359,7 +2367,7 @@ static int kinetis_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd,
if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R3_RESPONSE && if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R3_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
@ -2372,7 +2380,7 @@ static int kinetis_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd,
regval = getreg32(KINETIS_SDHC_IRQSTAT); regval = getreg32(KINETIS_SDHC_IRQSTAT);
if (regval & SDHC_INT_CTOE) if (regval & SDHC_INT_CTOE)
{ {
mcerr("ERROR: Timeout IRQSTAT: %08x\n", regval); mcerr("ERROR: Timeout IRQSTAT: %08" PRIx32 "\n", regval);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
} }
} }
@ -2891,7 +2899,7 @@ FAR struct sdio_dev_s *sdhc_initialize(int slotno)
regval &= ~SIM_SOPT2_SDHCSRC_MASK; regval &= ~SIM_SOPT2_SDHCSRC_MASK;
regval |= SIM_SOPT2_SDHCSRC_CORE; regval |= SIM_SOPT2_SDHCSRC_CORE;
putreg32(regval, KINETIS_SIM_SOPT2); putreg32(regval, KINETIS_SIM_SOPT2);
mcinfo("SIM_SOPT2: %08x\n", regval); mcinfo("SIM_SOPT2: %08" PRIx32 "\n", regval);
/* Enable clocking to the SDHC module. Clocking is still disabled in /* Enable clocking to the SDHC module. Clocking is still disabled in
* the SYSCTRL register. * the SYSCTRL register.
@ -2900,7 +2908,7 @@ FAR struct sdio_dev_s *sdhc_initialize(int slotno)
regval = getreg32(KINETIS_SIM_SCGC3); regval = getreg32(KINETIS_SIM_SCGC3);
regval |= SIM_SCGC3_SDHC; regval |= SIM_SCGC3_SDHC;
putreg32(regval, KINETIS_SIM_SCGC3); putreg32(regval, KINETIS_SIM_SCGC3);
mcinfo("SIM_SCGC3: %08x\n", regval); mcinfo("SIM_SCGC3: %08" PRIx32 "\n", regval);
/* Configure pins for 1 or 4-bit, wide-bus operation (the chip is capable /* Configure pins for 1 or 4-bit, wide-bus operation (the chip is capable
* of 8-bit wide bus operation but D4-D7 are not configured). * of 8-bit wide bus operation but D4-D7 are not configured).