Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-07 01:05:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

STM32: In big change off err() to info(), several debug statements lost their ll property.

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-18 07:40:27 -06:00
parent 3fa41c0f18
commit d20128cc11
7 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/stm32/stm32_eth.c
+5 -5
View File
@@ -769,7 +769,7 @@ static uint32_t stm32_getreg(uint32_t addr)
{
if (count == 4)
{
ninfo("...\n");
nllinfo("...\n");
}
return val;
@@ -786,7 +786,7 @@ static uint32_t stm32_getreg(uint32_t addr)
{
/* Yes.. then show how many times the value repeated */
ninfo("[repeats %d more times]\n", count-3);
nllinfo("[repeats %d more times]\n", count-3);
}
/* Save the new address, value, and count */
@@ -798,7 +798,7 @@ static uint32_t stm32_getreg(uint32_t addr)
/* Show the register value read */
ninfo("%08x->%08x\n", addr, val);
nllinfo("%08x->%08x\n", addr, val);
return val;
}
#endif
@@ -820,12 +820,12 @@ static uint32_t stm32_getreg(uint32_t addr)
*
****************************************************************************/
#ifdef CONFIG_STM32_ETHMAC_REGDEBUG
#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void stm32_putreg(uint32_t val, uint32_t addr)
{
/* Show the register value being written */
ninfo("%08x<-%08x\n", addr, val);
nllinfo("%08x<-%08x\n", addr, val);
/* Write the value */
arch/arm/src/stm32/stm32_iwdg.c
+4 -4
View File
@@ -206,7 +206,7 @@ static uint16_t stm32_getreg(uint32_t addr)
{
if (count == 4)
{
wdinfo("...\n");
wdllinfo("...\n");
}
return val;
@@ -223,7 +223,7 @@ static uint16_t stm32_getreg(uint32_t addr)
{
/* 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 */
@@ -235,7 +235,7 @@ static uint16_t stm32_getreg(uint32_t addr)
/* Show the register value read */
wdinfo("%08x->%04x\n", addr, val);
wdllinfo("%08x->%04x\n", addr, val);
return val;
}
#endif
@@ -253,7 +253,7 @@ static void stm32_putreg(uint16_t val, uint32_t addr)
{
/* Show the register value being written */
wdinfo("%08x<-%04x\n", addr, val);
wdllinfo("%08x<-%04x\n", addr, val);
/* Write the value */
arch/arm/src/stm32/stm32_otgfshost.c
+2 -2
View File
@@ -506,7 +506,7 @@ static struct usbhost_connection_s g_usbconn =
#ifdef CONFIG_STM32_USBHOST_REGDEBUG
static void stm32_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
@@ -556,7 +556,7 @@ static void stm32_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);
}
}
arch/arm/src/stm32/stm32_otghsdev.c
+4 -4
View File
@@ -817,7 +817,7 @@ static uint32_t stm32_getreg(uint32_t addr)
{
if (count == 4)
{
uinfo("...\n");
ullinfo("...\n");
}
return val;
@@ -834,7 +834,7 @@ static uint32_t stm32_getreg(uint32_t addr)
{
/* Yes.. then show how many times the value repeated */
uinfo("[repeats %d more times]\n", count-3);
ullinfo("[repeats %d more times]\n", count-3);
}
/* Save the new address, value, and count */
@@ -846,7 +846,7 @@ static uint32_t stm32_getreg(uint32_t addr)
/* Show the register value read */
uinfo("%08x->%08x\n", addr, val);
ullinfo("%08x->%08x\n", addr, val);
return val;
}
#endif
@@ -864,7 +864,7 @@ static void stm32_putreg(uint32_t val, uint32_t addr)
{
/* Show the register value being written */
uinfo("%08x<-%08x\n", addr, val);
ullinfo("%08x<-%08x\n", addr, val);
/* Write the value */
arch/arm/src/stm32/stm32_otghshost.c
+2 -2
View File
@@ -506,7 +506,7 @@ static struct usbhost_connection_s g_usbconn =
#ifdef CONFIG_STM32_USBHOST_REGDEBUG
static void stm32_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
@@ -556,7 +556,7 @@ static void stm32_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);
}
}
arch/arm/src/stm32/stm32_usbdev.c
+21 -21
View File
@@ -674,7 +674,7 @@ static uint16_t stm32_getreg(uint32_t addr)
{
if (count == 4)
{
uinfo("...\n");
ullinfo("...\n");
}
return val;
}
@@ -690,7 +690,7 @@ static uint16_t stm32_getreg(uint32_t addr)
{
/* Yes.. then show how many times the value repeated */
uinfo("[repeats %d more times]\n", count-3);
ullinfo("[repeats %d more times]\n", count-3);
}
/* Save the new address, value, and count */
@@ -702,7 +702,7 @@ static uint16_t stm32_getreg(uint32_t addr)
/* Show the register value read */
uinfo("%08x->%04x\n", addr, val);
ullinfo("%08x->%04x\n", addr, val);
return val;
}
#endif
@@ -716,7 +716,7 @@ static void stm32_putreg(uint16_t val, uint32_t addr)
{
/* Show the register value being written */
uinfo("%08x<-%04x\n", addr, val);
ullinfo("%08x<-%04x\n", addr, val);
/* Write the value */
@@ -735,35 +735,35 @@ static void stm32_dumpep(int epno)
/* Common registers */
uinfo("CNTR: %04x\n", getreg16(STM32_USB_CNTR));
uinfo("ISTR: %04x\n", getreg16(STM32_USB_ISTR));
uinfo("FNR: %04x\n", getreg16(STM32_USB_FNR));
uinfo("DADDR: %04x\n", getreg16(STM32_USB_DADDR));
uinfo("BTABLE: %04x\n", getreg16(STM32_USB_BTABLE));
ullinfo("CNTR: %04x\n", getreg16(STM32_USB_CNTR));
ullinfo("ISTR: %04x\n", getreg16(STM32_USB_ISTR));
ullinfo("FNR: %04x\n", getreg16(STM32_USB_FNR));
ullinfo("DADDR: %04x\n", getreg16(STM32_USB_DADDR));
ullinfo("BTABLE: %04x\n", getreg16(STM32_USB_BTABLE));
/* Endpoint register */
addr = STM32_USB_EPR(epno);
uinfo("EPR%d: [%08x] %04x\n", epno, addr, getreg16(addr));
ullinfo("EPR%d: [%08x] %04x\n", epno, addr, getreg16(addr));
/* Endpoint descriptor */
addr = STM32_USB_BTABLE_ADDR(epno, 0);
uinfo("DESC: %08x\n", addr);
ullinfo("DESC: %08x\n", addr);
/* Endpoint buffer descriptor */
addr = STM32_USB_ADDR_TX(epno);
uinfo(" TX ADDR: [%08x] %04x\n", addr, getreg16(addr));
ullinfo(" TX ADDR: [%08x] %04x\n", addr, getreg16(addr));
addr = STM32_USB_COUNT_TX(epno);
uinfo(" COUNT: [%08x] %04x\n", addr, getreg16(addr));
ullinfo(" COUNT: [%08x] %04x\n", addr, getreg16(addr));
addr = STM32_USB_ADDR_RX(epno);
uinfo(" RX ADDR: [%08x] %04x\n", addr, getreg16(addr));
ullinfo(" RX ADDR: [%08x] %04x\n", addr, getreg16(addr));
addr = STM32_USB_COUNT_RX(epno);
uinfo(" COUNT: [%08x] %04x\n", addr, getreg16(addr));
ullinfo(" COUNT: [%08x] %04x\n", addr, getreg16(addr));
}
#endif
@@ -778,7 +778,7 @@ static void stm32_checksetup(void)
uint32_t apb1rstr = getreg32(STM32_RCC_APB1RSTR);
uint32_t apb1enr = getreg32(STM32_RCC_APB1ENR);
uinfo("CFGR: %08x APB1RSTR: %08x APB1ENR: %08x\n", cfgr, apb1rstr, apb1enr);
ullinfo("CFGR: %08x APB1RSTR: %08x APB1ENR: %08x\n", cfgr, apb1rstr, apb1enr);
if ((apb1rstr & RCC_APB1RSTR_USBRST) != 0 ||
(apb1enr & RCC_APB1ENR_USBEN) == 0)
@@ -2845,7 +2845,7 @@ static int stm32_epconfigure(struct usbdev_ep_s *ep,
if (!ep || !desc)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
uerr("ERROR: ep=%p desc=%p\n");
ullerr("ERROR: ep=%p desc=%p\n");
return -EINVAL;
}
#endif
@@ -2941,7 +2941,7 @@ static int stm32_epdisable(struct usbdev_ep_s *ep)
if (!ep)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
uerr("ERROR: ep=%p\n", ep);
ullerr("ERROR: ep=%p\n", ep);
return -EINVAL;
}
#endif
@@ -3029,7 +3029,7 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
if (!req || !req->callback || !req->buf || !ep)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
uerr("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
ullerr("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
return -EINVAL;
}
#endif
@@ -3041,7 +3041,7 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
if (!priv->driver)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
uerr("ERROR: driver=%p\n", priv->driver);
ullerr("ERROR: driver=%p\n", priv->driver);
return -ESHUTDOWN;
}
#endif
@@ -3058,7 +3058,7 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
if (privep->stalled)
{
stm32_abortrequest(privep, privreq, -EBUSY);
uerr("ERROR: stalled\n");
ullerr("ERROR: stalled\n");
ret = -EBUSY;
}
arch/arm/src/stm32/stm32_wwdg.c
+4 -4
View File
@@ -190,7 +190,7 @@ static uint16_t stm32_getreg(uint32_t addr)
{
if (count == 4)
{
wdinfo("...\n");
wdllinfo("...\n");
}
return val;
@@ -207,7 +207,7 @@ static uint16_t stm32_getreg(uint32_t addr)
{
/* 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 uint16_t stm32_getreg(uint32_t addr)
/* Show the register value read */
wdinfo("%08x->%04x\n", addr, val);
wdllinfo("%08x->%04x\n", addr, val);
return val;
}
#endif
@@ -237,7 +237,7 @@ static void stm32_putreg(uint16_t val, uint32_t addr)
{
/* Show the register value being written */
wdinfo("%08x<-%04x\n", addr, val);
wdllinfo("%08x<-%04x\n", addr, val);
/* Write the value */