Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-08-27 04:10:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

SAMA5D USB hub: Fix some trace statements; update some README files

Browse source
This commit is contained in:
Gregory Nutt 2015-05-01 15:38:03 -06:00
parent e8f89f127b
commit 232a01b91c
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
arch/arm/src/sama5/sam_ohci.c
View file

@ -430,7 +430,7 @@ static int sam_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep);
#endif
#ifdef CONFIG_USBHOST_HUB
static int sam_connect(FAR struct usbhost_driver_s *drvr,
FAR struct usbhsot_hubport_s *hport,
FAR struct usbhost_hubport_s *hport,
bool connected);
#endif
static void sam_disconnect(FAR struct usbhost_driver_s *drvr);
@ -2257,8 +2257,8 @@ static int sam_wait(FAR struct usbhost_connection_s *conn,
*hport = connport;
irqrestore(flags);
usbhost_vtrace2(EHCI_VTRACE2_MONWAKEUP,
connport->port + 1, connport->connected);
usbhost_vtrace2(OHCI_VTRACE2_HUBWAKEUP,
HPORT(connport), connport->connected);
return OK;
}
#endif
@ -3312,7 +3312,7 @@ static int sam_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
#ifdef CONFIG_USBHOST_HUB
static int sam_connect(FAR struct usbhost_driver_s *drvr,
FAR struct usbhsot_hubport_s *hport,
FAR struct usbhost_hubport_s *hport,
bool connected)
{
irqstate_t flags;

3
arch/arm/src/sama5/sam_usbhost.c
View file

@ -178,6 +178,9 @@ static const struct sam_usbhost_trace_s g_trace2[TRACE2_NSTRINGS] =
TRENTRY(OHCI_VTRACE2_CTRLOUT, TR_OHCI, TR_FMT2, "OHCI CTRLOUT RHPort%d req: %02x\n"),
TRENTRY(OHCI_VTRACE2_TRANSFER, TR_OHCI, TR_FMT2, "OHCI EP%d buflen: %d\n"),
TRENTRY(OHCI_VTRACE2_INITCONNECTED, TR_OHCI, TR_FMT2, "OHCI RHPort%d Device connected: %d\n"),
#ifdef CONFIG_USBHOST_HUB
TRENTRY(OHCI_VTRACE2_HUBWAKEUP, TR_OHCI, TR_FMT2, "OHCI Hub Port%d connected: %d\n"),
#endif
#endif
#endif

5
arch/arm/src/sama5/sam_usbhost.h
View file

@ -156,13 +156,16 @@ enum usbhost_trace1codes_e
OHCI_VTRACE2_RHPORTST, /* OHCI RHPORTST */
OHCI_VTRACE2_CONNECTED, /* OHCI RHPort connected */
OHCI_VTRACE2_DISCONNECTED, /* OHCI RHPort disconnected */
OHCI_VTRACE2_WAKEUP, /* OHCI RHPort connected */
OHCI_VTRACE2_WAKEUP, /* OHCI RHPort connected wakeup */
OHCI_VTRACE2_EP0CTRLED, /* OHCI RHPort EP0 CTRL */
OHCI_VTRACE2_EPALLOC, /* OHCI EP CTRL */
OHCI_VTRACE2_CTRLIN, /* OHCI CTRLIN */
OHCI_VTRACE2_CTRLOUT, /* OHCI CTRLOUT */
OHCI_VTRACE2_TRANSFER, /* OHCI EP buflen */
OHCI_VTRACE2_INITCONNECTED, /* OHCI RHPort Device connected */
#ifdef CONFIG_USBHOST_HUB
OHCI_VTRACE2_HUBWAKEUP, /* EHCI Hub Port connected wakeup */
#endif
#endif
#endif