Changeset 21063c2 in mainline

Timestamp:

2012-02-16T21:16:22Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3cc070d, c01bb5f9

Parents:

1402402

Message:

Define a PIO range for PL050 keyboard and adjust its IRQ code accordingly.

Files:

• kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (modified) (1 diff)
• uspace/srv/hid/input/port/pl050.c (modified) (3 diffs)

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

@@ -332 +332 @@
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.inr", NULL, ICP_KBD_IRQ);
-        sysinfo_set_item_val("kbd.address.status", NULL,
-            (uintptr_t) icp_hw_map.kbd_stat);
-        sysinfo_set_item_val("kbd.address.data", NULL,
-            (uintptr_t) icp_hw_map.kbd_data);
+        sysinfo_set_item_val("kbd.address.physical", NULL,
+            ICP_KBD);
 
 }

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

@@ -61 +61 @@
 static kbd_dev_t *kbd_dev;
 
+#define PL050_STAT      4
+#define PL050_DATA      8
+
 #define PL050_STAT_RXFULL  (1 << 4)
+
+static irq_pio_range_t pl050_ranges[] = {
+        {
+                .base = 0,
+                .size = 9, 
+        }
+};
 
 static irq_cmd_t pl050_cmds[] = {
@@ -91 +101 @@
 
 static irq_code_t pl050_kbd = {
-        0,      // FIXME
-        NULL,   // FIXME
+        sizeof(pl050_ranges) / sizeof(irq_pio_range_t),
+        pl050_ranges,
         sizeof(pl050_cmds) / sizeof(irq_cmd_t),
         pl050_cmds
@@ -104 +114 @@
         
         sysarg_t addr;
-        if (sysinfo_get_value("kbd.address.status", &addr) != EOK)
+        if (sysinfo_get_value("kbd.address.physical", &addr) != EOK)
                 return -1;
         
-        pl050_kbd.cmds[0].addr = (void *) addr;
-        
-        if (sysinfo_get_value("kbd.address.data", &addr) != EOK)
-                return -1;
-        
-        pl050_kbd.cmds[3].addr = (void *) addr;
+        pl050_kbd.ranges[0].base = addr;
+        pl050_kbd.cmds[0].addr = (void *) addr + PL050_STAT;
+        pl050_kbd.cmds[3].addr = (void *) addr + PL050_DATA;
         
         sysarg_t inr;