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

LPC31xx: Convert *err() to either *info() or add ERROR:, depending on if an error is reported

Browse Source
This commit is contained in:
Gregory Nutt 2016-06-17 10:56:45 -06:00
parent 349748dd7e
commit 3077cbfc66
5 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/src/lpc31xx/Kconfig
View File

@ -243,11 +243,11 @@ config LPC31_USBDEV_DMA
config LPC31_USBDEV_REGDEBUG
bool "Register level debug"
depends on DEBUG_FEATURES
depends on DEBUG_USB_INFO
default n
---help---
Output detailed register-level USB device debug information. Requires
also CONFIG_DEBUG_FEATURES.
also CONFIG_DEBUG_USB_INFO.
endmenu # USB device driver controller (DCD) options
endif # LPC31_USBOTG && USBDEV
@ -301,7 +301,7 @@ config LPC31_EHCI_PREALLOCATE
config LPC31_EHCI_REGDEBUG
bool "Enable low-level EHCI register debug"
default n
depends on DEBUG_FEATURES
depends on DEBUG_USB_INFO
endmenu # USB host controller driver (HCD) options
endif # LPC31_USBOTG && USBHOST
@ -310,9 +310,9 @@ menu "SPI device driver options"
config LPC31_SPI_REGDEBUG
bool "SPI Register level debug"
depends on LPC31_SPI && DEBUG_FEATURES
depends on LPC31_SPI && DEBUG_SPI_INFO
default n
---help---
Output detailed register-level SPI device debug information. Requires also CONFIG_DEBUG_FEATURES.
Output detailed register-level SPI device debug information. Requires also CONFIG_DEBUG_SPI_INFO.
endmenu # SPI device driver options

34
arch/arm/src/lpc31xx/lpc31_ehci.c
View File

@ -113,7 +113,7 @@
/* Debug options */
#ifndef CONFIG_DEBUG_FEATURES
#ifndef CONFIG_DEBUG_USB_INFO
# undef CONFIG_LPC31_EHCI_REGDEBUG
#endif
@ -826,7 +826,7 @@ static uint32_t lpc31_swap32(uint32_t value)
static void lpc31_printreg(volatile uint32_t *regaddr, uint32_t regval,
bool iswrite)
{
_llerr("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval);
ullinfo("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval);
}
#endif
@ -877,7 +877,7 @@ static void lpc31_checkreg(volatile uint32_t *regaddr, uint32_t regval, bool isw
{
/* No.. More than one. */
_llerr("[repeats %d more times]\n", count);
ullinfo("[repeats %d more times]\n", count);
}
}
@ -1456,11 +1456,11 @@ static int lpc31_qh_flush(struct lpc31_qh_s *qh)
#ifdef CONFIG_LPC31_EHCI_REGDEBUG
static void lpc31_qtd_print(struct lpc31_qtd_s *qtd)
{
uerr(" QTD[%p]:\n", qtd);
uerr(" hw:\n");
uerr(" nqp: %08x alt: %08x token: %08x\n",
uinfo(" QTD[%p]:\n", qtd);
uinfo(" hw:\n");
uinfo(" nqp: %08x alt: %08x token: %08x\n",
qtd->hw.nqp, qtd->hw.alt, qtd->hw.token);
uerr(" bpl: %08x %08x %08x %08x %08x\n",
uinfo(" bpl: %08x %08x %08x %08x %08x\n",
qtd->hw.bpl[0], qtd->hw.bpl[1], qtd->hw.bpl[2],
qtd->hw.bpl[3], qtd->hw.bpl[4]);
}
@ -1480,29 +1480,29 @@ static void lpc31_qh_print(struct lpc31_qh_s *qh)
struct lpc31_epinfo_s *epinfo;
struct ehci_overlay_s *overlay;
uerr("QH[%p]:\n", qh);
uerr(" hw:\n");
uerr(" hlp: %08x epchar: %08x epcaps: %08x cqp: %08x\n",
uinfo("QH[%p]:\n", qh);
uinfo(" hw:\n");
uinfo(" hlp: %08x epchar: %08x epcaps: %08x cqp: %08x\n",
qh->hw.hlp, qh->hw.epchar, qh->hw.epcaps, qh->hw.cqp);
overlay = &qh->hw.overlay;
uerr(" overlay:\n");
uerr(" nqp: %08x alt: %08x token: %08x\n",
uinfo(" overlay:\n");
uinfo(" nqp: %08x alt: %08x token: %08x\n",
overlay->nqp, overlay->alt, overlay->token);
uerr(" bpl: %08x %08x %08x %08x %08x\n",
uinfo(" bpl: %08x %08x %08x %08x %08x\n",
overlay->bpl[0], overlay->bpl[1], overlay->bpl[2],
overlay->bpl[3], overlay->bpl[4]);
uerr(" fqp:\n", qh->fqp);
uinfo(" fqp:\n", qh->fqp);
epinfo = qh->epinfo;
uerr(" epinfo[%p]:\n", epinfo);
uinfo(" epinfo[%p]:\n", epinfo);
if (epinfo)
{
uerr(" EP%d DIR=%s FA=%08x TYPE=%d MaxPacket=%d\n",
uinfo(" EP%d DIR=%s FA=%08x TYPE=%d MaxPacket=%d\n",
epinfo->epno, epinfo->dirin ? "IN" : "OUT", epinfo->devaddr,
epinfo->xfrtype, epinfo->maxpacket);
uerr(" Toggle=%d iocwait=%d speed=%d result=%d\n",
uinfo(" Toggle=%d iocwait=%d speed=%d result=%d\n",
epinfo->toggle, epinfo->iocwait, epinfo->speed, epinfo->result);
}
}

2
arch/arm/src/lpc31xx/lpc31_serial.c
View File

@ -560,7 +560,7 @@ static int up_interrupt(int irq, void *context)
default:
{
_err("Unexpected IIR: %02x\n", status);
_err("ERROR: Unexpected IIR: %02x\n", status);
break;
}
}

10
arch/arm/src/lpc31xx/lpc31_spi.c
View File

@ -66,7 +66,7 @@
* CONFIG_DEBUG_FEATURES must also be defined
*/
#ifndef CONFIG_DEBUG_FEATURES
#ifndef CONFIG_DEBUG_SPI_INFO
# undef CONFIG_LPC31_SPI_REGDEBUG
#endif
@ -207,7 +207,7 @@ static bool spi_checkreg(bool wr, uint32_t value, uint32_t address)
{
if (g_ntimes > 0)
{
_llerr("...[Repeats %d times]...\n", g_ntimes);
spillinfo("...[Repeats %d times]...\n", g_ntimes);
}
g_wrlast = wr;
@ -239,7 +239,7 @@ static void spi_putreg(uint32_t value, uint32_t address)
{
if (spi_checkreg(true, value, address))
{
_llerr("%08x<-%08x\n", address, value);
spillinfo("%08x<-%08x\n", address, value);
}
putreg32(value, address);
}
@ -265,7 +265,7 @@ static uint32_t spi_getreg(uint32_t address)
uint32_t value = getreg32(address);
if (spi_checkreg(false, value, address))
{
_llerr("%08x->%08x\n", address, value);
spillinfo("%08x->%08x\n", address, value);
}
return value;
}
@ -921,7 +921,7 @@ FAR struct spi_dev_s *lpc31_spibus_initialize(int port)
*/
#ifdef CONFIG_LPC31_SPI_REGDEBUG
_llerr("PINS: %08x MODE0: %08x MODE1: %08x\n",
spiinfo("PINS: %08x MODE0: %08x MODE1: %08x\n",
spi_getreg(LPC31_IOCONFIG_SPI_PINS),
spi_getreg(LPC31_IOCONFIG_SPI_MODE0),
spi_getreg(LPC31_IOCONFIG_SPI_MODE1));

14
arch/arm/src/lpc31xx/lpc31_usbdev.c
View File

@ -343,7 +343,7 @@ struct lpc31_usbdev_s
/* Register operations ********************************************************/
#if defined(CONFIG_LPC31_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
#ifdef CONFIG_LPC31_USBDEV_REGDEBUG
static uint32_t lpc31_getreg(uint32_t addr);
static void lpc31_putreg(uint32_t val, uint32_t addr);
#else
@ -480,7 +480,7 @@ static const struct usbdev_ops_s g_devops =
*
****************************************************************************/
#if defined(CONFIG_LPC31_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
#ifdef CONFIG_LPC31_USBDEV_REGDEBUG
static uint32_t lpc31_getreg(uint32_t addr)
{
static uint32_t prevaddr = 0;
@ -501,7 +501,7 @@ static uint32_t lpc31_getreg(uint32_t addr)
{
if (count == 4)
{
_llerr("...\n");
ullinfo("...\n");
}
return val;
@ -518,7 +518,7 @@ static uint32_t lpc31_getreg(uint32_t addr)
{
/* Yes.. then show how many times the value repeated */
_llerr("[repeats %d more times]\n", count-3);
ullinfo("[repeats %d more times]\n", count-3);
}
/* Save the new address, value, and count */
@ -530,7 +530,7 @@ static uint32_t lpc31_getreg(uint32_t addr)
/* Show the register value read */
_llerr("%08x->%08x\n", addr, val);
ullinfo("%08x->%08x\n", addr, val);
return val;
}
#endif
@ -543,12 +543,12 @@ static uint32_t lpc31_getreg(uint32_t addr)
*
****************************************************************************/
#if defined(CONFIG_LPC31_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
#ifdef CONFIG_LPC31_USBDEV_REGDEBUG
static void lpc31_putreg(uint32_t val, uint32_t addr)
{
/* Show the register value being written */
_llerr("%08x<-%08x\n", addr, val);
ullinfo("%08x<-%08x\n", addr, val);
/* Write the value */