Changeset 2fe28ca1 in mainline

Timestamp:

2011-07-11T19:17:32Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0c224b2

Parents:

302f9b2

Message:

OHCI: Root hub: Set over-current protection mode to match power mode.

Fix typo.

Location:

uspace/drv/bus/usb

Files:

• ohci/root_hub.c (modified) (3 diffs)
• usbhub/usbhub.c (modified) (1 diff)

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

@@ -177 +177 @@
         /* Set port power mode to no power-switching. (always on) */
         instance->registers->rh_desc_a |= RHDA_NPS_FLAG;
+        /* Set to no overcurrent */
+        instance->registers->rh_desc_a |= RHDA_NOCP_FLAG;
 #elif OHCI_POWER == 1
         /* Set port power mode to no ganged power-switching. */
@@ -182 +184 @@
         instance->registers->rh_desc_a &= ~RHDA_PSM_FLAG;
         instance->registers->rh_status = RHS_CLEAR_GLOBAL_POWER;
+        /* Set to global over-current */
+        instance->registers->rh_desc_a &= ~RHDA_NOCP_FLAG;
+        instance->registers->rh_desc_a &= ~RHDA_OCPM_FLAG;
 #else
         /* Set port power mode to no per port power-switching. */
@@ -193 +198 @@
         instance->registers->rh_desc_b |=
                 ((1 << (instance->port_count + 1)) - 1) << RHDB_PCC_SHIFT;
+        /* Set per port over-current */
+        instance->registers->rh_desc_a &= ~RHDA_NOCP_FLAG;
+        instance->registers->rh_desc_a |= RHDA_OCPM_FLAG;
 #endif
 

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

@@ -279 +279 @@
                                 if (!per_port_power) {
                                         usb_log_debug(
-                                            "Ganged power switching mode,"
+                                            "Ganged power switching mode, "
                                             "one port is enough.\n");
                                         break;