Changeset 00aece0 in mainline for uspace/srv/hid/input/port/msim.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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 mainline changes.

File:

• uspace/srv/hid/input/port/msim.c (modified) (4 diffs)

uspace/srv/hid/input/port/msim.c

@@ -57 +57 @@
 static kbd_dev_t *kbd_dev;
 
+static irq_pio_range_t msim_ranges[] = {
+        {
+                .base = 0,
+                .size = 1
+        }
+};
+
 static irq_cmd_t msim_cmds[] = {
         {
@@ -69 +76 @@
 
 static irq_code_t msim_kbd = {
+        sizeof(msim_ranges) / sizeof(irq_pio_range_t),
+        msim_ranges,
         sizeof(msim_cmds) / sizeof(irq_cmd_t),
         msim_cmds
@@ -79 +88 @@
         kbd_dev = kdev;
 
-        sysarg_t vaddr;
-        if (sysinfo_get_value("kbd.address.virtual", &vaddr) != EOK)
+        sysarg_t paddr;
+        if (sysinfo_get_value("kbd.address.physical", &paddr) != EOK)
                 return -1;
         
@@ -87 +96 @@
                 return -1;
         
-        msim_cmds[0].addr = (void *) vaddr;
+        msim_ranges[0].base = paddr;
+        msim_cmds[0].addr = (void *) paddr;
         async_set_interrupt_received(msim_irq_handler);
-        register_irq(inr, device_assign_devno(), 0, &msim_kbd);
+        irq_register(inr, device_assign_devno(), 0, &msim_kbd);
         
         return 0;