Changeset 3476be8 in mainline

Timestamp:

2011-05-13T14:15:24Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

4fe3b6d, 8fcaeed

Parents:

aca3489

Message:

definition of status masks uses definitions in ohci_regs
old code still commented - untested

File:

• uspace/drv/ohci/root_hub.c (modified) (8 diffs)

uspace/drv/ohci/root_hub.c

@@ -41 +41 @@
 #include "usb/classes/classes.h"
 #include "usb/devdrv.h"
+#include "ohci_regs.h"
+
 #include <usb/request.h>
 #include <usb/classes/hub.h>
@@ -109 +111 @@
  */
 static const uint32_t hub_clear_feature_valid_mask =
-    (1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER) |
-    (1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT);
+    RHS_OCIC_FLAG |
+    RHS_CLEAR_PORT_POWER;
 
 /**
@@ -116 +118 @@
  */
 static const uint32_t hub_clear_feature_by_writing_one_mask =
-    1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER;
+   RHS_CLEAR_PORT_POWER;
+   // 1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER;
 
 /**
@@ -122 +125 @@
  */
 static const uint32_t hub_set_feature_valid_mask =
-    (1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT) |
-    (1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
+    RHS_LPSC_FLAG |
+    RHS_OCIC_FLAG;
+    //(1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT) |
+    //(1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
 
 /**
@@ -129 +134 @@
  */
 static const uint32_t hub_set_feature_direct_mask =
-    (1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT);
+    RHS_SET_PORT_POWER;
+    //(1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT);
 
 /**
@@ -135 +141 @@
  */
 static const uint32_t port_set_feature_valid_mask =
-    (1 << USB_HUB_FEATURE_PORT_ENABLE) |
-    (1 << USB_HUB_FEATURE_PORT_SUSPEND) |
-    (1 << USB_HUB_FEATURE_PORT_RESET) |
-    (1 << USB_HUB_FEATURE_PORT_POWER);
+    RHPS_SET_PORT_ENABLE |
+    RHPS_SET_PORT_SUSPEND |
+    RHPS_SET_PORT_RESET |
+    RHPS_SET_PORT_POWER;
 
 /**
@@ -144 +150 @@
  */
 static const uint32_t port_clear_feature_valid_mask =
+    RHPS_CCS_FLAG |
+    RHPS_SET_PORT_SUSPEND |
+    RHPS_POCI_FLAG |
+    RHPS_SET_PORT_POWER |
+    RHPS_CSC_FLAG |
+    RHPS_PESC_FLAG |
+    RHPS_PSSC_FLAG |
+    RHPS_OCIC_FLAG |
+    RHPS_PRSC_FLAG;
+
+/*
+
     (1 << USB_HUB_FEATURE_PORT_CONNECTION) |
     (1 << USB_HUB_FEATURE_PORT_SUSPEND) |
@@ -153 +171 @@
     (1 << USB_HUB_FEATURE_C_PORT_OVER_CURRENT) |
     (1 << USB_HUB_FEATURE_C_PORT_RESET);
+ */
 //note that USB_HUB_FEATURE_PORT_POWER bit is translated into
-//USB_HUB_FEATURE_PORT_LOW_SPEED
+//USB_HUB_FEATURE_PORT_LOW_SPEED for port set feature request
 
 /**
  * bitmask with port status changes
  */
-static const uint32_t port_status_change_mask =
-    (1 << USB_HUB_FEATURE_C_PORT_CONNECTION) |
+static const uint32_t port_status_change_mask = RHPS_CHANGE_WC_MASK;
+/*    (1 << USB_HUB_FEATURE_C_PORT_CONNECTION) |
     (1 << USB_HUB_FEATURE_C_PORT_ENABLE) |
     (1 << USB_HUB_FEATURE_C_PORT_OVER_CURRENT) |
     (1 << USB_HUB_FEATURE_C_PORT_RESET) |
     (1 << USB_HUB_FEATURE_C_PORT_SUSPEND);
-
+*/
 
 static int create_serialized_hub_descriptor(rh_t *instance);