From b328c5103780d8996c4c8c7782e152d479093de3 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 1 May 2015 10:50:01 -0600 Subject: [PATCH] SAMA5 OHCI: Clean up some debug output --- arch/arm/src/sama5/sam_ohci.c | 8 +++++--- arch/arm/src/sama5/sam_usbhost.c | 2 +- arch/arm/src/sama5/sam_usbhost.h | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/arm/src/sama5/sam_ohci.c b/arch/arm/src/sama5/sam_ohci.c index 6557f78b62..0ba0d23fe7 100644 --- a/arch/arm/src/sama5/sam_ohci.c +++ b/arch/arm/src/sama5/sam_ohci.c @@ -192,6 +192,8 @@ /* Port numbers */ +#define HPNDX(hp) ((hp)->port) +#define HPORT(hp) (HPNDX(hp)+1) #define RHPNDX(rh) ((rh)->hport.hport.port) #define RHPORT(rh) (RHPNDX(rh)+1) @@ -2391,11 +2393,11 @@ static int sam_enumerate(FAR struct usbhost_connection_s *conn, /* Then let the common usbhost_enumerate do the real enumeration. */ - usbhost_vtrace1(OHCI_VTRACE1_CLASSENUM, hport->port); + usbhost_vtrace1(OHCI_VTRACE1_CLASSENUM, HPORT(hport)); ret = usbhost_enumerate(hport, &hport->devclass); if (ret < 0) { - usbhost_trace2(OHCI_TRACE2_CLASSENUM_FAILED, rhpndx+1, -ret); + usbhost_trace2(OHCI_TRACE2_CLASSENUM_FAILED, HPORT(hport), -ret); } return ret; @@ -2464,7 +2466,7 @@ static int sam_ep0configure(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, sam_givesem(&g_ohci.exclsem); usbhost_vtrace2(OHCI_VTRACE2_EP0CONFIGURE, - RHPORT(rhport->hport.port), (uint16_t)edctrl->hw.ctrl); + RHPORT(rhport), (uint16_t)edctrl->hw.ctrl); UNUSED(rhport); return OK; } diff --git a/arch/arm/src/sama5/sam_usbhost.c b/arch/arm/src/sama5/sam_usbhost.c index 3e51f25366..f1d82445ea 100644 --- a/arch/arm/src/sama5/sam_usbhost.c +++ b/arch/arm/src/sama5/sam_usbhost.c @@ -100,7 +100,7 @@ static const struct sam_usbhost_trace_s g_trace1[TRACE1_NSTRINGS] = TRENTRY(OHCI_VTRACE1_CSC, TR_OHCI, TR_FMT1, "OHCI Connect Status Change, RHSTATUS: %06x\n"), TRENTRY(OHCI_VTRACE1_DRWE, TR_OHCI, TR_FMT1, "OHCI DRWE: Remote wake-up, RHSTATUS: %06x\n"), TRENTRY(OHCI_VTRACE1_ALREADYCONN, TR_OHCI, TR_FMT1, "OHCI Already connected, RHPORTST: %06x\n"), - TRENTRY(OHCI_VTRACE1_SPEED, TR_OHCI, TR_FMT1, "OHCI Low speed: %d\n"), + TRENTRY(OHCI_VTRACE1_SPEED, TR_OHCI, TR_FMT1, "OHCI Port speed: %d\n"), TRENTRY(OHCI_VTRACE1_ALREADYDISCONN, TR_OHCI, TR_FMT1, "OHCI Already disconnected, RHPORTST: %06x\n"), TRENTRY(OHCI_VTRACE1_RHSC, TR_OHCI, TR_FMT1, "OHCI Root Hub Status Change. Pending: %06x\n"), TRENTRY(OHCI_VTRACE1_WDHINTR, TR_OHCI, TR_FMT1, "OHCI Writeback Done Head interrupt. Pending: %06x\n"), diff --git a/arch/arm/src/sama5/sam_usbhost.h b/arch/arm/src/sama5/sam_usbhost.h index 3f6d6424c2..bd5135e55b 100644 --- a/arch/arm/src/sama5/sam_usbhost.h +++ b/arch/arm/src/sama5/sam_usbhost.h @@ -91,6 +91,7 @@ enum usbhost_trace1codes_e OHCI_VTRACE1_ALREADYDISCONN, /* OHCI Already disconnected */ OHCI_VTRACE1_RHSC, /* OHCI Root Hub Status Change */ OHCI_VTRACE1_WDHINTR, /* OHCI Writeback Done Head interrupt */ + OHCI_VTRACE1_CLASSENUM, /* OHCI Enumerate the device */ OHCI_VTRACE1_ENUMDISCONN, /* OHCI RHport Not connected */ OHCI_VTRACE1_INITIALIZING, /* OHCI Initializing Stack */ OHCI_VTRACE1_INITIALIZED, /* OHCI Initialized */ @@ -155,7 +156,6 @@ enum usbhost_trace1codes_e OHCI_VTRACE2_CONNECTED, /* OHCI RHPort connected */ OHCI_VTRACE2_DISCONNECTED, /* OHCI RHPort disconnected */ OHCI_VTRACE2_WAKEUP, /* OHCI RHPort connected */ - OHCI_VTRACE2_CLASSENUM, /* OHCI Enumerate the device */ OHCI_VTRACE2_EP0CONFIGURE, /* OHCI RHPort EP0 CTRL */ OHCI_VTRACE2_EPALLOC, /* OHCI EP CTRL */ OHCI_VTRACE2_CTRLIN, /* OHCI CTRLIN */