Changeset 8ea7459 in mainline for uspace/drv/bus/usb/xhci/bus.c

Timestamp:

2017-10-21T12:17:09Z (8 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

f270ecb

Parents:

d1d7a92

Message:

Refactored some parts of RH to HC. Also moved some bus ops around.

File:

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

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

@@ -94 +94 @@
 }
 
-static int enumerate_device(bus_t *bus, hcd_t *hcd, device_t *dev)
+int xhci_bus_remove_device(xhci_bus_t *bus, xhci_hc_t *hc, device_t *dev)
+{
+        // TODO: Implement me!
+        return ENOTSUP;
+}
+
+/** Ops receive generic bus_t pointer. */
+static inline xhci_bus_t *bus_to_xhci_bus(bus_t *bus_base)
+{
+        assert(bus_base);
+        return (xhci_bus_t *) bus_base;
+}
+
+static int enumerate_device(bus_t *bus_base, hcd_t *hcd, device_t *dev)
 {
         xhci_hc_t *hc = hcd_get_driver_data(hcd);
         assert(hc);
 
-        return xhci_bus_enumerate_device((xhci_bus_t *) bus, hc, dev);
-}
-
-static int remove_device(bus_t *bus, hcd_t *hcd, device_t *dev)
-{
-        // TODO: Implement me!
-
-        return ENOTSUP;
-}
-
-/** Ops receive generic bus_t pointer. */
-static inline xhci_bus_t *bus_to_xhci_bus(bus_t *bus_base)
-{
-        assert(bus_base);
-        return (xhci_bus_t *) bus_base;
+        xhci_bus_t *bus = bus_to_xhci_bus(bus_base);
+        assert(bus);
+
+        return xhci_bus_enumerate_device(bus, hc, dev);
+}
+
+static int remove_device(bus_t *bus_base, hcd_t *hcd, device_t *dev)
+{
+        xhci_hc_t *hc = hcd_get_driver_data(hcd);
+        assert(hc);
+
+        xhci_bus_t *bus = bus_to_xhci_bus(bus_base);
+        assert(bus);
+
+        return xhci_bus_remove_device(bus, hc, dev);
 }
 
@@ -246 +259 @@
                 return res;
 
-        xhci_device_remove_endpoint(hashed_dev->device, xhci_endpoint_get(ep));
+        res = xhci_device_remove_endpoint(hashed_dev->device, xhci_endpoint_get(ep));
+        if (res != EOK)
+                return res;
 
         if (hashed_dev->device->active_endpoint_count == 0) {