Changeset 129b821f in mainline for uspace/drv/bus/usb/uhci

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/drv/bus/usb/uhci

Files:

• hc.c (modified) (3 diffs)
• hc.h (modified) (1 diff)
• main.c (modified) (1 diff)

uspace/drv/bus/usb/uhci/hc.c

@@ -51 +51 @@
 #include <usb/host/utils/malloc32.h>
 #include <usb/host/bandwidth.h>
+#include <usb/host/utility.h>
 
 #include "uhci_batch.h"
@@ -258 +259 @@
 }
 
+int hc_setup_roothub(hc_device_t *hcd)
+{
+        return hc_setup_virtual_root_hub(hcd, USB_SPEED_FULL);
+}
+
 /** Safely dispose host controller internal structures
  *
@@ -330 +336 @@
 
         // Check for the roothub, as it does not schedule into lists
-        if (ep->device->speed == USB_SPEED_MAX) {
+        if (ep->device->address == uhci_rh_get_address(&hc->rh)) {
                 // FIXME: We shall check the roothub for active transfer. But
                 // as it is polling, there is no way to make it stop doing so.

uspace/drv/bus/usb/uhci/hc.h

@@ -150 +150 @@
 extern int hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *);
 extern int hc_start(hc_device_t *);
+extern int hc_setup_roothub(hc_device_t *);
 extern int hc_gone(hc_device_t *);
 

uspace/drv/bus/usb/uhci/main.c

@@ -58 +58 @@
         .hc_add = hc_add,
         .start = hc_start,
-        .setup_root_hub = hc_setup_virtual_root_hub,
+        .setup_root_hub = hc_setup_roothub,
         .hc_gone = hc_gone,
 };