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

USB host: Integrate logic to assign device function address

Browse Source
This commit is contained in:
Gregory Nutt 2015-04-21 12:17:49 -06:00
parent 1a3c5ab7d0
commit d2350c9c86
2 changed files with 65 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,7 @@
#include <nuttx/usb/usb.h> #include <nuttx/usb/usb.h>
#include <nuttx/usb/usbhost.h> #include <nuttx/usb/usbhost.h>
#include <nuttx/usb/ehci.h> #include <nuttx/usb/ehci.h>
#include <nuttx/usb/usbhost_devaddr.h>
#include <nuttx/usb/usbhost_trace.h> #include <nuttx/usb/usbhost_trace.h>
#include "up_arch.h" #include "up_arch.h"
@ -146,6 +147,11 @@
#define FRAME_LIST_SIZE 1024 #define FRAME_LIST_SIZE 1024
/* Port numbers */
#define RHPNDX(rh) ((rh)->hport.hport.port)
#define RHPORT(rh) (RHPNDX(rh)+1)
/******************************************************************************* /*******************************************************************************
* Private Types * Private Types
*******************************************************************************/ *******************************************************************************/
@ -228,7 +234,7 @@ struct sam_rhport_s
/* This is the hub port description understood by class drivers */ /* This is the hub port description understood by class drivers */
struct usbhost_hubport_s hport; struct usbhost_roothubport_s hport;
/* The bound device class driver */ /* The bound device class driver */
@ -1492,7 +1498,7 @@ static struct sam_qh_s *sam_qh_create(struct sam_rhport_s *rhport,
* and HUB device address to be included here. * and HUB device address to be included here.
*/ */
rhpndx = rhport->hport.port; rhpndx = RHPNDX(rhport);
regval = ((uint32_t)0 << QH_EPCAPS_HUBADDR_SHIFT) | regval = ((uint32_t)0 << QH_EPCAPS_HUBADDR_SHIFT) |
((uint32_t)(rhpndx + 1) << QH_EPCAPS_PORT_SHIFT) | ((uint32_t)(rhpndx + 1) << QH_EPCAPS_PORT_SHIFT) |
((uint32_t)1 << QH_EPCAPS_MULT_SHIFT); ((uint32_t)1 << QH_EPCAPS_MULT_SHIFT);
@ -1839,7 +1845,7 @@ static ssize_t sam_async_transfer(struct sam_rhport_s *rhport,
usbhost_vtrace2(EHCI_VTRACE2_ASYNCXFR, epinfo->epno, buflen); usbhost_vtrace2(EHCI_VTRACE2_ASYNCXFR, epinfo->epno, buflen);
#else #else
uvdbg("RHport%d EP%d: buffer=%p, buflen=%d, req=%p\n", uvdbg("RHport%d EP%d: buffer=%p, buflen=%d, req=%p\n",
rhport->hport.port+1, epinfo->epno, buffer, buflen, req); RHPORT(rhport), epinfo->epno, buffer, buflen, req);
#endif #endif
DEBUGASSERT(rhport && epinfo); DEBUGASSERT(rhport && epinfo);
@ -2198,7 +2204,7 @@ static ssize_t sam_intr_transfer(struct sam_rhport_s *rhport,
usbhost_vtrace2(EHCI_VTRACE2_INTRXFR, epinfo->epno, buflen); usbhost_vtrace2(EHCI_VTRACE2_INTRXFR, epinfo->epno, buflen);
#else #else
uvdbg("RHport%d EP%d: buffer=%p, buflen=%d\n", uvdbg("RHport%d EP%d: buffer=%p, buflen=%d\n",
rhport->hport.port+1, epinfo->epno, buffer, buflen); RHPORT(rhport), epinfo->epno, buffer, buflen);
#endif #endif
DEBUGASSERT(rhport && epinfo && buffer && buflen > 0); DEBUGASSERT(rhport && epinfo && buffer && buflen > 0);
@ -3192,7 +3198,7 @@ static int sam_enumerate(FAR struct usbhost_connection_s *conn, int rhpndx)
* write a zero to the Port Enable bit." * write a zero to the Port Enable bit."
*/ */
regaddr = &HCOR->portsc[rhport->hport.port]; regaddr = &HCOR->portsc[RHPNDX(rhport)];
regval = sam_getreg(regaddr); regval = sam_getreg(regaddr);
regval &= ~EHCI_PORTSC_PE; regval &= ~EHCI_PORTSC_PE;
regval |= EHCI_PORTSC_RESET; regval |= EHCI_PORTSC_RESET;
@ -3294,7 +3300,7 @@ static int sam_enumerate(FAR struct usbhost_connection_s *conn, int rhpndx)
*/ */
usbhost_vtrace2(EHCI_VTRACE2_CLASSENUM, rhpndx+1, rhpndx+1); usbhost_vtrace2(EHCI_VTRACE2_CLASSENUM, rhpndx+1, rhpndx+1);
ret = usbhost_enumerate(&g_ehci.rhport[rhpndx].hport, &rhport->class); ret = usbhost_enumerate(&g_ehci.rhport[rhpndx].hport.hport, &rhport->class);
if (ret < 0) if (ret < 0)
{ {
usbhost_trace2(EHCI_TRACE2_CLASSENUM_FAILED, rhpndx+1, -ret); usbhost_trace2(EHCI_TRACE2_CLASSENUM_FAILED, rhpndx+1, -ret);
@ -3670,10 +3676,10 @@ static int sam_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
/* Terse output only if we are tracing */ /* Terse output only if we are tracing */
#ifdef CONFIG_USBHOST_TRACE #ifdef CONFIG_USBHOST_TRACE
usbhost_vtrace2(EHCI_VTRACE2_CTRLINOUT, rhport->hport.port + 1, req->req); usbhost_vtrace2(EHCI_VTRACE2_CTRLINOUT, RHPORT(rhport), req->req);
#else #else
uvdbg("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %04x\n", uvdbg("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %04x\n",
rhport->hport.port + 1, req->type, req->req, req->value[1], req->value[0], RHPORT(rhport), req->type, req->req, req->value[1], req->value[0],
req->index[1], req->index[0], len); req->index[1], req->index[0], len);
#endif #endif
@ -3959,6 +3965,7 @@ static int sam_reset(void)
FAR struct usbhost_connection_s *sam_ehci_initialize(int controller) FAR struct usbhost_connection_s *sam_ehci_initialize(int controller)
{ {
FAR struct usbhost_hubport_s *hport;
irqstate_t flags; irqstate_t flags;
uint32_t regval; uint32_t regval;
#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_VERBOSE) #if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_VERBOSE)
@ -4087,13 +4094,18 @@ FAR struct usbhost_connection_s *sam_ehci_initialize(int controller)
/* Initialize the public port representation */ /* Initialize the public port representation */
rhport->hport.drvr = &rhport->drvr; hport = &rhport->hport.hport;
hport->drvr = &rhport->drvr;
#ifdef CONFIG_USBHOST_HUB #ifdef CONFIG_USBHOST_HUB
rhport->hport.parent = NULL; hport->parent = NULL;
#endif #endif
rhport->hport.ep0 = &rhport->ep0; hport->ep0 = &rhport->ep0;
rhport->hport.port = i; hport->port = i;
rhport->hport.speed = USB_SPEED_FULL; hport->speed = USB_SPEED_FULL;
/* Initialize function address generation logic */
usbhost_devaddr_initialize(&rhport->hport);
} }
#ifndef CONFIG_SAMA5_EHCI_PREALLOCATE #ifndef CONFIG_SAMA5_EHCI_PREALLOCATE

64
arch/arm/src/sama5/sam_ohci.c
View File

@ -54,6 +54,7 @@
#include <nuttx/usb/usb.h> #include <nuttx/usb/usb.h>
#include <nuttx/usb/ohci.h> #include <nuttx/usb/ohci.h>
#include <nuttx/usb/usbhost.h> #include <nuttx/usb/usbhost.h>
#include <nuttx/usb/usbhost_devaddr.h>
#include <nuttx/usb/usbhost_trace.h> #include <nuttx/usb/usbhost_trace.h>
#include <arch/irq.h> #include <arch/irq.h>
@ -189,6 +190,11 @@
#define TD_DELAY(n) (uint32_t)((n) << GTD_STATUS_DI_SHIFT) #define TD_DELAY(n) (uint32_t)((n) << GTD_STATUS_DI_SHIFT)
/* Port numbers */
#define RHPNDX(rh) ((rh)->hport.hport.port)
#define RHPORT(rh) (RHPNDX(rh)+1)
/******************************************************************************* /*******************************************************************************
* Private Types * Private Types
*******************************************************************************/ *******************************************************************************/
@ -228,7 +234,7 @@ struct sam_rhport_s
/* This is the hub port description understood by class drivers */ /* This is the hub port description understood by class drivers */
struct usbhost_hubport_s hport; struct usbhost_roothubport_s hport;
/* The bound device class driver */ /* The bound device class driver */
@ -1643,7 +1649,7 @@ static int sam_ctrltd(struct sam_rhport_s *rhport, struct sam_eplist_s *eplist,
ret = sam_wdhwait(rhport, edctrl); ret = sam_wdhwait(rhport, edctrl);
if (ret != OK) if (ret != OK)
{ {
usbhost_trace1(OHCI_TRACE1_DEVDISCONN, rhport->hport.port + 1); usbhost_trace1(OHCI_TRACE1_DEVDISCONN, RHPORT(rhport));
return ret; return ret;
} }
@ -1707,7 +1713,7 @@ static int sam_ctrltd(struct sam_rhport_s *rhport, struct sam_eplist_s *eplist,
} }
else else
{ {
usbhost_trace2(OHCI_TRACE2_BADTDSTATUS, rhport->hport.port + 1, usbhost_trace2(OHCI_TRACE2_BADTDSTATUS, RHPORT(rhport),
edctrl->tdstatus); edctrl->tdstatus);
ret = -EIO; ret = -EIO;
} }
@ -1797,14 +1803,14 @@ static void sam_rhsc_bottomhalf(void)
if ((rhportst & OHCI_RHPORTST_LSDA) != 0) if ((rhportst & OHCI_RHPORTST_LSDA) != 0)
{ {
rhport->hport.speed = USB_SPEED_LOW; rhport->hport.hport.speed = USB_SPEED_LOW;
} }
else else
{ {
rhport->hport.speed = USB_SPEED_FULL; rhport->hport.hport.speed = USB_SPEED_FULL;
} }
usbhost_vtrace1(OHCI_VTRACE1_SPEED, rhport->hport.speed); usbhost_vtrace1(OHCI_VTRACE1_SPEED, rhport->hport.hport.speed);
} }
/* Check if we are now disconnected */ /* Check if we are now disconnected */
@ -1817,7 +1823,7 @@ static void sam_rhsc_bottomhalf(void)
rhpndx + 1, g_ohci.rhswait); rhpndx + 1, g_ohci.rhswait);
rhport->connected = false; rhport->connected = false;
rhport->hport.speed = USB_SPEED_FULL; rhport->hport.hport.speed = USB_SPEED_FULL;
/* Are we bound to a class instance? */ /* Are we bound to a class instance? */
@ -2170,7 +2176,7 @@ static int sam_enumerate(FAR struct usbhost_connection_s *conn, int rhpndx)
{ {
/* No, return an error */ /* No, return an error */
usbhost_vtrace1(OHCI_VTRACE1_ENUMDISCONN, rhport->hport.port + 1); usbhost_vtrace1(OHCI_VTRACE1_ENUMDISCONN, RHPORT(rhport));
return -ENODEV; return -ENODEV;
} }
@ -2181,7 +2187,7 @@ static int sam_enumerate(FAR struct usbhost_connection_s *conn, int rhpndx)
ret = sam_ep0enqueue(rhport); ret = sam_ep0enqueue(rhport);
if (ret < 0) if (ret < 0)
{ {
usbhost_trace2(OHCI_TRACE2_EP0ENQUEUE_FAILED, rhport->hport.port + 1, usbhost_trace2(OHCI_TRACE2_EP0ENQUEUE_FAILED, RHPORT(rhport),
-ret); -ret);
return ret; return ret;
} }
@ -2216,7 +2222,7 @@ static int sam_enumerate(FAR struct usbhost_connection_s *conn, int rhpndx)
*/ */
usbhost_vtrace2(OHCI_VTRACE2_CLASSENUM, rhpndx+1, rhpndx+1); usbhost_vtrace2(OHCI_VTRACE2_CLASSENUM, rhpndx+1, rhpndx+1);
ret = usbhost_enumerate(&g_ohci.rhport[rhpndx].hport, &rhport->class); ret = usbhost_enumerate(&g_ohci.rhport[rhpndx].hport.hport, &rhport->class);
if (ret < 0) if (ret < 0)
{ {
usbhost_trace2(OHCI_TRACE2_CLASSENUM_FAILED, rhpndx+1, -ret); usbhost_trace2(OHCI_TRACE2_CLASSENUM_FAILED, rhpndx+1, -ret);
@ -2271,7 +2277,7 @@ static int sam_ep0configure(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
edctrl->hw.ctrl = (uint32_t)funcaddr << ED_CONTROL_FA_SHIFT | edctrl->hw.ctrl = (uint32_t)funcaddr << ED_CONTROL_FA_SHIFT |
(uint32_t)maxpacketsize << ED_CONTROL_MPS_SHIFT; (uint32_t)maxpacketsize << ED_CONTROL_MPS_SHIFT;
if (rhport->hport.speed == USB_SPEED_LOW) if (rhport->hport.hport.speed == USB_SPEED_LOW)
{ {
edctrl->hw.ctrl |= ED_CONTROL_S; edctrl->hw.ctrl |= ED_CONTROL_S;
} }
@ -2287,7 +2293,7 @@ static int sam_ep0configure(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
sam_givesem(&g_ohci.exclsem); sam_givesem(&g_ohci.exclsem);
usbhost_vtrace2(OHCI_VTRACE2_EP0CONFIGURE, usbhost_vtrace2(OHCI_VTRACE2_EP0CONFIGURE,
rhport->hport.port + 1, (uint16_t)edctrl->hw.ctrl); RHPORT(rhport), (uint16_t)edctrl->hw.ctrl);
return OK; return OK;
} }
@ -2394,7 +2400,7 @@ static int sam_epalloc(FAR struct usbhost_driver_s *drvr,
/* Check for a low-speed device */ /* Check for a low-speed device */
if (rhport->hport.speed == USB_SPEED_LOW) if (rhport->hport.hport.speed == USB_SPEED_LOW)
{ {
ed->hw.ctrl |= ED_CONTROL_S; ed->hw.ctrl |= ED_CONTROL_S;
} }
@ -2766,10 +2772,10 @@ static int sam_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
DEBUGASSERT(rhport != NULL && eplist != NULL && req != NULL); DEBUGASSERT(rhport != NULL && eplist != NULL && req != NULL);
#ifdef CONFIG_USBHOST_TRACE #ifdef CONFIG_USBHOST_TRACE
usbhost_vtrace2(OHCI_VTRACE2_CTRLIN, rhport->hport.port + 1, req->req); usbhost_vtrace2(OHCI_VTRACE2_CTRLIN, RHPORT(rhport), req->req);
#else #else
uvdbg("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %02x%02x\n", uvdbg("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %02x%02x\n",
rhport->hport.port + 1, req->type, req->req, req->value[1], RHPORT(rhport), req->type, req->req, req->value[1],
req->value[0], req->index[1], req->index[0], req->len[1], req->value[0], req->index[1], req->index[0], req->len[1],
req->len[0]); req->len[0]);
#endif #endif
@ -2815,10 +2821,10 @@ static int sam_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
DEBUGASSERT(rhport != NULL && eplist != NULL && req != NULL); DEBUGASSERT(rhport != NULL && eplist != NULL && req != NULL);
#ifdef CONFIG_USBHOST_TRACE #ifdef CONFIG_USBHOST_TRACE
usbhost_vtrace2(OHCI_VTRACE2_CTRLOUT, rhport->hport.port + 1, req->req); usbhost_vtrace2(OHCI_VTRACE2_CTRLOUT, RHPORT(rhport), req->req);
#else #else
uvdbg("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %02x%02x\n", uvdbg("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %02x%02x\n",
rhport->hport.port + 1, req->type, req->req, req->value[1], RHPORT(rhport), req->type, req->req, req->value[1],
req->value[0], req->index[1], req->index[0], req->len[1], req->value[0], req->index[1], req->index[0], req->len[1],
req->len[0]); req->len[0]);
#endif #endif
@ -2929,7 +2935,7 @@ static int sam_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
ret = sam_wdhwait(rhport, ed); ret = sam_wdhwait(rhport, ed);
if (ret != OK) if (ret != OK)
{ {
usbhost_trace1(OHCI_TRACE1_DEVDISCONN, rhport->hport.port + 1); usbhost_trace1(OHCI_TRACE1_DEVDISCONN, RHPORT(rhport));
goto errout; goto errout;
} }
@ -3012,7 +3018,7 @@ static int sam_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
} }
else else
{ {
usbhost_trace2(OHCI_TRACE2_BADTDSTATUS, rhport->hport.port + 1, usbhost_trace2(OHCI_TRACE2_BADTDSTATUS, RHPORT(rhport),
ed->tdstatus); ed->tdstatus);
ret = ed->tdstatus == TD_CC_STALL ? -EPERM : -EIO; ret = ed->tdstatus == TD_CC_STALL ? -EPERM : -EIO;
} }
@ -3095,6 +3101,7 @@ static void sam_disconnect(FAR struct usbhost_driver_s *drvr)
FAR struct usbhost_connection_s *sam_ohci_initialize(int controller) FAR struct usbhost_connection_s *sam_ohci_initialize(int controller)
{ {
FAR struct usbhost_hubport_s *hport;
uintptr_t physaddr; uintptr_t physaddr;
uint32_t regval; uint32_t regval;
uint8_t *buffer; uint8_t *buffer;
@ -3218,6 +3225,8 @@ FAR struct usbhost_connection_s *sam_ohci_initialize(int controller)
{ {
struct sam_rhport_s *rhport = &g_ohci.rhport[i]; struct sam_rhport_s *rhport = &g_ohci.rhport[i];
/* Initialize the device operations */
rhport->drvr.ep0configure = sam_ep0configure; rhport->drvr.ep0configure = sam_ep0configure;
rhport->drvr.epalloc = sam_epalloc; rhport->drvr.epalloc = sam_epalloc;
rhport->drvr.epfree = sam_epfree; rhport->drvr.epfree = sam_epfree;
@ -3230,13 +3239,20 @@ FAR struct usbhost_connection_s *sam_ohci_initialize(int controller)
rhport->drvr.transfer = sam_transfer; rhport->drvr.transfer = sam_transfer;
rhport->drvr.disconnect = sam_disconnect; rhport->drvr.disconnect = sam_disconnect;
rhport->hport.drvr = &rhport->drvr; /* Initialize the public port representation */
hport = &rhport->hport.hport;
hport->drvr = &rhport->drvr;
#ifdef CONFIG_USBHOST_HUB #ifdef CONFIG_USBHOST_HUB
rhport->hport.parent = NULL; hport->parent = NULL;
#endif #endif
rhport->hport.ep0 = &rhport->ep0; hport->ep0 = &rhport->ep0;
rhport->hport.port = i; hport->port = i;
rhport->hport.speed = USB_SPEED_FULL; hport->speed = USB_SPEED_FULL;
/* Initialize function address generation logic */
usbhost_devaddr_initialize(&rhport->hport);
} }
/* Wait 50MS then perform hardware reset */ /* Wait 50MS then perform hardware reset */