Changeset f3ae58b in mainline

Timestamp:

2018-01-29T14:10:47Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

1bab1c8

Parents:

7bdfcaf

Message:

libusbhost: usb2_bus needs to release address when the device is gone

Location:

uspace

Files:

• drv/bus/usb/ehci/ehci_bus.c (modified) (2 diffs)
• drv/bus/usb/ohci/ohci_bus.c (modified) (2 diffs)
• drv/bus/usb/uhci/hc.c (modified) (2 diffs)
• lib/usbhost/include/usb/host/usb2_bus.h (modified) (1 diff)
• lib/usbhost/src/usb2_bus.c (modified) (1 diff)

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

@@ -63 +63 @@
 }
 
+static void ehci_device_gone(device_t *dev)
+{
+        ehci_bus_t *bus = (ehci_bus_t *) dev->bus;
+        usb2_bus_device_gone(&bus->helper, dev);
+}
+
 /** Creates new hcd endpoint representation.
  */
@@ -163 +169 @@
 
         .device_enumerate = ehci_device_enumerate,
+        .device_gone = ehci_device_gone,
 
         .endpoint_destroy = ehci_endpoint_destroy,

uspace/drv/bus/usb/ohci/ohci_bus.c

@@ -63 +63 @@
 }
 
+static void ohci_device_gone(device_t *dev)
+{
+        ohci_bus_t *bus = (ohci_bus_t *) dev->bus;
+        usb2_bus_device_gone(&bus->helper, dev);
+}
+
 /** Creates new hcd endpoint representation.
  */
@@ -172 +178 @@
 
         .device_enumerate = ohci_device_enumerate,
+        .device_gone = ohci_device_gone,
 
         .endpoint_destroy = ohci_endpoint_destroy,

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

@@ -412 +412 @@
 }
 
+static void device_gone(device_t *dev)
+{
+        hc_t * const hc = bus_to_hc(dev->bus);
+        usb2_bus_device_gone(&hc->bus_helper, dev);
+}
+
 static int hc_status(bus_t *, uint32_t *);
 static int hc_schedule(usb_transfer_batch_t *);
@@ -420 +426 @@
 
         .device_enumerate = device_enumerate,
+        .device_gone = device_gone,
 
         .endpoint_create = endpoint_create,

uspace/lib/usbhost/include/usb/host/usb2_bus.h

@@ -64 +64 @@
 
 extern int usb2_bus_device_enumerate(usb2_bus_helper_t *, device_t *);
+extern void usb2_bus_device_gone(usb2_bus_helper_t *, device_t *);
+
 extern int usb2_bus_endpoint_register(usb2_bus_helper_t *, endpoint_t *);
 extern void usb2_bus_endpoint_unregister(usb2_bus_helper_t *, endpoint_t *);

uspace/lib/usbhost/src/usb2_bus.c

@@ -203 +203 @@
 }
 
+void usb2_bus_device_gone(usb2_bus_helper_t *helper, device_t *dev)
+{
+        release_address(helper, dev->address);
+}
+
 /**
  * Register an endpoint to the bus. Reserves bandwidth.