mirror of
https://github.com/apache/nuttx.git
synced 2026-09-22 14:24:40 +08:00
STM32: In big change off err() to info(), several debug statements lost their ll property.
This commit is contained in:
@@ -548,7 +548,7 @@ static bool sam_adc_checkreg(struct sam_adc_s *priv, bool wr,
|
||||
{
|
||||
/* Yes... show how many times we did it */
|
||||
|
||||
ainfo("...[Repeats %d times]...\n", priv->ntimes);
|
||||
allinfo("...[Repeats %d times]...\n", priv->ntimes);
|
||||
}
|
||||
|
||||
/* Save information about the new access */
|
||||
@@ -2191,7 +2191,7 @@ uint32_t sam_adc_getreg(struct sam_adc_s *priv, uintptr_t address)
|
||||
|
||||
if (sam_adc_checkreg(priv, false, regval, address))
|
||||
{
|
||||
ainfo("%08x->%08x\n", address, regval);
|
||||
allinfo("%08x->%08x\n", address, regval);
|
||||
}
|
||||
|
||||
return regval;
|
||||
@@ -2211,7 +2211,7 @@ void sam_adc_putreg(struct sam_adc_s *priv, uintptr_t address, uint32_t regval)
|
||||
{
|
||||
if (sam_adc_checkreg(priv, true, regval, address))
|
||||
{
|
||||
ainfo("%08x<-%08x\n", address, regval);
|
||||
allinfo("%08x<-%08x\n", address, regval);
|
||||
}
|
||||
|
||||
putreg32(regval, address);
|
||||
|
||||
@@ -371,7 +371,7 @@ static uint32_t can_getreg(FAR struct sam_can_s *priv, int offset)
|
||||
{
|
||||
if (priv->count == 4)
|
||||
{
|
||||
caninfo("...\n");
|
||||
canllinfo("...\n");
|
||||
}
|
||||
|
||||
return regval;
|
||||
@@ -388,7 +388,7 @@ static uint32_t can_getreg(FAR struct sam_can_s *priv, int offset)
|
||||
{
|
||||
/* Yes.. then show how many times the value repeated */
|
||||
|
||||
caninfo("[repeats %d more times]\n", priv->count - 3);
|
||||
canllinfo("[repeats %d more times]\n", priv->count - 3);
|
||||
}
|
||||
|
||||
/* Save the new address, value, and count */
|
||||
@@ -400,7 +400,7 @@ static uint32_t can_getreg(FAR struct sam_can_s *priv, int offset)
|
||||
|
||||
/* Show the register value read */
|
||||
|
||||
caninfo("%08x->%08x\n", regaddr, regval);
|
||||
canllinfo("%08x->%08x\n", regaddr, regval);
|
||||
return regval;
|
||||
}
|
||||
|
||||
@@ -437,7 +437,7 @@ static void can_putreg(FAR struct sam_can_s *priv, int offset, uint32_t regval)
|
||||
|
||||
/* Show the register value being written */
|
||||
|
||||
caninfo("%08x<-%08x\n", regaddr, regval);
|
||||
canllinfo("%08x<-%08x\n", regaddr, regval);
|
||||
|
||||
/* Write the value */
|
||||
|
||||
@@ -474,29 +474,29 @@ static void can_dumpctrlregs(FAR struct sam_can_s *priv, FAR const char *msg)
|
||||
|
||||
if (msg)
|
||||
{
|
||||
caninfo("Control Registers: %s\n", msg);
|
||||
canllinfo("Control Registers: %s\n", msg);
|
||||
}
|
||||
else
|
||||
{
|
||||
caninfo("Control Registers:\n");
|
||||
canllinfo("Control Registers:\n");
|
||||
}
|
||||
|
||||
/* CAN control and status registers */
|
||||
|
||||
caninfo(" MR: %08x IMR: %08x SR: %08x\n",
|
||||
getreg32(config->base + SAM_CAN_MR_OFFSET),
|
||||
getreg32(config->base + SAM_CAN_IMR_OFFSET),
|
||||
getreg32(config->base + SAM_CAN_SR_OFFSET));
|
||||
canllinfo(" MR: %08x IMR: %08x SR: %08x\n",
|
||||
getreg32(config->base + SAM_CAN_MR_OFFSET),
|
||||
getreg32(config->base + SAM_CAN_IMR_OFFSET),
|
||||
getreg32(config->base + SAM_CAN_SR_OFFSET));
|
||||
|
||||
caninfo(" BR: %08x TIM: %08x TIMESTP: %08x\n",
|
||||
getreg32(config->base + SAM_CAN_BR_OFFSET),
|
||||
getreg32(config->base + SAM_CAN_TIM_OFFSET),
|
||||
getreg32(config->base + SAM_CAN_TIMESTP_OFFSET));
|
||||
canllinfo(" BR: %08x TIM: %08x TIMESTP: %08x\n",
|
||||
getreg32(config->base + SAM_CAN_BR_OFFSET),
|
||||
getreg32(config->base + SAM_CAN_TIM_OFFSET),
|
||||
getreg32(config->base + SAM_CAN_TIMESTP_OFFSET));
|
||||
|
||||
caninfo(" ECR: %08x WPMR: %08x WPSR: %08x\n",
|
||||
getreg32(config->base + SAM_CAN_ECR_OFFSET),
|
||||
getreg32(config->base + SAM_CAN_TCR_OFFSET),
|
||||
getreg32(config->base + SAM_CAN_ACR_OFFSET));
|
||||
canllinfo(" ECR: %08x WPMR: %08x WPSR: %08x\n",
|
||||
getreg32(config->base + SAM_CAN_ECR_OFFSET),
|
||||
getreg32(config->base + SAM_CAN_TCR_OFFSET),
|
||||
getreg32(config->base + SAM_CAN_ACR_OFFSET));
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -523,30 +523,30 @@ static void can_dumpmbregs(FAR struct sam_can_s *priv, FAR const char *msg)
|
||||
|
||||
if (msg)
|
||||
{
|
||||
caninfo("Mailbox Registers: %s\n", msg);
|
||||
canllinfo("Mailbox Registers: %s\n", msg);
|
||||
}
|
||||
else
|
||||
{
|
||||
caninfo("Mailbox Registers:\n");
|
||||
canllinfo("Mailbox Registers:\n");
|
||||
}
|
||||
|
||||
for (i = 0; i < SAM_CAN_NMAILBOXES; i++)
|
||||
{
|
||||
mbbase = config->base + SAM_CAN_MBn_OFFSET(i);
|
||||
caninfo(" MB%d:\n", i);
|
||||
canllinfo(" MB%d:\n", i);
|
||||
|
||||
/* CAN mailbox registers */
|
||||
|
||||
caninfo(" MMR: %08x MAM: %08x MID: %08x MFID: %08x\n",
|
||||
getreg32(mbbase + SAM_CAN_MMR_OFFSET),
|
||||
getreg32(mbbase + SAM_CAN_MAM_OFFSET),
|
||||
getreg32(mbbase + SAM_CAN_MID_OFFSET),
|
||||
getreg32(mbbase + SAM_CAN_MFID_OFFSET));
|
||||
canllinfo(" MMR: %08x MAM: %08x MID: %08x MFID: %08x\n",
|
||||
getreg32(mbbase + SAM_CAN_MMR_OFFSET),
|
||||
getreg32(mbbase + SAM_CAN_MAM_OFFSET),
|
||||
getreg32(mbbase + SAM_CAN_MID_OFFSET),
|
||||
getreg32(mbbase + SAM_CAN_MFID_OFFSET));
|
||||
|
||||
caninfo(" MSR: %08x MDL: %08x MDH: %08x\n",
|
||||
getreg32(mbbase + SAM_CAN_MSR_OFFSET),
|
||||
getreg32(mbbase + SAM_CAN_MDL_OFFSET),
|
||||
getreg32(mbbase + SAM_CAN_MDH_OFFSET));
|
||||
canllinfo(" MSR: %08x MDL: %08x MDH: %08x\n",
|
||||
getreg32(mbbase + SAM_CAN_MSR_OFFSET),
|
||||
getreg32(mbbase + SAM_CAN_MDL_OFFSET),
|
||||
getreg32(mbbase + SAM_CAN_MDH_OFFSET));
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -628,7 +628,7 @@ static uint32_t sam_swap32(uint32_t value)
|
||||
static void sam_printreg(volatile uint32_t *regaddr, uint32_t regval,
|
||||
bool iswrite)
|
||||
{
|
||||
uinfo("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval);
|
||||
ullinfo("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -679,7 +679,7 @@ static void sam_checkreg(volatile uint32_t *regaddr, uint32_t regval, bool iswri
|
||||
{
|
||||
/* No.. More than one. */
|
||||
|
||||
uinfo("[repeats %d more times]\n", count);
|
||||
ullinfo("[repeats %d more times]\n", count);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -461,7 +461,7 @@ static bool sam_checkreg(struct sam_emac_s *priv, bool wr, uint32_t regval,
|
||||
{
|
||||
/* 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 */
|
||||
@@ -493,7 +493,7 @@ static uint32_t sam_getreg(struct sam_emac_s *priv, uintptr_t address)
|
||||
|
||||
if (sam_checkreg(priv, false, regval, address))
|
||||
{
|
||||
ninfo("%08x->%08x\n", address, regval);
|
||||
nllinfo("%08x->%08x\n", address, regval);
|
||||
}
|
||||
|
||||
return regval;
|
||||
@@ -514,7 +514,7 @@ static void sam_putreg(struct sam_emac_s *priv, uintptr_t address,
|
||||
{
|
||||
if (sam_checkreg(priv, true, regval, address))
|
||||
{
|
||||
ninfo("%08x<-%08x\n", address, regval);
|
||||
nllinfo("%08x<-%08x\n", address, regval);
|
||||
}
|
||||
|
||||
putreg32(regval, address);
|
||||
|
||||
@@ -392,7 +392,7 @@ static bool sam_checkreg(struct sam_gmac_s *priv, bool wr, uint32_t regval,
|
||||
{
|
||||
/* 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 */
|
||||
@@ -424,7 +424,7 @@ static uint32_t sam_getreg(struct sam_gmac_s *priv, uintptr_t address)
|
||||
|
||||
if (sam_checkreg(priv, false, regval, address))
|
||||
{
|
||||
ninfo("%08x->%08x\n", address, regval);
|
||||
nllinfo("%08x->%08x\n", address, regval);
|
||||
}
|
||||
|
||||
return regval;
|
||||
@@ -445,7 +445,7 @@ static void sam_putreg(struct sam_gmac_s *priv, uintptr_t address,
|
||||
{
|
||||
if (sam_checkreg(priv, true, regval, address))
|
||||
{
|
||||
ninfo("%08x<-%08x\n", address, regval);
|
||||
nllinfo("%08x<-%08x\n", address, regval);
|
||||
}
|
||||
|
||||
putreg32(regval, address);
|
||||
|
||||
@@ -729,7 +729,7 @@ static bool sam_checkreg(struct sam_dev_s *priv, bool wr, uint32_t value,
|
||||
{
|
||||
/* Yes... show how many times we did it */
|
||||
|
||||
mcinfo("...[Repeats %d times]...\n", priv->ntimes);
|
||||
mcllinfo("...[Repeats %d times]...\n", priv->ntimes);
|
||||
}
|
||||
|
||||
/* Save information about the new access */
|
||||
@@ -762,7 +762,7 @@ static inline uint32_t sam_getreg(struct sam_dev_s *priv, unsigned int offset)
|
||||
#ifdef CONFIG_SAMA5_HSMCI_REGDEBUG
|
||||
if (sam_checkreg(priv, false, value, address))
|
||||
{
|
||||
mcinfo("%08x->%08x\n", address, value);
|
||||
mcllinfo("%08x->%08x\n", address, value);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -785,7 +785,7 @@ static inline void sam_putreg(struct sam_dev_s *priv, uint32_t value,
|
||||
#ifdef CONFIG_SAMA5_HSMCI_REGDEBUG
|
||||
if (sam_checkreg(priv, true, value, address))
|
||||
{
|
||||
mcinfo("%08x<-%08x\n", address, value);
|
||||
mcllinfo("%08x<-%08x\n", address, value);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1017,7 +1017,7 @@ static bool sam_checkreg(bool wr, uint32_t regval, uintptr_t address)
|
||||
{
|
||||
/* Yes... show how many times we did it */
|
||||
|
||||
lcdinfo("...[Repeats %d times]...\n", g_lcdc.ntimes);
|
||||
lcdllinfo("...[Repeats %d times]...\n", g_lcdc.ntimes);
|
||||
}
|
||||
|
||||
/* Save information about the new access */
|
||||
@@ -1049,7 +1049,7 @@ static uint32_t sam_getreg(uintptr_t address)
|
||||
|
||||
if (sam_checkreg(false, regval, address))
|
||||
{
|
||||
lcdinfo("%08x->%08x\n", address, regval);
|
||||
lcdllinfo("%08x->%08x\n", address, regval);
|
||||
}
|
||||
|
||||
return regval;
|
||||
@@ -1069,7 +1069,7 @@ static void sam_putreg(uintptr_t address, uint32_t regval)
|
||||
{
|
||||
if (sam_checkreg(true, regval, address))
|
||||
{
|
||||
lcdinfo("%08x<-%08x\n", address, regval);
|
||||
lcdllinfo("%08x<-%08x\n", address, regval);
|
||||
}
|
||||
|
||||
putreg32(regval, address);
|
||||
|
||||
@@ -1163,7 +1163,7 @@ static void nand_dma_sampleinit(struct sam_nandcs_s *priv)
|
||||
#ifdef CONFIG_SAMA5_NAND_DMADEBUG
|
||||
static void nand_dma_sampledone(struct sam_nandcs_s *priv, int result)
|
||||
{
|
||||
finfo("result: %d\n", result);
|
||||
fllinfo("result: %d\n", result);
|
||||
|
||||
/* Sample the final registers */
|
||||
|
||||
@@ -3088,7 +3088,7 @@ bool nand_checkreg(bool wr, uintptr_t regaddr, uint32_t regval)
|
||||
{
|
||||
/* Yes... show how many times we did it */
|
||||
|
||||
finfo("...[Repeats %d times]...\n", g_nand.ntimes);
|
||||
fllinfo("...[Repeats %d times]...\n", g_nand.ntimes);
|
||||
}
|
||||
|
||||
/* Save information about the new access */
|
||||
|
||||
@@ -520,7 +520,7 @@ static uint8_t g_bufalloc[SAM_BUFALLOC]
|
||||
#ifdef CONFIG_SAMA5_OHCI_REGDEBUG
|
||||
static void sam_printreg(uint32_t addr, uint32_t val, bool iswrite)
|
||||
{
|
||||
uinfo("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
|
||||
ullinfo("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -570,7 +570,7 @@ static void sam_checkreg(uint32_t addr, uint32_t val, bool iswrite)
|
||||
{
|
||||
/* No.. More than one. */
|
||||
|
||||
uinfo("[repeats %d more times]\n", count);
|
||||
ullinfo("[repeats %d more times]\n", count);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -694,7 +694,7 @@ static bool pwm_checkreg(FAR struct sam_pwm_s *pwm, bool wr, uint32_t regval,
|
||||
{
|
||||
/* Yes... show how many times we did it */
|
||||
|
||||
pwminfo("...[Repeats %d times]...\n", pwm->count);
|
||||
pwmllinfo("...[Repeats %d times]...\n", pwm->count);
|
||||
}
|
||||
|
||||
/* Save information about the new access */
|
||||
@@ -738,7 +738,7 @@ static uint32_t pwm_getreg(struct sam_pwm_chan_s *chan, int offset)
|
||||
#ifdef CONFIG_SAMA5_PWM_REGDEBUG
|
||||
if (pwm_checkreg(&g_pwm, false, regval, regaddr))
|
||||
{
|
||||
pwminfo("%08x->%08x\n", regaddr, regval);
|
||||
pwmllinfo("%08x->%08x\n", regaddr, regval);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -755,7 +755,7 @@ static uint32_t pwm_getreg(struct sam_pwm_chan_s *chan, int offset)
|
||||
#ifdef CONFIG_SAMA5_PWM_REGDEBUG
|
||||
if (pwm_checkreg(pwm, false, regval, regaddr))
|
||||
{
|
||||
pwminfo("%08x->%08x\n", regaddr, regval);
|
||||
pwmllinfo("%08x->%08x\n", regaddr, regval);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -794,7 +794,7 @@ static uint32_t pwm_chan_getreg(struct sam_pwm_chan_s *chan, int offset)
|
||||
if (pwm_checkreg(chan->pwm, false, regval, regaddr))
|
||||
#endif
|
||||
{
|
||||
pwminfo("%08x->%08x\n", regaddr, regval);
|
||||
pwmllinfo("%08x->%08x\n", regaddr, regval);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -825,7 +825,7 @@ static void pwm_putreg(struct sam_pwm_chan_s *chan, int offset,
|
||||
#ifdef CONFIG_SAMA5_PWM_REGDEBUG
|
||||
if (pwm_checkreg(&g_pwm, true, regval, regaddr))
|
||||
{
|
||||
pwminfo("%08x<-%08x\n", regaddr, regval);
|
||||
pwmllinfo("%08x<-%08x\n", regaddr, regval);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -838,7 +838,7 @@ static void pwm_putreg(struct sam_pwm_chan_s *chan, int offset,
|
||||
#ifdef CONFIG_SAMA5_PWM_REGDEBUG
|
||||
if (pwm_checkreg(pwm, true, regval, regaddr))
|
||||
{
|
||||
pwminfo("%08x<-%08x\n", regaddr, regval);
|
||||
pwmllinfo("%08x<-%08x\n", regaddr, regval);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -874,7 +874,7 @@ static void pwm_chan_putreg(struct sam_pwm_chan_s *chan, int offset,
|
||||
if (pwm_checkreg(chan->pwm, true, regval, regaddr))
|
||||
#endif
|
||||
{
|
||||
pwminfo("%08x<-%08x\n", regaddr, regval);
|
||||
pwmllinfo("%08x<-%08x\n", regaddr, regval);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -413,7 +413,7 @@ static bool spi_checkreg(struct sam_spidev_s *spi, bool wr, uint32_t value,
|
||||
{
|
||||
/* Yes... show how many times we did it */
|
||||
|
||||
spiinfo("...[Repeats %d times]...\n", spi->ntimes);
|
||||
spillinfo("...[Repeats %d times]...\n", spi->ntimes);
|
||||
}
|
||||
|
||||
/* Save information about the new access */
|
||||
@@ -447,7 +447,7 @@ static inline uint32_t spi_getreg(struct sam_spidev_s *spi,
|
||||
#ifdef CONFIG_SAMA5_SPI_REGDEBUG
|
||||
if (spi_checkreg(spi, false, value, address))
|
||||
{
|
||||
spiinfo("%08x->%08x\n", address, value);
|
||||
spillinfo("%08x->%08x\n", address, value);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -470,7 +470,7 @@ static inline void spi_putreg(struct sam_spidev_s *spi, uint32_t value,
|
||||
#ifdef CONFIG_SAMA5_SPI_REGDEBUG
|
||||
if (spi_checkreg(spi, true, value, address))
|
||||
{
|
||||
spiinfo("%08x<-%08x\n", address, value);
|
||||
spillinfo("%08x<-%08x\n", address, value);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -703,7 +703,7 @@ static bool ssc_checkreg(struct sam_ssc_s *priv, bool wr, uint32_t regval,
|
||||
{
|
||||
/* Yes... show how many times we did it */
|
||||
|
||||
i2sinfo("...[Repeats %d times]...\n", priv->count);
|
||||
i2sllinfo("...[Repeats %d times]...\n", priv->count);
|
||||
}
|
||||
|
||||
/* Save information about the new access */
|
||||
@@ -737,7 +737,7 @@ static inline uint32_t ssc_getreg(struct sam_ssc_s *priv,
|
||||
#ifdef CONFIG_SAMA5_SSC_REGDEBUG
|
||||
if (ssc_checkreg(priv, false, regval, regaddr))
|
||||
{
|
||||
i2sinfo("%08x->%08x\n", regaddr, regval);
|
||||
i2sllinfo("%08x->%08x\n", regaddr, regval);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -760,7 +760,7 @@ static inline void ssc_putreg(struct sam_ssc_s *priv, unsigned int offset,
|
||||
#ifdef CONFIG_SAMA5_SSC_REGDEBUG
|
||||
if (ssc_checkreg(priv, true, regval, regaddr))
|
||||
{
|
||||
i2sinfo("%08x<-%08x\n", regaddr, regval);
|
||||
i2sllinfo("%08x<-%08x\n", regaddr, regval);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -1090,7 +1090,7 @@ static void ssc_dma_sampleinit(struct sam_ssc_s *priv,
|
||||
#if defined(CONFIG_SAMA5_SSC_DMADEBUG) && defined(SSC_HAVE_RX)
|
||||
static void ssc_rxdma_sampledone(struct sam_ssc_s *priv, int result)
|
||||
{
|
||||
i2sinfo("result: %d\n", result);
|
||||
i2sllinfo("result: %d\n", result);
|
||||
|
||||
/* Sample the final registers */
|
||||
|
||||
@@ -1155,7 +1155,7 @@ static void ssc_rxdma_sampledone(struct sam_ssc_s *priv, int result)
|
||||
#if defined(CONFIG_SAMA5_SSC_DMADEBUG) && defined(SSC_HAVE_TX)
|
||||
static void ssc_txdma_sampledone(struct sam_ssc_s *priv, int result)
|
||||
{
|
||||
i2sinfo("result: %d\n", result);
|
||||
i2sllinfo("result: %d\n", result);
|
||||
|
||||
/* Sample the final registers */
|
||||
|
||||
|
||||
@@ -562,7 +562,7 @@ static bool sam_checkreg(struct sam_tc_s *tc, bool wr, uint32_t regaddr,
|
||||
{
|
||||
/* Yes... show how many times we did it */
|
||||
|
||||
tminfo("...[Repeats %d times]...\n", tc->ntimes);
|
||||
tmllinfo("...[Repeats %d times]...\n", tc->ntimes);
|
||||
}
|
||||
|
||||
/* Save information about the new access */
|
||||
@@ -597,7 +597,7 @@ static inline uint32_t sam_tc_getreg(struct sam_chan_s *chan,
|
||||
#ifdef CONFIG_SAMA5_TC_REGDEBUG
|
||||
if (sam_checkreg(tc, false, regaddr, regval))
|
||||
{
|
||||
tminfo("%08x->%08x\n", regaddr, regval);
|
||||
tmllinfo("%08x->%08x\n", regaddr, regval);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -621,7 +621,7 @@ static inline void sam_tc_putreg(struct sam_chan_s *chan, uint32_t regval,
|
||||
#ifdef CONFIG_SAMA5_TC_REGDEBUG
|
||||
if (sam_checkreg(tc, true, regaddr, regval))
|
||||
{
|
||||
tminfo("%08x<-%08x\n", regaddr, regval);
|
||||
tmllinfo("%08x<-%08x\n", regaddr, regval);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -645,7 +645,7 @@ static inline uint32_t sam_chan_getreg(struct sam_chan_s *chan,
|
||||
#ifdef CONFIG_SAMA5_TC_REGDEBUG
|
||||
if (sam_checkreg(chan->tc, false, regaddr, regval))
|
||||
{
|
||||
tminfo("%08x->%08x\n", regaddr, regval);
|
||||
tmllinfo("%08x->%08x\n", regaddr, regval);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -668,7 +668,7 @@ static inline void sam_chan_putreg(struct sam_chan_s *chan, unsigned int offset,
|
||||
#ifdef CONFIG_SAMA5_TC_REGDEBUG
|
||||
if (sam_checkreg(chan->tc, true, regaddr, regval))
|
||||
{
|
||||
tminfo("%08x<-%08x\n", regaddr, regval);
|
||||
tmllinfo("%08x<-%08x\n", regaddr, regval);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -373,7 +373,7 @@ static bool twi_checkreg(struct twi_dev_s *priv, bool wr, uint32_t value,
|
||||
{
|
||||
/* 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 */
|
||||
@@ -405,7 +405,7 @@ static uint32_t twi_getabs(struct twi_dev_s *priv, uintptr_t address)
|
||||
|
||||
if (twi_checkreg(priv, false, value, address))
|
||||
{
|
||||
i2cinfo("%08x->%08x\n", address, value);
|
||||
i2cllinfo("%08x->%08x\n", address, value);
|
||||
}
|
||||
|
||||
return value;
|
||||
@@ -426,7 +426,7 @@ static void twi_putabs(struct twi_dev_s *priv, uintptr_t address,
|
||||
{
|
||||
if (twi_checkreg(priv, true, value, address))
|
||||
{
|
||||
i2cinfo("%08x<-%08x\n", address, value);
|
||||
i2cllinfo("%08x<-%08x\n", address, value);
|
||||
}
|
||||
|
||||
putreg32(value, address);
|
||||
|
||||
@@ -667,7 +667,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
|
||||
#ifdef CONFIG_SAMA5_UDPHS_REGDEBUG
|
||||
static void sam_printreg(uintptr_t regaddr, uint32_t regval, bool iswrite)
|
||||
{
|
||||
uinfo("%p%s%08x\n", regaddr, iswrite ? "<-" : "->", regval);
|
||||
ullinfo("%p%s%08x\n", regaddr, iswrite ? "<-" : "->", regval);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -718,7 +718,7 @@ static void sam_checkreg(uintptr_t regaddr, uint32_t regval, bool iswrite)
|
||||
{
|
||||
/* No.. More than one. */
|
||||
|
||||
uinfo("[repeats %d more times]\n", count);
|
||||
ullinfo("[repeats %d more times]\n", count);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -798,31 +798,31 @@ static void sam_dumpep(struct sam_usbdev_s *priv, int epno)
|
||||
{
|
||||
/* Global Registers */
|
||||
|
||||
uinfo("Global Register:\n");
|
||||
uinfo(" CTRL: %04x\n", sam_getreg(SAM_UDPHS_CTRL));
|
||||
uinfo(" FNUM: %04x\n", sam_getreg(SAM_UDPHS_FNUM));
|
||||
uinfo(" IEN: %04x\n", sam_getreg(SAM_UDPHS_IEN));
|
||||
uinfo(" INSTA: %04x\n", sam_getreg(SAM_UDPHS_INTSTA));
|
||||
uinfo(" TST: %04x\n", sam_getreg(SAM_UDPHS_TST));
|
||||
ullinfo("Global Register:\n");
|
||||
ullinfo(" CTRL: %04x\n", sam_getreg(SAM_UDPHS_CTRL));
|
||||
ullinfo(" FNUM: %04x\n", sam_getreg(SAM_UDPHS_FNUM));
|
||||
ullinfo(" IEN: %04x\n", sam_getreg(SAM_UDPHS_IEN));
|
||||
ullinfo(" INSTA: %04x\n", sam_getreg(SAM_UDPHS_INTSTA));
|
||||
ullinfo(" TST: %04x\n", sam_getreg(SAM_UDPHS_TST));
|
||||
|
||||
/* Endpoint registers */
|
||||
|
||||
uinfo("Endpoint %d Register:\n", epno);
|
||||
uinfo(" CFG: %04x\n", sam_getreg(SAM_UDPHS_EPTCFG(epno)));
|
||||
uinfo(" CTL: %04x\n", sam_getreg(SAM_UDPHS_EPTCTL(epno)));
|
||||
uinfo(" STA: %04x\n", sam_getreg(SAM_UDPHS_EPTSTA(epno)));
|
||||
ullinfo("Endpoint %d Register:\n", epno);
|
||||
ullinfo(" CFG: %04x\n", sam_getreg(SAM_UDPHS_EPTCFG(epno)));
|
||||
ullinfo(" CTL: %04x\n", sam_getreg(SAM_UDPHS_EPTCTL(epno)));
|
||||
ullinfo(" STA: %04x\n", sam_getreg(SAM_UDPHS_EPTSTA(epno)));
|
||||
|
||||
uinfo("DMA %d Register:\n", epno);
|
||||
ullinfo("DMA %d Register:\n", epno);
|
||||
if ((SAM_EPSET_DMA & SAM_EP_BIT(epno)) != 0)
|
||||
{
|
||||
uinfo(" NXTDSC: %04x\n", sam_getreg(SAM_UDPHS_DMANXTDSC(epno)));
|
||||
uinfo(" ADDRESS: %04x\n", sam_getreg(SAM_UDPHS_DMAADDRESS(epno)));
|
||||
uinfo(" CONTROL: %04x\n", sam_getreg(SAM_UDPHS_DMACONTROL(epno)));
|
||||
uinfo(" STATUS: %04x\n", sam_getreg(SAM_UDPHS_DMASTATUS(epno)));
|
||||
ullinfo(" NXTDSC: %04x\n", sam_getreg(SAM_UDPHS_DMANXTDSC(epno)));
|
||||
ullinfo(" ADDRESS: %04x\n", sam_getreg(SAM_UDPHS_DMAADDRESS(epno)));
|
||||
ullinfo(" CONTROL: %04x\n", sam_getreg(SAM_UDPHS_DMACONTROL(epno)));
|
||||
ullinfo(" STATUS: %04x\n", sam_getreg(SAM_UDPHS_DMASTATUS(epno)));
|
||||
}
|
||||
else
|
||||
{
|
||||
uinfo(" None\n");
|
||||
ullinfo(" None\n");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -190,7 +190,7 @@ static uint32_t sam_getreg(uintptr_t regaddr)
|
||||
{
|
||||
if (count == 4)
|
||||
{
|
||||
wdinfo("...\n");
|
||||
wdllinfo("...\n");
|
||||
}
|
||||
|
||||
return regval;
|
||||
@@ -207,7 +207,7 @@ static uint32_t sam_getreg(uintptr_t regaddr)
|
||||
{
|
||||
/* 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 */
|
||||
@@ -219,7 +219,7 @@ static uint32_t sam_getreg(uintptr_t regaddr)
|
||||
|
||||
/* Show the register value read */
|
||||
|
||||
wdinfo("%08x->%048\n", regaddr, regval);
|
||||
wdllinfo("%08x->%048\n", regaddr, regval);
|
||||
return regval;
|
||||
}
|
||||
#endif
|
||||
@@ -237,7 +237,7 @@ static void sam_putreg(uint32_t regval, uintptr_t regaddr)
|
||||
{
|
||||
/* Show the register value being written */
|
||||
|
||||
wdinfo("%08x<-%08x\n", regaddr, regval);
|
||||
wdllinfo("%08x<-%08x\n", regaddr, regval);
|
||||
|
||||
/* Write the value */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user