Changeset c10daa8 in mainline for uspace/drv/bus/usb/xhci/endpoint.c

Timestamp:

2017-10-13T12:32:57Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

063dfe8

Parents:

366e9b6

Message:

Refactored XHCI bus to hold devices instead of endpoints. Added middle layer to keep track of endpoints within devices.

File:

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

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

@@ -50 +50 @@
 
         endpoint_init(ep, bus);
-
-        /* FIXME: Set xhci_ep->slot_id */
+        xhci_ep->device = NULL;
 
         usb_log_debug("XHCI Endpoint %d:%d initialized.", ep->target.address, ep->target.endpoint);
@@ -69 +68 @@
 }
 
+int xhci_device_init(xhci_device_t *dev, xhci_bus_t *bus)
+{
+        memset(&dev->endpoints, 0, sizeof(dev->endpoints));
+        dev->active_endpoint_count = 0;
+        return EOK;
+}
+
+void xhci_device_fini(xhci_device_t *dev)
+{
+        // TODO: Check that all endpoints are dead.
+}
+
+int xhci_device_add_endpoint(xhci_device_t *dev, xhci_endpoint_t *ep)
+{
+        assert(dev->address == ep->base.target.address);
+        assert(!dev->endpoints[ep->base.target.endpoint]);
+        assert(!ep->device);
+
+        ep->device = dev;
+        dev->endpoints[ep->base.target.endpoint] = ep;
+        ++dev->active_endpoint_count;
+        return EOK;
+}
+
+int xhci_device_remove_endpoint(xhci_device_t *dev, xhci_endpoint_t *ep)
+{
+        assert(dev->address == ep->base.target.address);
+        assert(dev->endpoints[ep->base.target.endpoint]);
+        assert(dev == ep->device);
+
+        ep->device = NULL;
+        dev->endpoints[ep->base.target.endpoint] = NULL;
+        --dev->active_endpoint_count;
+        return EOK;
+}
+
+xhci_endpoint_t * xhci_device_get_endpoint(xhci_device_t *dev, usb_endpoint_t ep)
+{
+        return dev->endpoints[ep];
+}
+
 /**
  * @}