Changeset f126c87 in mainline for uspace/drv/bus/usb/ohci/hc.c

Timestamp:

2016-09-01T16:46:27Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (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 from mainline.

File:

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

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

@@ -177 +177 @@
                 usb_log_error("Failed to create OHCI memory structures: %s.\n",
                     str_error(ret));
-                //TODO: We should disable pio access here
+                // TODO: We should disable pio access here
                 return ret;
         }
@@ -393 +393 @@
                     ohci_emulation_reg, OHCI_RD(*ohci_emulation_reg));
                 /* Zero everything but A20State */
-                //TODO: should we ack interrupts before doing this?
+                // TODO: should we ack interrupts before doing this?
                 OHCI_CLR(*ohci_emulation_reg, ~0x100);
                 usb_log_debug(
@@ -403 +403 @@
         if (OHCI_RD(instance->registers->control) & C_IR) {
                 usb_log_debug("SMM driver: request ownership change.\n");
-                //TODO: should we ack interrupts before doing this?
+                // TODO: should we ack interrupts before doing this?
                 OHCI_SET(instance->registers->command_status, CS_OCR);
                 /* Hope that SMM actually knows its stuff or we can hang here */