Changeset c127e1c in mainline for uspace/drv/bus/usb/ehci/res.c

Timestamp:

2012-04-11T15:37:01Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

49a736e2

Parents:

3a01483 (diff), d11a181 (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:

Mainline changes.

File:

• uspace/drv/bus/usb/ehci/res.c (modified) (4 diffs)

uspace/drv/bus/usb/ehci/res.c

@@ -237 +237 @@
 {
         assert(device);
+        usb_log_debug("Disabling EHCI legacy support.\n");
 
 #define CHECK_RET_RETURN(ret, message...) \
@@ -249 +250 @@
         CHECK_RET_RETURN(ret, "Failed to map registers %p: %s.\n",
             (void *) reg_base, str_error(ret));
+
+        usb_log_debug2("Registers mapped at: %p.\n", regs);
 
         const uint32_t hcc_params =
@@ -286 +289 @@
         if (*usbcmd & USBCMD_RUN) {
                 *usbsts = 0x3f; /* ack all interrupts */
-                *usbint = 0; /* disable all interrutps */
-                *usbconf = 0; /* relase control of RH ports */
+                *usbint = 0; /* disable all interrupts */
+                *usbconf = 0; /* release control of RH ports */
 
                 *usbcmd = 0;
@@ -297 +300 @@
         }
         usb_log_debug("Registers: \n"
-            "\t USBCMD: %x(0x00080000 = at least 1ms between interrupts)\n"
-            "\t USBSTS: %x(0x00001000 = HC halted)\n"
-            "\t USBINT: %x(0x0 = no interrupts).\n"
-            "\t CONFIG: %x(0x0 = ports controlled by companion hc).\n",
-            *usbcmd, *usbsts, *usbint, *usbconf);
+            "\t USBCMD(%p): %x(0x00080000 = at least 1ms between interrupts)\n"
+            "\t USBSTS(%p): %x(0x00001000 = HC halted)\n"
+            "\t USBINT(%p): %x(0x0 = no interrupts).\n"
+            "\t CONFIG(%p): %x(0x0 = ports controlled by companion hc).\n",
+            usbcmd, *usbcmd, usbsts, *usbsts, usbint, *usbint, usbconf,*usbconf);
 
         return ret;