From 48f368f96f06f0f0249c2903334d04d7564ca22f Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 1 May 2015 13:40:54 -0600 Subject: [PATCH] SAMA5 OHCI: Improve some trace-related naming --- arch/arm/src/sama5/sam_ohci.c | 3 +-- arch/arm/src/sama5/sam_usbhost.c | 2 +- arch/arm/src/sama5/sam_usbhost.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/src/sama5/sam_ohci.c b/arch/arm/src/sama5/sam_ohci.c index 9743216674..69508d07a5 100644 --- a/arch/arm/src/sama5/sam_ohci.c +++ b/arch/arm/src/sama5/sam_ohci.c @@ -2466,8 +2466,7 @@ static int sam_ep0configure(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, (uintptr_t)edctrl + sizeof(struct ohci_ed_s)); sam_givesem(&g_ohci.exclsem); - usbhost_vtrace2(OHCI_VTRACE2_EP0CONFIGURE, - RHPORT(rhport), (uint16_t)edctrl->hw.ctrl); + usbhost_vtrace2(OHCI_VTRACE2_EP0CTRLED, 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 96994d44fb..97cd3782e9 100644 --- a/arch/arm/src/sama5/sam_usbhost.c +++ b/arch/arm/src/sama5/sam_usbhost.c @@ -172,7 +172,7 @@ static const struct sam_usbhost_trace_s g_trace2[TRACE2_NSTRINGS] = TRENTRY(OHCI_VTRACE2_CONNECTED, TR_OHCI, TR_FMT2, "OHCI RHPort%d connected, rhswait: %d\n"), TRENTRY(OHCI_VTRACE2_DISCONNECTED, TR_OHCI, TR_FMT2, "OHCI RHPort%d disconnected, rhswait: %d\n"), TRENTRY(OHCI_VTRACE2_WAKEUP, TR_OHCI, TR_FMT2, "OHCI RHPort%d connected: %d\n"), - TRENTRY(OHCI_VTRACE2_EP0CONFIGURE, TR_OHCI, TR_FMT2, "OHCI RHPort%d EP0 CTRL: %04x\n"), + TRENTRY(OHCI_VTRACE2_EP0CTRLED, TR_OHCI, TR_FMT2, "OHCI RHPort%d EP0 CTRL: %04x\n"), TRENTRY(OHCI_VTRACE2_EPALLOC, TR_OHCI, TR_FMT2, "OHCI EP%d CTRL: %04x\n"), TRENTRY(OHCI_VTRACE2_CTRLIN, TR_OHCI, TR_FMT2, "OHCI CTRLIN RHPort%d req: %02x\n"), TRENTRY(OHCI_VTRACE2_CTRLOUT, TR_OHCI, TR_FMT2, "OHCI CTRLOUT RHPort%d req: %02x\n"), diff --git a/arch/arm/src/sama5/sam_usbhost.h b/arch/arm/src/sama5/sam_usbhost.h index 16611471b2..79264b6110 100644 --- a/arch/arm/src/sama5/sam_usbhost.h +++ b/arch/arm/src/sama5/sam_usbhost.h @@ -157,7 +157,7 @@ enum usbhost_trace1codes_e OHCI_VTRACE2_CONNECTED, /* OHCI RHPort connected */ OHCI_VTRACE2_DISCONNECTED, /* OHCI RHPort disconnected */ OHCI_VTRACE2_WAKEUP, /* OHCI RHPort connected */ - OHCI_VTRACE2_EP0CONFIGURE, /* OHCI RHPort EP0 CTRL */ + OHCI_VTRACE2_EP0CTRLED, /* OHCI RHPort EP0 CTRL */ OHCI_VTRACE2_EPALLOC, /* OHCI EP CTRL */ OHCI_VTRACE2_CTRLIN, /* OHCI CTRLIN */ OHCI_VTRACE2_CTRLOUT, /* OHCI CTRLOUT */