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

Timestamp:

2011-05-11T16:49:28Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

19387b61

Parents:

e1dbcbc (diff), 9212f8a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge development/ changes

File:

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

uspace/drv/ehci-hcd/pci.c

@@ -54 +54 @@
 
 #define CMD_OFFSET 0x0
-#define CONFIGFLAG_OFFSET 0x40
+#define STS_OFFSET 0x4
+#define CFG_OFFSET 0x40
 
 #define USBCMD_RUN 1
@@ -186 +187 @@
         CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to read PCI config space.\n",
             ret);
-        usb_log_info("Register space BAR at %p:%" PRIxn ".\n", (void *) address, value);
+        usb_log_info("Register space BAR at %p:%" PRIxn ".\n",
+            (void *) address, value);
 
         /* clear lower byte, it's not part of the BASE address */
@@ -263 +265 @@
          * It would prevent pre-OS code from interfering. */
         ret = async_req_3_0(parent_phone, DEV_IFACE_ID(PCI_DEV_IFACE),
-           IPC_M_CONFIG_SPACE_WRITE_32, eecp + USBLEGCTLSTS_OFFSET, 0);
+           IPC_M_CONFIG_SPACE_WRITE_32, eecp + USBLEGCTLSTS_OFFSET,
+           0xe0000000);
         CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) zero USBLEGCTLSTS.\n", ret);
-        usb_log_debug("Zeroed USBLEGCTLSTS register.\n");
 
         /* Read again Legacy Support and Control register */
@@ -290 +292 @@
         volatile uint32_t *usbcmd =
             (uint32_t*)((uint8_t*)registers + operation_offset + CMD_OFFSET);
+        volatile uint32_t *usbsts =
+            (uint32_t*)((uint8_t*)registers + operation_offset + STS_OFFSET);
         volatile uint32_t *usbconfigured =
-            (uint32_t*)((uint8_t*)registers + operation_offset
-            + CONFIGFLAG_OFFSET);
+            (uint32_t*)((uint8_t*)registers + operation_offset + CFG_OFFSET);
         usb_log_debug("USBCMD value: %x.\n", *usbcmd);
         if (*usbcmd & USBCMD_RUN) {
                 *usbcmd = 0;
+                while (!(*usbsts & (1 << 12))); /*wait until hc is halted */
                 *usbconfigured = 0;
                 usb_log_info("EHCI turned off.\n");
@@ -301 +305 @@
                 usb_log_info("EHCI was not running.\n");
         }
+        usb_log_debug("Registers: %x(0x00080000):%x(0x00001000):%x(0x0).\n",
+            *usbcmd, *usbsts, *usbconfigured);
 
         async_hangup(parent_phone);