Changeset a61c683 in mainline

Timestamp:

2011-09-23T19:44:28Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

400f363

Parents:

aefa0d5

Message:

usbhub: Fix endian TODOs

Location:

uspace/drv/bus/usb/usbhub

Files:

• port_status.h (modified) (2 diffs)
• usbhub.c (modified) (1 diff)

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

@@ -47 +47 @@
  */
 typedef uint32_t usb_port_status_t;
-// TODO Mind the endiannes, changes are in the first byte of the second word
-// status is in the first byte of the first word
-#define USB_HUB_PORT_STATUS_CONNECTION (1 << (USB_HUB_FEATURE_PORT_CONNECTION))
-#define USB_HUB_PORT_STATUS_ENABLED (1 << (USB_HUB_FEATURE_PORT_ENABLE))
-#define USB_HUB_PORT_STATUS_SUSPEND (1 << (USB_HUB_FEATURE_PORT_SUSPEND))
-#define USB_HUB_PORT_STATUS_OC (1 << (USB_HUB_FEATURE_PORT_OVER_CURRENT))
-#define USB_HUB_PORT_STATUS_RESET (1 << (USB_HUB_FEATURE_PORT_RESET))
-#define USB_HUB_PORT_STATUS_POWER (1 << (USB_HUB_FEATURE_PORT_POWER))
-#define USB_HUB_PORT_STATUS_LOW_SPEED (1 << (USB_HUB_FEATURE_PORT_LOW_SPEED))
-#define USB_HUB_PORT_STATUS_HIGH_SPEED (1 << 10)
+#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_C_STATUS_CONNECTION \
-    (1 << (USB_HUB_FEATURE_C_PORT_CONNECTION))
+    (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_CONNECTION)))
 #define USB_HUB_PORT_C_STATUS_ENABLED \
-    (1 << (USB_HUB_FEATURE_C_PORT_ENABLE))
+    (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_ENABLE)))
 #define USB_HUB_PORT_C_STATUS_SUSPEND \
-    (1 << (USB_HUB_FEATURE_C_PORT_SUSPEND))
+    (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_SUSPEND)))
 #define USB_HUB_PORT_C_STATUS_OC \
-    (1 << (USB_HUB_FEATURE_C_PORT_OVER_CURRENT))
+    (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_OVER_CURRENT)))
 #define USB_HUB_PORT_C_STATUS_RESET \
-    (1 << (USB_HUB_FEATURE_C_PORT_RESET))
+    (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_RESET)))
 
 /**
@@ -77 +83 @@
  */
 typedef uint32_t usb_hub_status_t;
-// TODO Mind the endiannes, changes are in the first byte of the second word
-// status is in the first byte of the first word
 #define USB_HUB_STATUS_OVER_CURRENT \
-    (1 << (USB_HUB_FEATURE_HUB_OVER_CURRENT))
+    (uint32_usb2host(1 << (USB_HUB_FEATURE_HUB_OVER_CURRENT)))
 #define USB_HUB_STATUS_LOCAL_POWER \
-    (1 << (USB_HUB_FEATURE_HUB_LOCAL_POWER))
+    (uint32_usb2host(1 << (USB_HUB_FEATURE_HUB_LOCAL_POWER)))
 
 #define USB_HUB_STATUS_C_OVER_CURRENT \
-    (1 << (16 + USB_HUB_FEATURE_C_HUB_OVER_CURRENT))
+    (uint32_usb2host(1 << (16 + USB_HUB_FEATURE_C_HUB_OVER_CURRENT)))
 #define USB_HUB_STATUS_C_LOCAL_POWER \
-    (1 << (16 + USB_HUB_FEATURE_C_HUB_LOCAL_POWER))
+    (uint32_usb2host(1 << (16 + USB_HUB_FEATURE_C_HUB_LOCAL_POWER)))
 
 

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -405 +405 @@
 
         /* Handle status changes */
-        if (status & USB_HUB_STATUS_C_OVER_CURRENT)
+        if (status & USB_HUB_STATUS_C_OVER_CURRENT) {
                 usb_hub_over_current(hub_info, status);
+        }
 
         if (status & USB_HUB_STATUS_C_LOCAL_POWER) {