Changeset 7deca26 in mainline for uspace/drv/bus/usb/ohci/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/ohci/hc.c (modified) (7 diffs)

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

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbohcihc
  * @{
@@ -32 +33 @@
  * @brief OHCI Host controller driver routines
  */
+
 #include <errno.h>
 #include <str_error.h>
@@ -49 +51 @@
 static const irq_pio_range_t ohci_pio_ranges[] = {
         {
-                .base = 0,      /* filled later */
+                .base = 0,
                 .size = sizeof(ohci_regs_t)
         }
@@ -55 +57 @@
 
 static const irq_cmd_t ohci_irq_commands[] = {
-        { .cmd = CMD_PIO_READ_32, .dstarg = 1, .addr = NULL /* filled later */ },
-        { .cmd = CMD_BTEST, .srcarg = 1, .dstarg = 2, .value = 0 /* filled later */ },
-        { .cmd = CMD_PREDICATE, .srcarg = 2, .value = 2 },
-        { .cmd = CMD_PIO_WRITE_A_32, .srcarg = 1, .addr = NULL /* filled later */ },
-        { .cmd = CMD_ACCEPT },
+        {
+                .cmd = CMD_PIO_READ_32,
+                .dstarg = 1,
+                .addr = NULL
+        },
+        {
+                .cmd = CMD_AND,
+                .srcarg = 1,
+                .dstarg = 2,
+                .value = OHCI_USED_INTERRUPTS
+        },
+        {
+                .cmd = CMD_PREDICATE,
+                .srcarg = 2,
+                .value = 2
+        },
+        {
+                .cmd = CMD_PIO_WRITE_A_32,
+                .srcarg = 1,
+                .addr = NULL
+        },
+        {
+                .cmd = CMD_ACCEPT
+        }
 };
 
@@ -76 +97 @@
         return sizeof(ohci_pio_ranges) / sizeof(irq_pio_range_t);
 }
-
 
 /** Get number of commands used in IRQ code.
@@ -111 +131 @@
         ohci_regs_t *registers = (ohci_regs_t *) regs;
         cmds[0].addr = (void *) &registers->interrupt_status;
-        cmds[1].value = OHCI_USED_INTERRUPTS;
         cmds[3].addr = (void *) &registers->interrupt_status;
 
@@ -445 +464 @@
                 return;
         }
+
         const unsigned hc_status = C_HCFS_GET(instance->registers->control);
         /* Interrupt routing disabled && status != USB_RESET => BIOS active */