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

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/ehci

Files:

• hc.c (modified) (1 diff)
• hc.h (modified) (1 diff)
• hw_struct/queue_head.c (modified) (1 diff)
• main.c (modified) (2 diffs)

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

@@ -473 +473 @@
 }
 
+/**
+ * Setup roothub as a virtual hub.
+ */
+int hc_setup_roothub(hc_device_t *hcd)
+{
+        return hc_setup_virtual_root_hub(hcd, USB_SPEED_HIGH);
+}
+
 /** Initialize memory structures used by the EHCI hcd.
  *

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

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

uspace/drv/bus/usb/ehci/hw_struct/queue_head.c

@@ -46 +46 @@
         [USB_SPEED_FULL] = QH_EP_CHAR_EPS_FS,
         [USB_SPEED_HIGH] = QH_EP_CHAR_EPS_HS,
-
-        /* Solely for the roothub */
-        [USB_SPEED_MAX] = 0,
 };
 

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

@@ -37 +37 @@
 #include <io/logctl.h>
 #include <usb/host/hcd.h>
-#include <usb/host/utility.h>
 
 #include "res.h"
@@ -52 +51 @@
         .claim = disable_legacy,
         .start = hc_start,
-        .setup_root_hub = hc_setup_virtual_root_hub,
+        .setup_root_hub = hc_setup_roothub,
         .hc_gone = hc_gone,
 };