Changeset 306a36d in mainline for uspace/lib/usbhost/src/hcd.c

Timestamp:

2017-11-19T23:43:31Z (6 years ago)

Author:

Aearsis <Hlavaty.Ondrej@…>

Branches:

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

Children:

ff14aede

Parents:

e76c0ea

Message:

xhci: configuration of endpoint 0

Moved fetching of the first 8B of device descriptor from usb2_bus to
hcd, and using it in xhci bus. Also, the value was previously read wrong
by the endpoint descriptor macros, although the value is raw in the
device descriptor - now fixed.

File:

• uspace/lib/usbhost/src/hcd.c (modified) (3 diffs)

uspace/lib/usbhost/src/hcd.c

@@ -35 +35 @@
 
 #include <usb/debug.h>
+#include <usb/descriptor.h>
 #include <usb/request.h>
 
@@ -40 +41 @@
 #include <async.h>
 #include <errno.h>
+#include <macros.h>
 #include <usb_iface.h>
 #include <str_error.h>
@@ -59 +61 @@
         hcd_set_implementation(hcd, NULL, NULL, NULL);
 }
+
+/** Get max packet size for the control endpoint 0.
+ *
+ * For LS, HS, and SS devices this value is fixed. For FS devices we must fetch
+ * the first 8B of the device descriptor to determine it.
+ *
+ * @return Combined value of max_packet_size and scheduling oppertunities,
+ *      see usb_standard_device_descriptor_t.
+ */
+int hcd_get_ep0_max_packet_size(uint16_t *mps, hcd_t *hcd, device_t *dev)
+{
+        static const uint16_t mps_fixed [] = {
+                [USB_SPEED_LOW] = 8,
+                [USB_SPEED_HIGH] = 64,
+                [USB_SPEED_SUPER] = 512,
+        };
+
+        if (dev->speed < ARRAY_SIZE(mps_fixed) && mps_fixed[dev->speed] != 0) {
+                *mps = mps_fixed[dev->speed];
+                return EOK;
+        }
+
+        const usb_target_t control_ep = {{
+                .address = dev->address,
+                .endpoint = 0,
+        }};
+
+        usb_standard_device_descriptor_t desc = { 0 };
+        const usb_device_request_setup_packet_t get_device_desc_8 =
+            GET_DEVICE_DESC(CTRL_PIPE_MIN_PACKET_SIZE);
+
+        usb_log_debug("Requesting first 8B of device descriptor.");
+        ssize_t got = hcd_send_batch_sync(hcd, dev, control_ep, USB_DIRECTION_IN,
+            (char *) &desc, CTRL_PIPE_MIN_PACKET_SIZE, *(uint64_t *)&get_device_desc_8,
+            "read first 8 bytes of dev descriptor");
+
+        if (got != CTRL_PIPE_MIN_PACKET_SIZE) {
+                const int err = got < 0 ? got : EOVERFLOW;
+                usb_log_error("Failed to get 8B of dev descr: %s.", str_error(err));
+                return err;
+        }
+
+        *mps = uint16_usb2host(desc.max_packet_size);
+        return EOK;
+}
+
 
 /** Prepare generic usb_transfer_batch and schedule it.