Changeset 2770b66 in mainline for uspace/drv/bus/usb/xhci/rh.c

Timestamp:

2017-10-15T15:05:06Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

816f5f4

Parents:

20eaa82

Message:

Fixed few bugs related to control transfers and some deadlocks. Registering control endpoint with HelenOS. Can read out device descriptors through MID and initialize mouse driver!

File:

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

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

@@ -36 +36 @@
 #include <errno.h>
 #include <str_error.h>
+#include <usb/request.h>
 #include <usb/debug.h>
 #include <usb/host/utils/malloc32.h>
 #include <usb/host/bus.h>
 #include <usb/host/ddf_helpers.h>
+#include <usb/host/hcd.h>
 
 #include "debug.h"
@@ -74 +76 @@
 // TODO: This currently assumes the device is attached to rh directly.
 //       Also, we should consider moving a lot of functionailty to xhci bus
-int xhci_rh_address_device(xhci_rh_t *rh, device_t *dev)
+int xhci_rh_address_device(xhci_rh_t *rh, device_t *dev, xhci_bus_t *bus)
 {
         int err;
@@ -160 +162 @@
         usb_log_debug2("Obtained USB address: %d.\n", dev->address);
 
-        // TODO: Ask libusbhost to create a control endpoint for EP0.
-
-        // TODO: Save all data structures in the corresponding xhci_device_t.
-
-        return EOK;
-
+        // Ask libusbhost to create a control endpoint for EP0.
+        bus_t *bus_base = &bus->base;
+        usb_target_t ep0_target = { .address = dev->address, .endpoint = 0 };
+        usb_direction_t ep0_direction = USB_DIRECTION_BOTH;
+
+        // TODO: Should this call be unified with other calls to `bus_add_ep()`?
+        err = bus_add_ep(bus_base, dev, ep0_target.endpoint, ep0_direction,
+            USB_TRANSFER_CONTROL, CTRL_PIPE_MIN_PACKET_SIZE, CTRL_PIPE_MIN_PACKET_SIZE, 1);
+
+        if (err != EOK)
+                goto err_add_ep;
+
+        // Save all data structures in the corresponding xhci_device_t.
+        endpoint_t *ep0_base = bus_find_endpoint(bus_base, ep0_target, ep0_direction);
+        xhci_endpoint_t *ep0 = xhci_endpoint_get(ep0_base);
+        xhci_device_t *xhci_dev = ep0->device;
+
+        xhci_dev->device = dev;
+        xhci_dev->slot_id = slot_id;
+
+        // TODO: Save anything else?
+
+        return EOK;
+
+err_add_ep:
 err_dctx:
         if (dctx) {