Changeset 129b821f in mainline for uspace/lib

Timestamp:

2018-01-20T12:34:50Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

682c9354

Parents:

60d3f35

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-20 12:33:42)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-20 12:34:50)

Message:

usbhub: be aware of its own speed

This resulted in a bunch of changes just because the roothubs in older
HC's are virtual, and need to be aware of their own speed too.

Location:

uspace/lib

Files:

• usbdev/include/usb/dev/device.h (modified) (1 diff)
• usbdev/src/devdrv.c (modified) (1 diff)
• usbhost/include/usb/host/utility.h (modified) (1 diff)
• usbhost/src/utility.c (modified) (2 diffs)

uspace/lib/usbdev/include/usb/dev/device.h

@@ -90 +90 @@
 int usb_device_unmap_ep(usb_endpoint_mapping_t *);
 
+usb_speed_t usb_device_get_speed(usb_device_t *);
 int usb_device_get_iface_number(usb_device_t *);
 devman_handle_t usb_device_get_devman_handle(usb_device_t *);

uspace/lib/usbdev/src/devdrv.c

@@ -364 +364 @@
 }
 
+usb_speed_t usb_device_get_speed(usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        return usb_dev->speed;
+}
+
 int usb_device_get_iface_number(usb_device_t *usb_dev)
 {

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

@@ -48 +48 @@
 int hc_get_ep0_max_packet_size(uint16_t *, bus_t *, device_t *);
 void hc_reset_toggles(const usb_transfer_batch_t *batch, endpoint_reset_toggle_t);
-int hc_setup_virtual_root_hub(hc_device_t *);
+int hc_setup_virtual_root_hub(hc_device_t *, usb_speed_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 *);

uspace/lib/usbhost/src/utility.c

@@ -177 +177 @@
  * @return Error code
  */
-int hc_setup_virtual_root_hub(hc_device_t *hcd)
+int hc_setup_virtual_root_hub(hc_device_t *hcd, usb_speed_t rh_speed)
 {
         int err;
@@ -183 +183 @@
         assert(hcd);
 
-        device_t *dev = hcd_ddf_fun_create(hcd, USB_SPEED_MAX);
+        device_t *dev = hcd_ddf_fun_create(hcd, rh_speed);
         if (!dev) {
                 usb_log_error("Failed to create function for the root hub.");