Changeset 27ed3edd in mainline

Timestamp:

2012-02-14T23:57:35Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1402402

Parents:

a31aad1

Message:

Define a PIO range for msim keyboard.

Files:

• kernel/arch/mips32/src/mips32.c (modified) (1 diff)
• uspace/srv/hid/input/port/msim.c (modified) (4 diffs)

kernel/arch/mips32/src/mips32.c

@@ -196 +196 @@
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.inr", NULL, MSIM_KBD_IRQ);
-        sysinfo_set_item_val("kbd.address.virtual", NULL, MSIM_KBD_ADDRESS);
+        sysinfo_set_item_val("kbd.address.physical", NULL,
+            PA2KA(MSIM_KBD_ADDRESS));
 #endif
 }

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 = {
-        0,      // FIXME
-        NULL,   // FIXME
+        sizeof(msim_ranges) / sizeof(irq_pio_range_t),
+        msim_ranges,
         sizeof(msim_cmds) / sizeof(irq_cmd_t),
         msim_cmds
@@ -81 +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;
         
@@ -89 +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);
         irq_register(inr, device_assign_devno(), 0, &msim_kbd);