Changeset 7deca26 in mainline for uspace/drv/bus/usb/uhci/hc.c

Timestamp:

2012-07-22T14:16:22Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

7df0c2ff

Parents:

0b293a6 (diff), 76c07e4 (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 with mainline

File:

• uspace/drv/bus/usb/uhci/hc.c (modified) (2 diffs)

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

@@ -50 +50 @@
 static const irq_pio_range_t uhci_irq_pio_ranges[] = {
         {
-                .base = 0,      /* filled later */
+                .base = 0,
                 .size = sizeof(uhci_regs_t)
         }
@@ -56 +56 @@
 
 static const irq_cmd_t uhci_irq_commands[] = {
-        { .cmd = CMD_PIO_READ_16, .dstarg = 1, .addr = NULL/*filled later*/},
-        { .cmd = CMD_BTEST, .srcarg = 1, .dstarg = 2,
-          .value = UHCI_STATUS_USED_INTERRUPTS | UHCI_STATUS_NM_INTERRUPTS },
-        { .cmd = CMD_PREDICATE, .srcarg = 2, .value = 2 },
-        { .cmd = CMD_PIO_WRITE_A_16, .srcarg = 1, .addr = NULL/*filled later*/},
-        { .cmd = CMD_ACCEPT },
+        {
+                .cmd = CMD_PIO_READ_16,
+                .dstarg = 1,
+                .addr = NULL
+        },
+        {
+                .cmd = CMD_AND,
+                .srcarg = 1,
+                .dstarg = 2,
+                .value = UHCI_STATUS_USED_INTERRUPTS | UHCI_STATUS_NM_INTERRUPTS
+        },
+        {
+                .cmd = CMD_PREDICATE,
+                .srcarg = 2,
+                .value = 2
+        },
+        {
+                .cmd = CMD_PIO_WRITE_A_16,
+                .srcarg = 1,
+                .addr = NULL
+        },
+        {
+                .cmd = CMD_ACCEPT
+        }
 };