Changeset ee794529 in mainline for uspace/drv/bus/usb/xhci

Timestamp:

2017-10-22T16:38:19Z (8 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

89cefe78

Parents:

4594baa

Message:

Refactoring. Renamed functions in bus endpoint interface. Register/release is now register/unregister to prevent name collisions with use/release.

File:

• uspace/drv/bus/usb/xhci/bus.c (modified) (4 diffs)

uspace/drv/bus/usb/xhci/bus.c

@@ -118 +118 @@
         xhci_device_t *xhci_dev = xhci_device_get(dev);
 
-        /* Release remaining endpoints. */
+        /* Unregister remaining endpoints. */
         for (size_t i = 0; i < ARRAY_SIZE(xhci_dev->endpoints); ++i) {
                 if (!xhci_dev->endpoints[i])
@@ -124 +124 @@
 
                 // FIXME: ignoring return code
-                bus_release_endpoint(&bus->base, &xhci_dev->endpoints[i]->base);
+                bus_unregister_endpoint(&bus->base, &xhci_dev->endpoints[i]->base);
         }
 
@@ -257 +257 @@
 }
 
-static int release_endpoint(bus_t *bus_base, endpoint_t *ep)
+static int unregister_endpoint(bus_t *bus_base, endpoint_t *ep)
 {
         xhci_bus_t *bus = bus_to_xhci_bus(bus_base);
         assert(bus);
 
-        usb_log_info("Endpoint(%d:%d) released from XHCI bus.", ep->target.address, ep->target.endpoint);
+        usb_log_info("Endpoint(%d:%d) unregistered from XHCI bus.", ep->target.address, ep->target.endpoint);
 
         xhci_device_t *xhci_dev = xhci_device_get(ep->device);
@@ -329 +329 @@
 
         .register_endpoint = register_endpoint,
-        .release_endpoint = release_endpoint,
+        .unregister_endpoint = unregister_endpoint,
         .find_endpoint = find_endpoint,