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

boards/sama5d3-xplained: Make hot plugging more reliable.

Browse Source
This commit is contained in:
Lwazi Dube 2023-03-23 02:16:43 -04:00 committed by Alan Carvalho de Assis
parent 6227cd4fd4
commit 21ffb4de72
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2579,6 +2579,14 @@ static int sam_ep0configure(struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
usbhost_vtrace2(OHCI_VTRACE2_EP0CONFIG, speed, funcaddr); usbhost_vtrace2(OHCI_VTRACE2_EP0CONFIG, speed, funcaddr);
DEBUGASSERT(rhport && maxpacketsize < 2048); DEBUGASSERT(rhport && maxpacketsize < 2048);
/* Expect the device to be unplugged during enumeration */
if (!ep0list || !ep0list->ed)
{
_err("Device was probably removed\n");
return -ENOMEM;
}
edctrl = ep0list->ed; edctrl = ep0list->ed;
/* We must have exclusive access to EP0 and the control list */ /* We must have exclusive access to EP0 and the control list */
@ -3899,20 +3907,18 @@ static void sam_disconnect(struct usbhost_driver_s *drvr,
DEBUGASSERT(rhport != NULL && hport != NULL && hport->ep0); DEBUGASSERT(rhport != NULL && hport != NULL && hport->ep0);
ep0 = (struct sam_eplist_s *)hport->ep0; ep0 = (struct sam_eplist_s *)hport->ep0;
/* Remove the disconnected port from the control list */ /* Did we just dequeue EP0 from a root hub port? */
sam_ep0dequeue(ep0);
/* Did we just dequeue EP0 from a hoot hub port? */
if (ROOTHUB(hport)) if (ROOTHUB(hport))
{ {
/* Remove the disconnected port from the control list */
sam_ep0dequeue(ep0);
rhport->ep0init = false; rhport->ep0init = false;
} }
/* Unbind the class from the port */ /* Unbind the class from the port */
hport->ep0 = NULL;
hport->devclass = NULL; hport->devclass = NULL;
} }

30
drivers/usbhost/usbhost_hub.c
View File

@ -965,12 +965,34 @@ static void usbhost_hub_event(FAR void *arg)
if (connport->devclass != NULL) if (connport->devclass != NULL)
{ {
CLASS_DISCONNECTED(connport->devclass); CLASS_DISCONNECTED(connport->devclass);
connport->devclass = NULL;
if (connport->devclass->connect == usbhost_connect)
{
/* For hubs, the usbhost_disconnect_event function
* (triggered by the CLASS_DISCONNECTED call above)
* will call usbhost_hport_deactivate for us. We
* prevent a crash when a hub is unplugged by skipping
* the second unnecessary usbhost_hport_deactivated
* call here.
*/
connport->devclass = NULL;
}
else
{
connport->devclass = NULL;
/* Free any resources used by the hub port */
usbhost_hport_deactivate(connport);
}
} }
else
{
/* Free any resources used by the hub port */
/* Free any resources used by the hub port */ usbhost_hport_deactivate(connport);
}
usbhost_hport_deactivate(connport);
} }
} }
else if (change) else if (change)