Changeset df6ded8 in mainline for uspace/drv/bus/usb/usbhub/status.h

Timestamp:

2018-02-28T16:37:50Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b20da0

Parents:

f5e5f73 (diff), b2dca8de (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jakub Jermar <jakub@…> (2018-02-28 16:06:42)

git-committer:

Jakub Jermar <jakub@…> (2018-02-28 16:37:50)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

File:

• uspace/drv/bus/usb/usbhub/status.h (modified) (2 diffs)

uspace/drv/bus/usb/usbhub/status.h

@@ -38 +38 @@
 
 /**
- * structure holding port status and changes flags.
- * should not be accessed directly, use supplied getter/setter methods.
- *
- * For more information refer to tables 11-15 and 11-16 in
- * "Universal Serial Bus Specification Revision 1.1" pages 274 and 277
- * (290 and 293 in pdf)
- *
- */
-typedef uint32_t usb_port_status_t;
-#define USB_HUB_PORT_STATUS_CONNECTION \
-    (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_CONNECTION)))
-#define USB_HUB_PORT_STATUS_ENABLED \
-    (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_ENABLE)))
-#define USB_HUB_PORT_STATUS_SUSPEND \
-    (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_SUSPEND)))
-#define USB_HUB_PORT_STATUS_OC \
-    (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_OVER_CURRENT)))
-#define USB_HUB_PORT_STATUS_RESET \
-    (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_RESET)))
-#define USB_HUB_PORT_STATUS_POWER \
-    (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_POWER)))
-#define USB_HUB_PORT_STATUS_LOW_SPEED \
-    (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_LOW_SPEED)))
-#define USB_HUB_PORT_STATUS_HIGH_SPEED \
-    (uint32_usb2host(1 << 10))
-#define USB_HUB_PORT_STATUS_TEST_MODE \
-    (uint32_usb2host(1 << 11))
-#define USB_HUB_PORT_INDICATOR_CONTROL \
-    (uint32_usb2host(1 << 12))
-
-#define USB_HUB_PORT_C_STATUS_CONNECTION \
-    (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_CONNECTION)))
-#define USB_HUB_PORT_C_STATUS_ENABLED \
-    (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_ENABLE)))
-#define USB_HUB_PORT_C_STATUS_SUSPEND \
-    (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_SUSPEND)))
-#define USB_HUB_PORT_C_STATUS_OC \
-    (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_OVER_CURRENT)))
-#define USB_HUB_PORT_C_STATUS_RESET \
-    (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_RESET)))
-
-/**
  * structure holding hub status and changes flags.
  *
@@ -97 +55 @@
     (uint32_usb2host(1 << (16 + USB_HUB_FEATURE_C_HUB_LOCAL_POWER)))
 
-
-/**
- * speed getter for port status
- *
- * @param status
- * @return speed of usb device (for more see usb specification)
- */
-static inline usb_speed_t usb_port_speed(usb_port_status_t status)
+static inline usb_speed_t usb_port_speed(usb_speed_t hub_speed, uint32_t status)
 {
-        if ((status & USB_HUB_PORT_STATUS_LOW_SPEED) != 0)
+        if (hub_speed == USB_SPEED_SUPER)
+                return USB_SPEED_SUPER;
+        if (hub_speed == USB_SPEED_HIGH
+            && (status & USB2_HUB_PORT_STATUS_HIGH_SPEED))
+                return USB_SPEED_HIGH;
+        if ((status & USB2_HUB_PORT_STATUS_LOW_SPEED) != 0)
                 return USB_SPEED_LOW;
-        if ((status & USB_HUB_PORT_STATUS_HIGH_SPEED) != 0)
-                return USB_SPEED_HIGH;
         return USB_SPEED_FULL;
 }