Changeset 2833bb4 in mainline for uspace/lib/usbhost

Timestamp:

2018-01-19T17:38:22Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

7e5a12b

Parents:

944f8fdd

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-19 17:38:10)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-19 17:38:22)

Message:

xhci: recognise hubs

Location:

uspace/lib/usbhost

Files:

• include/usb/host/utility.h (modified) (2 diffs)
• src/utility.c (modified) (1 diff)

uspace/lib/usbhost/include/usb/host/utility.h

@@ -41 +41 @@
 #include <usb/host/usb_transfer_batch.h>
 #include <usb/descriptor.h>
+#include <usb/classes/hub.h>
 #include <usb/request.h>
 
@@ -47 +48 @@
 int hc_setup_virtual_root_hub(hc_device_t *);
 int hc_get_device_desc(device_t *, usb_standard_device_descriptor_t *);
+int hc_get_hub_desc(device_t *, usb_hub_descriptor_header_t *);
 int hc_device_explore(device_t *);
 

uspace/lib/usbhost/src/utility.c

@@ -162 +162 @@
 }
 
+int hc_get_hub_desc(device_t *device, usb_hub_descriptor_header_t *desc)
+{
+        const usb_target_t control_ep = {{
+                .address = device->address,
+                .endpoint = 0,
+        }};
+
+        const usb_device_request_setup_packet_t get_hub_desc = {
+                .request_type = SETUP_REQUEST_TYPE_DEVICE_TO_HOST
+                    | (USB_REQUEST_TYPE_CLASS << 5)
+                    | USB_REQUEST_RECIPIENT_DEVICE,
+                .request = USB_DEVREQ_GET_DESCRIPTOR, \
+                .value = uint16_host2usb(USB_DESCTYPE_HUB << 8), \
+                .length = sizeof(*desc),
+        };
+
+        usb_log_debug("Device(%d): Requesting hub descriptor.",
+            device->address);
+        ssize_t got = bus_device_send_batch_sync(device, control_ep, USB_DIRECTION_IN,
+            (char *) desc, sizeof(*desc), *(uint64_t *)&get_hub_desc,
+            "get hub descriptor");
+
+        if (got < 0)
+                return got;
+
+        return got == sizeof(*desc) ? EOK : EOVERFLOW;
+}
+
 int hc_device_explore(device_t *device)
 {