Changeset 3eb0c85 in mainline

Timestamp:

2014-02-02T00:36:35Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8e7c9fe

Parents:

1412b7ee

Message:

ehci: Cleanup

File:

• uspace/drv/bus/usb/ehci/hc.c (modified) (3 diffs)

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

@@ -350 +350 @@
 {
         assert(instance);
-        /* Turn of the HC if it's running, Reseting a running device is
+        /* Turn off the HC if it's running, Reseting a running device is
          * undefined */
         if (!(EHCI_RD(instance->registers->usbsts) & USB_STS_HC_HALTED_FLAG)) {
@@ -377 +377 @@
         /* Use the lowest 4G segment */
         EHCI_WR(instance->registers->ctrldssegment, 0);
-        /* Set periodic list */
+
+        /* Enable periodic list */
         assert(instance->periodic_list_base);
         const uintptr_t phys_base =
@@ -393 +394 @@
         EHCI_SET(instance->registers->usbcmd, USB_CMD_ASYNC_SCHEDULE_FLAG);
 
-        /* start hc and get all ports */
+        /* Start hc and get all ports */
         EHCI_SET(instance->registers->usbcmd, USB_CMD_RUN_FLAG);
         EHCI_SET(instance->registers->configflag, USB_CONFIG_FLAG_FLAG);
-#if 0
-        /*
-         * 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");
-        }
-#endif
+
         usb_log_debug("Registers: \n"
             "\t USBCMD(%p): %x(0x00080000 = at least 1ms between interrupts)\n"