Changeset b4f291d in mainline

Timestamp:

2011-07-12T11:33:34Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

dfe4955

Parents:

7d5708d

Message:

OHCI: Export root hub power switching modes to config.

Files:

• HelenOS.config (modified) (1 diff)
• uspace/drv/bus/usb/ohci/root_hub.c (modified) (2 diffs)

HelenOS.config

@@ -573 +573 @@
 ! CONFIG_RUN_VIRTUAL_USB_HC (n/y)
 
-% Polling UHCI & OHCI (no interrupts)
+% Polling UHCI (no interrupts)
 ! [PLATFORM=ia32|PLATFORM=amd64] CONFIG_USBHC_NO_INTERRUPTS (n/y)
 
+% OHCI root hub port power switching
+@ "no"
+@ "ganged"
+@ "per_port"
+! OHCI_POWER_SWITCH (choice)

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

@@ -132 +132 @@
 } while (0)
 
-#define OHCI_POWER 2
-
 /** Root Hub driver structure initialization.
  *
@@ -156 +154 @@
         instance->unfinished_interrupt_transfer = NULL;
 
-#if OHCI_POWER == 0
+#ifdef OHCI_POWER_SWITCH_no
         /* Set port power mode to no power-switching. (always on) */
         instance->registers->rh_desc_a |= RHDA_NPS_FLAG;
-        /* Set to no overcurrent */
+        /* Set to no over-current reporting */
         instance->registers->rh_desc_a |= RHDA_NOCP_FLAG;
-#elif OHCI_POWER == 1
+#elif defined OHCI_POWER_SWITCH_ganged
         /* Set port power mode to no ganged power-switching. */
         instance->registers->rh_desc_a &= ~RHDA_NPS_FLAG;