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

updated to reflect changes in debug output macros/fxns

Browse Source
This commit is contained in:
ziggurat29 2016-06-24 17:48:08 -05:00
parent b4e62547af
commit 6c762faa0f
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arch/arm/src/stm32l4/stm32l4_otgfsdev.c
View File

@ -1242,7 +1242,7 @@ static void stm32_epin_request(FAR struct stm32_usbdev_s *priv,
return; return;
} }
ullvdbg("EP%d req=%p: len=%d xfrd=%d zlp=%d\n", uinfo("EP%d req=%p: len=%d xfrd=%d zlp=%d\n",
privep->epphy, privreq, privreq->req.len, privep->epphy, privreq, privreq->req.len,
privreq->req.xfrd, privep->zlp); privreq->req.xfrd, privep->zlp);
@ -1508,7 +1508,7 @@ static void stm32_epout_complete(FAR struct stm32_usbdev_s *priv,
return; return;
} }
ullvdbg("EP%d: len=%d xfrd=%d\n", uinfo("EP%d: len=%d xfrd=%d\n",
privep->epphy, privreq->req.len, privreq->req.xfrd); privep->epphy, privreq->req.len, privreq->req.xfrd);
/* Return the completed read request to the class driver and mark the state /* Return the completed read request to the class driver and mark the state
@ -1543,7 +1543,7 @@ static inline void stm32_ep0out_receive(FAR struct stm32_ep_s *privep, int bcnt)
DEBUGASSERT(privep && privep->ep.priv); DEBUGASSERT(privep && privep->ep.priv);
priv = (FAR struct stm32_usbdev_s *)privep->ep.priv; priv = (FAR struct stm32_usbdev_s *)privep->ep.priv;
ullvdbg("EP0: bcnt=%d\n", bcnt); uinfo("EP0: bcnt=%d\n", bcnt);
usbtrace(TRACE_READ(EP0), bcnt); usbtrace(TRACE_READ(EP0), bcnt);
/* Verify that an OUT SETUP request as received before this data was /* Verify that an OUT SETUP request as received before this data was
@ -1636,7 +1636,7 @@ static inline void stm32_epout_receive(FAR struct stm32_ep_s *privep, int bcnt)
return; return;
} }
ullvdbg("EP%d: len=%d xfrd=%d\n", privep->epphy, privreq->req.len, privreq->req.xfrd); uinfo("EP%d: len=%d xfrd=%d\n", privep->epphy, privreq->req.len, privreq->req.xfrd);
usbtrace(TRACE_READ(privep->epphy), bcnt); usbtrace(TRACE_READ(privep->epphy), bcnt);
/* Get the number of bytes to transfer from the RxFIFO */ /* Get the number of bytes to transfer from the RxFIFO */
@ -1720,7 +1720,7 @@ static void stm32_epout_request(FAR struct stm32_usbdev_s *priv,
return; return;
} }
ullvdbg("EP%d: len=%d\n", privep->epphy, privreq->req.len); uinfo("EP%d: len=%d\n", privep->epphy, privreq->req.len);
/* Ignore any attempt to receive a zero length packet (this really /* Ignore any attempt to receive a zero length packet (this really
* should not happen. * should not happen.
@ -2514,7 +2514,7 @@ static inline void stm32_ep0out_setup(struct stm32_usbdev_s *priv)
ctrlreq.index = GETUINT16(priv->ctrlreq.index); ctrlreq.index = GETUINT16(priv->ctrlreq.index);
ctrlreq.len = GETUINT16(priv->ctrlreq.len); ctrlreq.len = GETUINT16(priv->ctrlreq.len);
ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n", uinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
ctrlreq.type, ctrlreq.req, ctrlreq.value, ctrlreq.index, ctrlreq.len); ctrlreq.type, ctrlreq.req, ctrlreq.value, ctrlreq.index, ctrlreq.len);
/* Check for a standard request */ /* Check for a standard request */
@ -2649,7 +2649,7 @@ static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv)
if ((daint & 1) != 0) if ((daint & 1) != 0)
{ {
regval = stm32_getreg(STM32_OTGFS_DOEPINT(epno)); regval = stm32_getreg(STM32_OTGFS_DOEPINT(epno));
ulldbg("DOEPINT(%d) = %08x\n", epno, regval); uinfo("DOEPINT(%d) = %08x\n", epno, regval);
stm32_putreg(0xFF, STM32_OTGFS_DOEPINT(epno)); stm32_putreg(0xFF, STM32_OTGFS_DOEPINT(epno));
} }
@ -2879,7 +2879,7 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
{ {
if ((daint & 1) != 0) if ((daint & 1) != 0)
{ {
ulldbg("DIEPINT(%d) = %08x\n", uinfo("DIEPINT(%d) = %08x\n",
epno, stm32_getreg(STM32_OTGFS_DIEPINT(epno))); epno, stm32_getreg(STM32_OTGFS_DIEPINT(epno)));
stm32_putreg(0xFF, STM32_OTGFS_DIEPINT(epno)); stm32_putreg(0xFF, STM32_OTGFS_DIEPINT(epno));
} }
@ -3825,7 +3825,7 @@ static int stm32_epout_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
break; break;
default: default:
udbg("Unsupported maxpacket: %d\n", maxpacket); uerr("Unsupported maxpacket: %d\n", maxpacket);
return -EINVAL; return -EINVAL;
} }
} }
@ -3920,7 +3920,7 @@ static int stm32_epin_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
break; break;
default: default:
udbg("Unsupported maxpacket: %d\n", maxpacket); uerr("Unsupported maxpacket: %d\n", maxpacket);
return -EINVAL; return -EINVAL;
} }
} }
@ -4358,7 +4358,7 @@ static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
if (!req || !req->callback || !req->buf || !ep) if (!req || !req->callback || !req->buf || !ep)
{ {
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
ullvdbg("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); uinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
return -EINVAL; return -EINVAL;
} }
#endif #endif
@ -5470,7 +5470,7 @@ void up_usbinitialize(void)
ret = irq_attach(STM32L4_IRQ_OTGFS, stm32_usbinterrupt); ret = irq_attach(STM32L4_IRQ_OTGFS, stm32_usbinterrupt);
if (ret < 0) if (ret < 0)
{ {
udbg("irq_attach failed\n", ret); uerr("irq_attach failed\n", ret);
goto errout; goto errout;
} }

2
configs/stm32l476vg-disco/src/stm32_usb.c
View File

@ -329,7 +329,7 @@ xcpt_t stm32l4_setup_overcurrent(xcpt_t handler)
#ifdef CONFIG_USBDEV #ifdef CONFIG_USBDEV
void stm32l4_usbsuspend(FAR struct usbdev_s *dev, bool resume) void stm32l4_usbsuspend(FAR struct usbdev_s *dev, bool resume)
{ {
ulldbg("resume: %d\n", resume); uinfo("resume: %d\n", resume);
} }
#endif #endif