Changeset 176a70a in mainline

Timestamp:

2017-08-17T17:49:32Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

d3dce3f

Parents:

c0ec9e7

Message:

Simple implementation of endpoint management with slot id's.

Location:

uspace/drv/bus/usb/xhci

Files:

• endpoint.c (modified) (1 diff)
• endpoint.h (modified) (1 diff)

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

@@ -40 +40 @@
 int endpoint_init(hcd_t *hcd, endpoint_t *ep)
 {
-        // TODO: Implement me!
-        usb_log_debug("Endpoint initialized.");
-        return ENAK;
+        assert(ep);
+        xhci_endpoint_t *xhci_ep = malloc(sizeof(xhci_endpoint_t));
+        if (xhci_ep == NULL)
+                return ENOMEM;
+
+        /* FIXME: Set xhci_ep->slot_id */
+
+        fibril_mutex_lock(&ep->guard);
+        ep->hc_data.data = xhci_ep;
+        /* FIXME: The two handlers below should be implemented. */
+        ep->hc_data.toggle_get = NULL;
+        ep->hc_data.toggle_set = NULL;
+        fibril_mutex_unlock(&ep->guard);
+
+        usb_log_debug("Endpoint %d:%d initialized.", ep->address, ep->endpoint);
+        return EOK;
 }
 
 void endpoint_fini(hcd_t *hcd, endpoint_t *ep)
 {
-        // TODO: Implement me!
-        usb_log_debug("Endpoint destroyed.");
+        assert(hcd);
+        assert(ep);
+        xhci_endpoint_t *xhci_ep = endpoint_get(ep);
+        /* FIXME: Tear down TR's? */
+        if (xhci_ep) {
+                free(xhci_ep);
+        }
+
+        usb_log_debug("Endpoint %d:%d destroyed.", ep->address, ep->endpoint);
 }
 

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

@@ -43 +43 @@
 #include <usb/host/hcd.h>
 
+/** Connector structure linking endpoint context to the endpoint. */
+typedef struct xhci_endpoint {
+  uint32_t slot_id;
+} xhci_endpoint_t;
+
 int endpoint_init(hcd_t *hcd, endpoint_t *ep);
 void endpoint_fini(hcd_t *hcd, endpoint_t *ep);
+
+static inline xhci_endpoint_t * endpoint_get(const endpoint_t *ep)
+{
+  assert(ep);
+        return ep->hc_data.data;
+}
 
 #endif