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

One more time. Correct name of USB debug macros are uinfo and uerr, not usbinfo and usberr.

Browse Source
This commit is contained in:
Gregory Nutt 2016-06-16 13:36:04 -06:00
parent dd7297fb64
commit ae13471244
5 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/src/stm32/stm32_otgfsdev.c
View File

@ -817,7 +817,7 @@ static uint32_t stm32_getreg(uint32_t addr)
{
if (count == 4)
{
usbinfo("...\n");
uinfo("...\n");
}
return val;
@ -834,7 +834,7 @@ static uint32_t stm32_getreg(uint32_t addr)
{
/* Yes.. then show how many times the value repeated */
usbinfo("[repeats %d more times]\n", count-3);
uinfo("[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 */
usbinfo("%08x->%08x\n", addr, val);
uinfo("%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 */
usbinfo("%08x<-%08x\n", addr, val);
uinfo("%08x<-%08x\n", addr, val);
/* Write the value */

4
arch/arm/src/stm32/stm32_otgfshost.c
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)
{
usbinfo("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
uinfo("%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. */
usbinfo("[repeats %d more times]\n", count);
uinfo("[repeats %d more times]\n", count);
}
}

8
arch/arm/src/stm32/stm32_otghsdev.c
View File

@ -817,7 +817,7 @@ static uint32_t stm32_getreg(uint32_t addr)
{
if (count == 4)
{
usbinfo("...\n");
uinfo("...\n");
}
return val;
@ -834,7 +834,7 @@ static uint32_t stm32_getreg(uint32_t addr)
{
/* Yes.. then show how many times the value repeated */
usbinfo("[repeats %d more times]\n", count-3);
uinfo("[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 */
usbinfo("%08x->%08x\n", addr, val);
uinfo("%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 */
usbinfo("%08x<-%08x\n", addr, val);
uinfo("%08x<-%08x\n", addr, val);
/* Write the value */

4
arch/arm/src/stm32/stm32_otghshost.c
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)
{
usbinfo("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
uinfo("%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. */
usbinfo("[repeats %d more times]\n", count);
uinfo("[repeats %d more times]\n", count);
}
}

44
arch/arm/src/stm32/stm32_usbdev.c
View File

@ -674,7 +674,7 @@ static uint16_t stm32_getreg(uint32_t addr)
{
if (count == 4)
{
usbinfo("...\n");
uinfo("...\n");
}
return val;
}
@ -690,7 +690,7 @@ static uint16_t stm32_getreg(uint32_t addr)
{
/* Yes.. then show how many times the value repeated */
usbinfo("[repeats %d more times]\n", count-3);
uinfo("[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 */
usbinfo("%08x->%04x\n", addr, val);
uinfo("%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 */
usbinfo("%08x<-%04x\n", addr, val);
uinfo("%08x<-%04x\n", addr, val);
/* Write the value */
@ -735,35 +735,35 @@ static void stm32_dumpep(int epno)
/* Common registers */
usbinfo("CNTR: %04x\n", getreg16(STM32_USB_CNTR));
usbinfo("ISTR: %04x\n", getreg16(STM32_USB_ISTR));
usbinfo("FNR: %04x\n", getreg16(STM32_USB_FNR));
usbinfo("DADDR: %04x\n", getreg16(STM32_USB_DADDR));
usbinfo("BTABLE: %04x\n", getreg16(STM32_USB_BTABLE));
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));
/* Endpoint register */
addr = STM32_USB_EPR(epno);
usbinfo("EPR%d: [%08x] %04x\n", epno, addr, getreg16(addr));
uinfo("EPR%d: [%08x] %04x\n", epno, addr, getreg16(addr));
/* Endpoint descriptor */
addr = STM32_USB_BTABLE_ADDR(epno, 0);
usbinfo("DESC: %08x\n", addr);
uinfo("DESC: %08x\n", addr);
/* Endpoint buffer descriptor */
addr = STM32_USB_ADDR_TX(epno);
usbinfo(" TX ADDR: [%08x] %04x\n", addr, getreg16(addr));
uinfo(" TX ADDR: [%08x] %04x\n", addr, getreg16(addr));
addr = STM32_USB_COUNT_TX(epno);
usbinfo(" COUNT: [%08x] %04x\n", addr, getreg16(addr));
uinfo(" COUNT: [%08x] %04x\n", addr, getreg16(addr));
addr = STM32_USB_ADDR_RX(epno);
usbinfo(" RX ADDR: [%08x] %04x\n", addr, getreg16(addr));
uinfo(" RX ADDR: [%08x] %04x\n", addr, getreg16(addr));
addr = STM32_USB_COUNT_RX(epno);
usbinfo(" COUNT: [%08x] %04x\n", addr, getreg16(addr));
uinfo(" COUNT: [%08x] %04x\n", addr, getreg16(addr));
}
#endif
@ -778,12 +778,12 @@ static void stm32_checksetup(void)
uint32_t apb1rstr = getreg32(STM32_RCC_APB1RSTR);
uint32_t apb1enr = getreg32(STM32_RCC_APB1ENR);
usbinfo("CFGR: %08x APB1RSTR: %08x APB1ENR: %08x\n", cfgr, apb1rstr, apb1enr);
uinfo("CFGR: %08x APB1RSTR: %08x APB1ENR: %08x\n", cfgr, apb1rstr, apb1enr);
if ((apb1rstr & RCC_APB1RSTR_USBRST) != 0 ||
(apb1enr & RCC_APB1ENR_USBEN) == 0)
{
usbinfo("ERROR: USB is NOT setup correctly\n");
uinfo("ERROR: USB is NOT setup correctly\n");
}
}
#endif
@ -2845,7 +2845,7 @@ static int stm32_epconfigure(struct usbdev_ep_s *ep,
if (!ep || !desc)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
usberr("ERROR: ep=%p desc=%p\n");
uerr("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);
usberr("ERROR: ep=%p\n", ep);
uerr("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);
usberr("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
uerr("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);
usberr("ERROR: driver=%p\n", priv->driver);
uerr("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);
usberr("ERROR: stalled\n");
uerr("ERROR: stalled\n");
ret = -EBUSY;
}