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

EHCI: Fix some compilation errors when USB DEBUG is enabled

Browse Source
This commit is contained in:
Gregory Nutt 2015-04-27 12:27:17 -06:00
parent 7313906ec5
commit 24761dea0b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3420,7 +3420,7 @@ static int lpc31_wait(FAR struct usbhost_connection_s *conn,
irqrestore(flags); irqrestore(flags);
usbhost_vtrace2(EHCI_VTRACE2_MONWAKEUP, usbhost_vtrace2(EHCI_VTRACE2_MONWAKEUP,
rhpndx + 1, rhport->conected); rhpndx + 1, rhport->connected);
return OK; return OK;
} }
} }
@ -3716,8 +3716,8 @@ static int lpc31_rh_enumerate(FAR struct usbhost_connection_s *conn,
else else
{ {
DEBUGASSERT(rhport->ep0.speed == EHCI_LOW_SPEED); DEBUGASSERT(rhport->ep0.speed == USB_SPEED_LOW);
DEBUGASSERT((regval & USBDEV_PRTSC1_PSPD_MASK) == USBDEV_PRTSC1_PSPD_LS) DEBUGASSERT((regval & USBDEV_PRTSC1_PSPD_MASK) == USBDEV_PRTSC1_PSPD_LS);
} }
return OK; return OK;
@ -3751,7 +3751,7 @@ static int lpc31_enumerate(FAR struct usbhost_connection_s *conn,
ret = usbhost_enumerate(hport, &hport->devclass); ret = usbhost_enumerate(hport, &hport->devclass);
if (ret < 0) if (ret < 0)
{ {
usbhost_trace2(EHCI_TRACE2_CLASSENUM_FAILED, rhpndx+1, -ret); usbhost_trace2(EHCI_TRACE2_CLASSENUM_FAILED, hport->port + 1, -ret);
} }
return ret; return ret;
@ -4416,7 +4416,7 @@ static int lpc31_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
irqstate_t flags; irqstate_t flags;
int ret; int ret;
DEBUGASSERT(rhport && epinfo && buffer && buflen > 0); DEBUGASSERT(epinfo);
/* We must have exclusive access to the EHCI hardware and data structures. This /* We must have exclusive access to the EHCI hardware and data structures. This
* will prevent servicing any transfer completion events while we perform the * will prevent servicing any transfer completion events while we perform the

6
arch/arm/src/sama5/sam_ehci.c
View File

@ -3264,7 +3264,7 @@ static int sam_wait(FAR struct usbhost_connection_s *conn,
irqrestore(flags); irqrestore(flags);
usbhost_vtrace2(EHCI_VTRACE2_MONWAKEUP, usbhost_vtrace2(EHCI_VTRACE2_MONWAKEUP,
rhpndx + 1, rhport->conected); rhpndx + 1, rhport->connected);
return OK; return OK;
} }
} }
@ -3578,7 +3578,7 @@ static int sam_enumerate(FAR struct usbhost_connection_s *conn,
ret = usbhost_enumerate(hport, &hport->devclass); ret = usbhost_enumerate(hport, &hport->devclass);
if (ret < 0) if (ret < 0)
{ {
usbhost_trace2(EHCI_TRACE2_CLASSENUM_FAILED, rhpndx+1, -ret); usbhost_trace2(EHCI_TRACE2_CLASSENUM_FAILED, hport->port + 1, -ret);
} }
return ret; return ret;
@ -4242,7 +4242,7 @@ static int sam_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
irqstate_t flags; irqstate_t flags;
int ret; int ret;
DEBUGASSERT(rhport && epinfo && buffer && buflen > 0); DEBUGASSERT(epinfo);
/* We must have exclusive access to the EHCI hardware and data structures. This /* We must have exclusive access to the EHCI hardware and data structures. This
* will prevent servicing any transfer completion events while we perform the * will prevent servicing any transfer completion events while we perform the