Changeset 0206d35 in mainline for uspace/lib/usbhost/src/usb2_bus.c

Timestamp:

2017-10-25T00:03:57Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

c3d926f

Parents:

56db65d

Message:

Moving things around to improve isolation of responsibilities

Bus interface was simplified, xHCI implementation of address_device was spread into stack of rh → bus → hc and back.

File:

• uspace/lib/usbhost/src/usb2_bus.c (modified) (3 diffs)

uspace/lib/usbhost/src/usb2_bus.c

@@ -120 +120 @@
         /* Add default pipe on default address */
         usb_log_debug("Device(%d): Adding default target (0:0)", address);
-        err = bus_add_ep(bus, dev, &usb2_default_control_ep);
+
+        endpoint_t *default_ep;
+        err = bus_add_endpoint(bus, dev, &usb2_default_control_ep, &default_ep);
         if (err != EOK) {
                 usb_log_error("Device(%d): Failed to add default target: %s.",
@@ -169 +171 @@
         /* Register EP on the new address */
         usb_log_debug("Device(%d): Registering control EP.", address);
-        err = bus_add_ep(bus, dev, &control_ep);
+        err = bus_add_endpoint(bus, dev, &control_ep, NULL);
         if (err != EOK) {
                 usb_log_error("Device(%d): Failed to register EP0: %s",
@@ -176 +178 @@
         }
 
-        bus_remove_ep(bus, dev, usb2_default_target, USB_DIRECTION_BOTH);
+        err = bus_remove_endpoint(bus, default_ep);
+        assert(err == EOK);
+        endpoint_del_ref(default_ep);
+
+        err = bus_release_address(bus, address);
+        assert(err == EOK);
+
         return EOK;
 
 err_default_control_ep:
-        bus_remove_ep(bus, dev, usb2_default_target, USB_DIRECTION_BOTH);
+        bus_remove_endpoint(bus, default_ep);
+        endpoint_del_ref(default_ep);
 err_address:
         bus_release_address(bus, address);