Changeset c01bb5f9 in mainline for uspace/drv/bus/usb/uhci/uhci.c

Timestamp:

2012-02-16T21:21:39Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

39aa8ce, 856a36b, f943dd3

Parents:

edd7c63c (diff), 21063c2 (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 lp:~jakub/helenos/mm.

File:

• uspace/drv/bus/usb/uhci/uhci.c (modified) (1 diff)

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

@@ -198 +198 @@
             "Failed to disable legacy USB: %s.\n", str_error(ret));
 
-        const size_t cmd_count = hc_irq_cmd_count();
-        irq_cmd_t irq_cmds[cmd_count];
-        ret =
-            hc_get_irq_commands(irq_cmds, sizeof(irq_cmds), reg_base, reg_size);
+        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];
+        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 commands: %s.\n", str_error(ret));
 
-        irq_code_t irq_code = { .cmdcount = cmd_count, .cmds = irq_cmds };
+        irq_code_t irq_code = {
+                .rangecount = ranges_count,
+                .ranges = irq_ranges,
+                .cmdcount = cmds_count,
+                .cmds = irq_cmds
+        };
 
         /* Register handler to avoid interrupt lockup */