Changeset 735236a in mainline

Timestamp:

2011-07-11T17:55:42Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7372a9a0

Parents:

14426a0

Message:

OHCI: Root hub: Add support for multiple power modes.

Location:

uspace/drv/bus/usb/ohci

Files:

• ohci_regs.h (modified) (1 diff)
• root_hub.c (modified) (2 diffs)

uspace/drv/bus/usb/ohci/ohci_regs.h

@@ -193 +193 @@
                                 *        specified in PPCM(RHDB), or all ports,
                                 *        if power is set globally */
-#define RHS_SET_PORT_POWER RHS_LPSC_FLAG /* synonym for the above */
+#define RHS_SET_GLOBAL_POWER RHS_LPSC_FLAG /* synonym for the above */
 #define RHS_OCIC_FLAG (1 << 17)/* Over-current indicator change   */
 #define RHS_CLEAR_DRWE (1 << 31)

uspace/drv/bus/usb/ohci/root_hub.c

@@ -490 +490 @@
         assert(instance);
 
-        if (!((1 << feature) & port_set_feature_valid_mask))
-                return EINVAL;
         if (port < 1 || port > instance->port_count)
                 return EINVAL;
 
-        instance->registers->rh_port_status[port - 1] =
-            (instance->registers->rh_port_status[port - 1] | (1 << feature))
-            & (~port_clear_feature_valid_mask);
-        return EOK;
+        switch (feature)
+        {
+        case USB_HUB_FEATURE_PORT_POWER:   //8
+                /* No power switching */
+                if (instance->registers->rh_desc_a & RHDA_NPS_FLAG)
+                        return EOK;
+                /* Ganged power switching */
+                if (!(instance->registers->rh_desc_a & RHDA_PSM_FLAG)) {
+                        instance->registers->rh_status = RHS_SET_GLOBAL_POWER;
+                        return EOK;
+                }
+        case USB_HUB_FEATURE_PORT_ENABLE:  //1
+        case USB_HUB_FEATURE_PORT_SUSPEND: //2
+        case USB_HUB_FEATURE_PORT_RESET:   //4
+                /* Nice thing is that these shifts correspond to the position
+                 * of control bits in register */
+                instance->registers->rh_port_status[port - 1] = (1 << feature);
+                return EOK;
+        default:
+                return ENOTSUP;
+        }
 }
 /*----------------------------------------------------------------------------*/
@@ -510 +525 @@
  * @return error code
  */
-int port_feature_clear_request(
-    rh_t *instance, uint16_t feature, uint16_t port)
-{
-        assert(instance);
-
-        if (!((1 << feature) & port_clear_feature_valid_mask))
-                return EINVAL;
+int port_feature_clear_request(rh_t *instance, uint16_t feature, uint16_t port)
+{
+        assert(instance);
+
         if (port < 1 || port > instance->port_count)
                 return EINVAL;
 
-        /* Some weird stuff... */
-        if (feature == USB_HUB_FEATURE_PORT_POWER)
-                feature = USB_HUB_FEATURE_PORT_LOW_SPEED;
-        if (feature == USB_HUB_FEATURE_PORT_SUSPEND)
-                feature = USB_HUB_FEATURE_PORT_OVER_CURRENT;
-
-        instance->registers->rh_port_status[port - 1] =
-            (instance->registers->rh_port_status[port - 1]
-            & (~port_clear_feature_valid_mask))
-            | (1 << feature);
-        return EOK;
+        /* Enabled features to clear: see page 269 of USB specs */
+        switch (feature)
+        {
+        case USB_HUB_FEATURE_PORT_POWER:          //8
+                /* No power switching */
+                if (instance->registers->rh_desc_a & RHDA_NPS_FLAG)
+                        return ENOTSUP;
+                /* Ganged power switching */
+                if (!(instance->registers->rh_desc_a & RHDA_PSM_FLAG)) {
+                        instance->registers->rh_status = RHS_CLEAR_GLOBAL_POWER;
+                        return EOK;
+                }
+                instance->registers->rh_port_status[port - 1] =
+                        RHPS_CLEAR_PORT_POWER;
+                return EOK;
+
+        case USB_HUB_FEATURE_PORT_ENABLE:         //1
+                instance->registers->rh_port_status[port - 1] =
+                        RHPS_CLEAR_PORT_ENABLE;
+                return EOK;
+
+        case USB_HUB_FEATURE_PORT_SUSPEND:        //2
+                instance->registers->rh_port_status[port - 1] =
+                        RHPS_CLEAR_PORT_SUSPEND;
+                return EOK;
+
+        case USB_HUB_FEATURE_C_PORT_CONNECTION:   //16
+        case USB_HUB_FEATURE_C_PORT_ENABLE:       //17
+        case USB_HUB_FEATURE_C_PORT_SUSPEND:      //18
+        case USB_HUB_FEATURE_C_PORT_OVER_CURRENT: //19
+        case USB_HUB_FEATURE_C_PORT_RESET:        //20
+                /* Nice thing is that these shifts correspond to the position
+                 * of control bits in register */
+                instance->registers->rh_port_status[port - 1] = (1 << feature);
+                return EOK;
+        default:
+                return ENOTSUP;
+        }
 }
 /*----------------------------------------------------------------------------*/