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

arch/arm/src/samv7/sam_hsmci.c: Fix syslog formats

Browse Source
This commit is contained in:
YAMAMOTO Takashi 2020-12-02 07:04:00 +09:00 committed by Xiang Xiao
parent 20f353af89
commit 1eb6f9c569
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arch/arm/src/samv7/sam_hsmci.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>
@ -1475,7 +1476,7 @@ static int sam_hsmci_interrupt(int irq, void *context, void *arg)
{ {
/* Yes.. Was it some kind of timeout error? */ /* Yes.. Was it some kind of timeout error? */
mcerr("ERROR: enabled: %08x pending: %08x\n", mcerr("ERROR: enabled: %08" PRIx32 " pending: %08" PRIx32 "\n",
enabled, pending); enabled, pending);
if ((pending & HSMCI_DATA_TIMEOUT_ERRORS) != 0) if ((pending & HSMCI_DATA_TIMEOUT_ERRORS) != 0)
@ -1603,7 +1604,7 @@ static int sam_hsmci_interrupt(int irq, void *context, void *arg)
{ {
/* Yes.. Was the error some kind of timeout? */ /* Yes.. Was the error some kind of timeout? */
mcerr("ERROR: events: %08x SR: %08x\n", mcerr("ERROR: events: %08" PRIx32 " SR: %08" PRIx32 "\n",
priv->cmdrmask, enabled); priv->cmdrmask, enabled);
if ((pending & HSMCI_RESPONSE_TIMEOUT_ERRORS) != 0) if ((pending & HSMCI_RESPONSE_TIMEOUT_ERRORS) != 0)
@ -2066,7 +2067,8 @@ static int sam_sendcmd(FAR struct sdio_dev_s *dev,
/* Write the fully decorated command to CMDR */ /* Write the fully decorated command to CMDR */
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);
sam_putreg(priv, regval, SAM_HSMCI_CMDR_OFFSET); sam_putreg(priv, regval, SAM_HSMCI_CMDR_OFFSET);
sam_cmdsample1(priv, SAMPLENDX_AFTER_CMDR); sam_cmdsample1(priv, SAMPLENDX_AFTER_CMDR);
return OK; return OK;
@ -2256,7 +2258,7 @@ static int sam_sendsetup(FAR struct sdio_dev_s *dev,
{ {
/* Some fatal error has occurred */ /* Some fatal error has occurred */
mcerr("ERROR: sr %08x\n", sr); mcerr("ERROR: sr %08" PRIx32 "\n", sr);
return -EIO; return -EIO;
} }
else if ((sr & HSMCI_INT_TXRDY) != 0) else if ((sr & HSMCI_INT_TXRDY) != 0)
@ -2440,8 +2442,9 @@ static int sam_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
{ {
/* Yes.. Was the error some kind of timeout? */ /* Yes.. Was the error some kind of timeout? */
mcerr("ERROR: cmd: %08x events: %08x SR: %08x\n", mcerr("ERROR: cmd: %08" PRIx32 " events: %08" PRIx32
cmd, priv->cmdrmask, sr); " SR: %08" PRIx32 "\n",
cmd, priv->cmdrmask, sr);
if ((pending & HSMCI_RESPONSE_TIMEOUT_ERRORS) != 0) if ((pending & HSMCI_RESPONSE_TIMEOUT_ERRORS) != 0)
{ {
@ -2472,8 +2475,9 @@ static int sam_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
} }
else if (--timeout <= 0) else if (--timeout <= 0)
{ {
mcerr("ERROR: Timeout cmd: %08x events: %08x SR: %08x\n", mcerr("ERROR: Timeout cmd: %08" PRIx32 " events: %08" PRIx32
cmd, priv->cmdrmask, sr); " SR: %08" PRIx32 "\n",
cmd, priv->cmdrmask, sr);
priv->wkupevent = SDIOWAIT_TIMEOUT; priv->wkupevent = SDIOWAIT_TIMEOUT;
return -ETIMEDOUT; return -ETIMEDOUT;
@ -3364,8 +3368,8 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
return NULL; return NULL;
} }
mcinfo("priv: %p base: %08x hsmci: %d pid: %d\n", mcinfo("priv: %p base: %08" PRIx32 " hsmci: %d pid: %" PRId32 "\n",
priv, priv->base, priv->hsmci, pid); priv, priv->base, priv->hsmci, pid);
/* Initialize the HSMCI slot structure */ /* Initialize the HSMCI slot structure */