Changeset 7278cbc9 in mainline

Timestamp:

2018-01-22T23:53:11Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e546142

Parents:

3ac86a4

Message:

usbhost: dispose the EP0 properly (+some ehci cleanup while debugging)

Location:

uspace

Files:

• drv/bus/usb/ehci/ehci_bus.c (modified) (1 diff)
• drv/bus/usb/ehci/endpoint_list.c (modified) (1 diff)
• drv/bus/usb/ehci/hc.c (modified) (2 diffs)
• lib/usbhost/src/bus.c (modified) (2 diffs)
• lib/usbhost/src/usb2_bus.c (modified) (2 diffs)

uspace/drv/bus/usb/ehci/ehci_bus.c

@@ -70 +70 @@
         endpoint_init(&ehci_ep->base, dev, desc);
 
-        // TODO: extract USB2 information from desc
-        
         if (dma_buffer_alloc(&ehci_ep->dma_buffer, sizeof(qh_t)))
                 return NULL;

uspace/drv/bus/usb/ehci/endpoint_list.c

@@ -95 +95 @@
 {
         assert(instance);
+        assert(instance->list_head);
         assert(ep);
         assert(ep->qh);

uspace/drv/bus/usb/ehci/hc.c

@@ -236 +236 @@
         assert(ep);
         ehci_endpoint_t *ehci_ep = ehci_endpoint_get(ep);
-        usb_log_debug("HC(%p) dequeue EP(?:%d:%s:%s)", instance,
-            ep->endpoint,
+        usb_log_debug("HC(%p) dequeue EP(%d:%d:%s:%s)", instance,
+            ep->device->address, ep->endpoint,
             usb_str_transfer_type_short(ep->transfer_type),
             usb_str_direction(ep->direction));
@@ -360 +360 @@
 
         if (status & (USB_STS_IRQ_FLAG | USB_STS_ERR_IRQ_FLAG)) {
-
-                LIST_INITIALIZE(completed);
-
                 fibril_mutex_lock(&hc->guard);
 

uspace/lib/usbhost/src/bus.c

@@ -208 +208 @@
 
         const bus_ops_t *ops = BUS_OPS_LOOKUP(dev->bus->ops, device_gone);
+        const bus_ops_t *ep_ops = BUS_OPS_LOOKUP(dev->bus->ops, endpoint_unregister);
         assert(ops);
 
@@ -240 +241 @@
 
         /* Tell the HC to release its resources. */
-        ops->device_gone(dev);
-
-        /* Release the EP0 bus reference */
-        endpoint_del_ref(dev->endpoints[0]);
+        if (ops)
+                ops->device_gone(dev);
+
+        /* Check whether the driver didn't forgot EP0 */
+        if (dev->endpoints[0]) {
+                if (ep_ops)
+                        ep_ops->endpoint_unregister(dev->endpoints[0]);
+                /* Release the EP0 bus reference */
+                endpoint_del_ref(dev->endpoints[0]);
+        }
 
         /* Destroy the function, freeing also the device, unlocking mutex. */

uspace/lib/usbhost/src/usb2_bus.c

@@ -209 +209 @@
 }
 
-static void usb2_bus_device_gone(device_t *dev)
-{
-        // TODO: Implement me!
-}
-
 /**
  * Register an endpoint to the bus. Reserves bandwidth.
@@ -245 +240 @@
 const bus_ops_t usb2_bus_ops = {
         .device_enumerate = usb2_bus_device_enumerate,
-        .device_gone = usb2_bus_device_gone,
         .endpoint_register = usb2_bus_register_ep,
         .endpoint_unregister = usb2_bus_unregister_ep,