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

Fix some debug output statements that were changed and lost their ll-ness

Browse Source
This commit is contained in:
Gregory Nutt 2016-06-18 09:41:55 -06:00
parent f5dc81fe73
commit 832efae5d8
7 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
arch/arm/src/sam34/sam4cm_tc.c
View File

@ -394,21 +394,21 @@ static void sam_regdump(struct sam_chan_s *chan, const char *msg)
uintptr_t base; uintptr_t base;
base = chan->base; base = chan->base;
tmrinfo("TC%d [%08x]: %s\n", chan->chan, (int)base, msg); tmrllinfo("TC%d [%08x]: %s\n", chan->chan, (int)base, msg);
tmrinfo(" BMR: %08x QIMR: %08x QISR: %08x WPMR: %08x\n", tmrllinfo(" BMR: %08x QIMR: %08x QISR: %08x WPMR: %08x\n",
getreg32(base+SAM_TC_BMR_OFFSET), getreg32(base+SAM_TC_QIMR_OFFSET), getreg32(base+SAM_TC_BMR_OFFSET), getreg32(base+SAM_TC_QIMR_OFFSET),
getreg32(base+SAM_TC_QISR_OFFSET), getreg32(base+SAM_TC_WPMR_OFFSET)); getreg32(base+SAM_TC_QISR_OFFSET), getreg32(base+SAM_TC_WPMR_OFFSET));
base = chan->base; base = chan->base;
tmrinfo("TC%d Channel %d [%08x]: %s\n", chan->chan, chan->chan, (int)base, msg); tmrllinfo("TC%d Channel %d [%08x]: %s\n", chan->chan, chan->chan, (int)base, msg);
tmrinfo(" CMR: %08x SSMR: %08x RAB: %08x CV: %08x\n", tmrllinfo(" CMR: %08x SSMR: %08x RAB: %08x CV: %08x\n",
getreg32(base+SAM_TC_CMR_OFFSET), getreg32(base+SAM_TC_SMMR_OFFSET), getreg32(base+SAM_TC_CMR_OFFSET), getreg32(base+SAM_TC_SMMR_OFFSET),
getreg32(base+SAM_TC_RAB_OFFSET), getreg32(base+SAM_TC_CV_OFFSET)); getreg32(base+SAM_TC_RAB_OFFSET), getreg32(base+SAM_TC_CV_OFFSET));
tmrinfo(" RA: %08x RB: %08x RC: %08x SR: %08x\n", tmrllinfo(" RA: %08x RB: %08x RC: %08x SR: %08x\n",
getreg32(base+SAM_TC_RA_OFFSET), getreg32(base+SAM_TC_RB_OFFSET), getreg32(base+SAM_TC_RA_OFFSET), getreg32(base+SAM_TC_RB_OFFSET),
getreg32(base+SAM_TC_RC_OFFSET), getreg32(base+SAM_TC_SR_OFFSET)); getreg32(base+SAM_TC_RC_OFFSET), getreg32(base+SAM_TC_SR_OFFSET));
tmrinfo(" IMR: %08x\n", tmrllinfo(" IMR: %08x\n",
getreg32(base+SAM_TC_IMR_OFFSET)); getreg32(base+SAM_TC_IMR_OFFSET));
} }
#endif #endif
@ -451,7 +451,7 @@ static bool sam_checkreg(struct sam_chan_s *chan, bool wr, uint32_t regaddr,
{ {
/* Yes... show how many times we did it */ /* Yes... show how many times we did it */
tmrinfo("...[Repeats %d times]...\n", chan->ntimes); tmrllinfo("...[Repeats %d times]...\n", chan->ntimes);
} }
/* Save information about the new access */ /* Save information about the new access */
@ -485,7 +485,7 @@ static inline uint32_t sam_chan_getreg(struct sam_chan_s *chan,
#ifdef CONFIG_SAM34_TC_REGDEBUG #ifdef CONFIG_SAM34_TC_REGDEBUG
if (sam_checkreg(chan, false, regaddr, regval)) if (sam_checkreg(chan, false, regaddr, regval))
{ {
tmrinfo("%08x->%08x\n", regaddr, regval); tmrllinfo("%08x->%08x\n", regaddr, regval);
} }
#endif #endif
@ -508,7 +508,7 @@ static inline void sam_chan_putreg(struct sam_chan_s *chan, unsigned int offset,
#ifdef CONFIG_SAM34_TC_REGDEBUG #ifdef CONFIG_SAM34_TC_REGDEBUG
if (sam_checkreg(chan, true, regaddr, regval)) if (sam_checkreg(chan, true, regaddr, regval))
{ {
tmrinfo("%08x<-%08x\n", regaddr, regval); tmrllinfo("%08x<-%08x\n", regaddr, regval);
} }
#endif #endif

8
arch/arm/src/sam34/sam_emac.c
View File

@ -490,7 +490,7 @@ static bool sam_checkreg(struct sam_emac_s *priv, bool wr, uint32_t regval,
{ {
/* Yes... show how many times we did it */ /* Yes... show how many times we did it */
ninfo("...[Repeats %d times]...\n", priv->ntimes); nllinfo("...[Repeats %d times]...\n", priv->ntimes);
} }
/* Save information about the new access */ /* Save information about the new access */
@ -522,7 +522,7 @@ static uint32_t sam_getreg(struct sam_emac_s *priv, uintptr_t address)
if (sam_checkreg(priv, false, regval, address)) if (sam_checkreg(priv, false, regval, address))
{ {
ninfo("%08x->%08x\n", address, regval); nllinfo("%08x->%08x\n", address, regval);
} }
return regval; return regval;
@ -543,7 +543,7 @@ static void sam_putreg(struct sam_emac_s *priv, uintptr_t address,
{ {
if (sam_checkreg(priv, true, regval, address)) if (sam_checkreg(priv, true, regval, address))
{ {
ninfo("%08x<-%08x\n", address, regval); nllinfo("%08x<-%08x\n", address, regval);
} }
putreg32(regval, address); putreg32(regval, address);
@ -2077,7 +2077,7 @@ static int sam_ifdown(struct net_driver_s *dev)
static inline void sam_txavail_process(FAR struct sam_emac_s *priv) static inline void sam_txavail_process(FAR struct sam_emac_s *priv)
{ {
ninfo("ifup: %d\n", priv->ifup); nllinfo("ifup: %d\n", priv->ifup);
/* Ignore the notification if the interface is not yet up */ /* Ignore the notification if the interface is not yet up */

10
arch/arm/src/sam34/sam_rtt.c
View File

@ -204,7 +204,7 @@ static uint32_t sam34_getreg(uint32_t addr)
{ {
if (count == 4) if (count == 4)
{ {
tmrinfo("...\n"); tmrllinfo("...\n");
} }
return val; return val;
@ -221,7 +221,7 @@ static uint32_t sam34_getreg(uint32_t addr)
{ {
/* Yes.. then show how many times the value repeated */ /* Yes.. then show how many times the value repeated */
tmrinfo("[repeats %d more times]\n", count-3); tmrllinfo("[repeats %d more times]\n", count-3);
} }
/* Save the new address, value, and count */ /* Save the new address, value, and count */
@ -233,7 +233,7 @@ static uint32_t sam34_getreg(uint32_t addr)
/* Show the register value read */ /* Show the register value read */
tmrinfo("%08lx->%08lx\n", addr, val); tmrllinfo("%08lx->%08lx\n", addr, val);
return val; return val;
} }
#endif #endif
@ -251,7 +251,7 @@ static void sam34_putreg(uint32_t val, uint32_t addr)
{ {
/* Show the register value being written */ /* Show the register value being written */
tmrinfo("%08lx<-%08lx\n", addr, val); tmrllinfo("%08lx<-%08lx\n", addr, val);
/* Write the value */ /* Write the value */
@ -277,7 +277,7 @@ static int sam34_interrupt(int irq, FAR void *context)
{ {
FAR struct sam34_lowerhalf_s *priv = &g_tcdev; FAR struct sam34_lowerhalf_s *priv = &g_tcdev;
tmrinfo("Entry\n"); tmrllinfo("Entry\n");
DEBUGASSERT(irq == SAM_IRQ_RTT); DEBUGASSERT(irq == SAM_IRQ_RTT);
/* Check if the interrupt is really pending */ /* Check if the interrupt is really pending */

4
arch/arm/src/sam34/sam_spi.c
View File

@ -458,7 +458,7 @@ static inline uint32_t spi_getreg(struct sam_spidev_s *spi,
#ifdef CONFIG_SAM34_SPI_REGDEBUG #ifdef CONFIG_SAM34_SPI_REGDEBUG
if (spi_checkreg(spi, false, value, address)) if (spi_checkreg(spi, false, value, address))
{ {
spiinfo("%08x->%08x\n", address, value); spillinfo("%08x->%08x\n", address, value);
} }
#endif #endif
@ -481,7 +481,7 @@ static inline void spi_putreg(struct sam_spidev_s *spi, uint32_t value,
#ifdef CONFIG_SAM34_SPI_REGDEBUG #ifdef CONFIG_SAM34_SPI_REGDEBUG
if (spi_checkreg(spi, true, value, address)) if (spi_checkreg(spi, true, value, address))
{ {
spiinfo("%08x<-%08x\n", address, value); spillinfo("%08x<-%08x\n", address, value);
} }
#endif #endif

8
arch/arm/src/sam34/sam_tc.c
View File

@ -185,7 +185,7 @@ static uint32_t sam34_getreg(uint32_t addr)
{ {
if (count == 4) if (count == 4)
{ {
tmrinfo("...\n"); tmrllinfo("...\n");
} }
return val; return val;
@ -202,7 +202,7 @@ static uint32_t sam34_getreg(uint32_t addr)
{ {
/* Yes.. then show how many times the value repeated */ /* Yes.. then show how many times the value repeated */
tmrinfo("[repeats %d more times]\n", count-3); tmrllinfo("[repeats %d more times]\n", count-3);
} }
/* Save the new address, value, and count */ /* Save the new address, value, and count */
@ -214,7 +214,7 @@ static uint32_t sam34_getreg(uint32_t addr)
/* Show the register value read */ /* Show the register value read */
tmrinfo("%08lx->%08lx\n", addr, val); tmrllinfo("%08lx->%08lx\n", addr, val);
return val; return val;
} }
#endif #endif
@ -232,7 +232,7 @@ static void sam34_putreg(uint32_t val, uint32_t addr)
{ {
/* Show the register value being written */ /* Show the register value being written */
tmrinfo("%08lx<-%08lx\n", addr, val); tmrllinfo("%08lx<-%08lx\n", addr, val);
/* Write the value */ /* Write the value */

6
arch/arm/src/sam34/sam_twi.c
View File

@ -277,7 +277,7 @@ static bool twi_checkreg(struct twi_dev_s *priv, bool wr, uint32_t value,
{ {
/* Yes... show how many times we did it */ /* Yes... show how many times we did it */
i2cinfo("...[Repeats %d times]...\n", priv->ntimes); i2cllinfo("...[Repeats %d times]...\n", priv->ntimes);
} }
/* Save information about the new access */ /* Save information about the new access */
@ -309,7 +309,7 @@ static uint32_t twi_getabs(struct twi_dev_s *priv, uintptr_t address)
if (twi_checkreg(priv, false, value, address)) if (twi_checkreg(priv, false, value, address))
{ {
i2cinfo("%08x->%08x\n", address, value); i2cllinfo("%08x->%08x\n", address, value);
} }
return value; return value;
@ -330,7 +330,7 @@ static void twi_putabs(struct twi_dev_s *priv, uintptr_t address,
{ {
if (twi_checkreg(priv, true, value, address)) if (twi_checkreg(priv, true, value, address))
{ {
i2cinfo("%08x<-%08x\n", address, value); i2cllinfo("%08x<-%08x\n", address, value);
} }
putreg32(value, address); putreg32(value, address);

8
arch/arm/src/sam34/sam_wdt.c
View File

@ -187,7 +187,7 @@ static uint32_t sam34_getreg(uint32_t addr)
{ {
if (count == 4) if (count == 4)
{ {
wdinfo("...\n"); wdllinfo("...\n");
} }
return val; return val;
@ -204,7 +204,7 @@ static uint32_t sam34_getreg(uint32_t addr)
{ {
/* Yes.. then show how many times the value repeated */ /* Yes.. then show how many times the value repeated */
wdinfo("[repeats %d more times]\n", count-3); wdllinfo("[repeats %d more times]\n", count-3);
} }
/* Save the new address, value, and count */ /* Save the new address, value, and count */
@ -216,7 +216,7 @@ static uint32_t sam34_getreg(uint32_t addr)
/* Show the register value read */ /* Show the register value read */
wdinfo("%08x->%08x\n", addr, val); wdllinfo("%08x->%08x\n", addr, val);
return val; return val;
} }
#endif #endif
@ -234,7 +234,7 @@ static void sam34_putreg(uint32_t val, uint32_t addr)
{ {
/* Show the register value being written */ /* Show the register value being written */
wdinfo("%08x<-%08x\n", addr, val); wdllinfo("%08x<-%08x\n", addr, val);
/* Write the value */ /* Write the value */