Changeset 856a36b in mainline for uspace/drv/bus/usb/ohci/ohci.c

Timestamp:

2012-02-18T08:26:00Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

5c83612b

Parents:

cd00f93 (diff), c01bb5f9 (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/ohci.c (modified) (1 diff)

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

@@ -187 +187 @@
             (void *) reg_base, reg_size, irq);
 
-        const size_t cmd_count = hc_irq_cmd_count();
-        irq_cmd_t irq_cmds[cmd_count];
-        irq_code_t irq_code = { .cmdcount = cmd_count, .cmds = irq_cmds };
-
-        ret =
-            hc_get_irq_commands(irq_cmds, sizeof(irq_cmds), reg_base, reg_size);
-        CHECK_RET_DEST_FREE_RETURN(ret,
-            "Failed to generate IRQ commands: %s.\n", str_error(ret));
+        const size_t ranges_count = hc_irq_pio_range_count();
+        const size_t cmds_count = hc_irq_cmd_count();
+        irq_pio_range_t irq_ranges[ranges_count];
+        irq_cmd_t irq_cmds[cmds_count];
+        irq_code_t irq_code = {
+                .rangecount = ranges_count,
+                .ranges = irq_ranges,
+                .cmdcount = cmds_count,
+                .cmds = irq_cmds
+        };
+
+        ret = hc_get_irq_code(irq_ranges, sizeof(irq_ranges), irq_cmds,
+            sizeof(irq_cmds), reg_base, reg_size);
+        CHECK_RET_DEST_FREE_RETURN(ret,
+            "Failed to generate IRQ code: %s.\n", str_error(ret));