Changeset 1402402 in mainline

Timestamp:

2012-02-14T23:58:33Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

21063c2

Parents:

27ed3edd

Message:

Define a PIO range for GXemul keyboard.

Files:

• kernel/arch/arm32/src/mach/testarm/testarm.c (modified) (1 diff)
• uspace/srv/hid/input/port/gxemul.c (modified) (4 diffs)

kernel/arch/arm32/src/mach/testarm/testarm.c

@@ -128 +128 @@
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.inr", NULL, GXEMUL_KBD_IRQ);
-        sysinfo_set_item_val("kbd.address.virtual", NULL, (sysarg_t) gxemul_kbd);
+        sysinfo_set_item_val("kbd.address.physical", NULL,
+            GXEMUL_KBD_ADDRESS);
 #endif
 }

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

@@ -57 +57 @@
 static kbd_dev_t *kbd_dev;
 
+static irq_pio_range_t gxemul_ranges[] = {
+        {
+                .base = 0,
+                .size = 1
+        }
+};
+
 static irq_cmd_t gxemul_cmds[] = {
         { 
@@ -69 +76 @@
 
 static irq_code_t gxemul_kbd = {
-        0,      // FIXME
-        NULL,   // FIXME
+        sizeof(gxemul_ranges) / sizeof(irq_pio_range_t),
+        gxemul_ranges,
         sizeof(gxemul_cmds) / sizeof(irq_cmd_t),
         gxemul_cmds
@@ -83 +90 @@
         
         sysarg_t addr;
-        if (sysinfo_get_value("kbd.address.virtual", &addr) != EOK)
+        if (sysinfo_get_value("kbd.address.physical", &addr) != EOK)
                 return -1;
         
@@ -91 +98 @@
         
         async_set_interrupt_received(gxemul_irq_handler);
+        gxemul_ranges[0].base = addr;
         gxemul_cmds[0].addr = (void *) addr;
         irq_register(inr, device_assign_devno(), 0, &gxemul_kbd);