Changeset 0d3167e in mainline for uspace/drv/ehci-hcd/pci.c

Timestamp:

2011-03-07T16:22:55Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a7e2f0d

Parents:

275bf456

Message:

EHCI, zero configured flag to surrender root hub port control

File:

• uspace/drv/ehci-hcd/pci.c (modified) (3 diffs)

uspace/drv/ehci-hcd/pci.c

@@ -52 +52 @@
 #define HCC_PARAMS_EECP_MASK 0xff
 #define HCC_PARAMS_EECP_OFFSET 8
+
+#define CMD_OFFSET 0x0
+#define CONFIGFLAG_OFFSET 0x40
 
 #define USBCMD_RUN 1
@@ -258 +261 @@
         }
 
-
         /* Zero SMI enables in legacy control register.
          * It would prevent pre-OS code from interfering. */
@@ -288 +290 @@
         /* Zero USBCMD register. */
         volatile uint32_t *usbcmd =
-         (uint32_t*)((uint8_t*)registers + operation_offset);
+            (uint32_t*)((uint8_t*)registers + operation_offset + CMD_OFFSET);
+        volatile uint32_t *usbconfigured =
+            (uint32_t*)((uint8_t*)registers + operation_offset
+            + CONFIGFLAG_OFFSET);
         usb_log_debug("USBCMD value: %x.\n", *usbcmd);
         if (*usbcmd & USBCMD_RUN) {
                 *usbcmd = 0;
+                *usbconfigured = 0;
                 usb_log_info("EHCI turned off.\n");
         } else {