Changeset 615abda in mainline for uspace/drv/bus/usb/ehci/hc.c

Timestamp:

2014-01-19T01:34:03Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4ee5272

Parents:

c9e954c

Message:

ehci: plug legacy disabling code

Remove CHECK_RET macro

File:

• uspace/drv/bus/usb/ehci/hc.c (modified) (1 diff)

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

@@ -280 +280 @@
 void hc_start(hc_t *instance)
 {
+        assert(instance);
+        /*
+         * TURN OFF EHCI FOR NOW
+         */
+
+        usb_log_debug("USBCMD value: %x.\n",
+            EHCI_RD(instance->registers->usbcmd));
+        if (EHCI_RD(instance->registers->usbcmd) & USB_CMD_RUN_FLAG) {
+                /* disable all interrupts */
+                EHCI_WR(instance->registers->usbintr, 0);
+                /* ack all interrupts */
+                EHCI_WR(instance->registers->usbsts, 0x3f);
+                /* release RH ports */
+                EHCI_WR(instance->registers->configflag, 0);
+                EHCI_WR(instance->registers->usbcmd, 0);
+                /* Wait until hc is halted */
+                while ((EHCI_RD(instance->registers->usbsts) & USB_STS_HC_HALTED_FLAG) == 0);
+                usb_log_info("EHCI turned off.\n");
+        } else {
+                usb_log_info("EHCI was not running.\n");
+        }
+        usb_log_debug("Registers: \n"
+            "\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",
+            &instance->registers->usbcmd, EHCI_RD(instance->registers->usbcmd),
+            &instance->registers->usbsts, EHCI_RD(instance->registers->usbsts),
+            &instance->registers->usbintr, EHCI_RD(instance->registers->usbintr),
+            &instance->registers->configflag, EHCI_RD(instance->registers->configflag));
 }