Changeset c01bb5f9 in mainline for uspace/drv/char/i8042/i8042.c

Timestamp:

2012-02-16T21:21:39Z (13 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/char/i8042/i8042.c (modified) (2 diffs)

uspace/drv/char/i8042/i8042.c

@@ -105 +105 @@
 };
 
+static const irq_pio_range_t i8042_ranges[] = {
+        {
+                .base = 0,
+                .size = sizeof(i8042_regs_t)
+        }
+};
+
 /** i8042 Interrupt pseudo-code. */
 static const irq_cmd_t i8042_cmds[] = {
@@ -239 +246 @@
         while (pio_read_8(&dev->regs->status) & i8042_OUTPUT_FULL)
                 (void) pio_read_8(&dev->regs->data);
-        
+
+        const size_t range_count = sizeof(i8042_ranges) /
+            sizeof(irq_pio_range_t);
+        irq_pio_range_t ranges[range_count];
+        memcpy(ranges, i8042_ranges, sizeof(i8042_ranges));
+        ranges[0].base = (uintptr_t) regs;
+
         const size_t cmd_count = sizeof(i8042_cmds) / sizeof(irq_cmd_t);
         irq_cmd_t cmds[cmd_count];
         memcpy(cmds, i8042_cmds, sizeof(i8042_cmds));
-        cmds[0].addr = (void *) &dev->regs->status;
-        cmds[3].addr = (void *) &dev->regs->data;
-        
+        cmds[0].addr = (void *) &(((i8042_regs_t *) regs)->status);
+        cmds[3].addr = (void *) &(((i8042_regs_t *) regs)->data);
+
         irq_code_t irq_code = {
+                .rangecount = range_count,
+                .ranges = ranges,
                 .cmdcount = cmd_count,
                 .cmds = cmds