Changeset 49ff5f3 in mainline for uspace/srv/hid/input/port/pl050.c

Timestamp:

2012-04-18T20:55:21Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

7769ec9

Parents:

e895352 (diff), 63920b0 (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/pl050.c (modified) (4 diffs)

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 = {
+        sizeof(pl050_ranges) / sizeof(irq_pio_range_t),
+        pl050_ranges,
         sizeof(pl050_cmds) / sizeof(irq_cmd_t),
         pl050_cmds
@@ -102 +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;
@@ -117 +126 @@
         
         async_set_interrupt_received(pl050_irq_handler);
-        register_irq(inr, device_assign_devno(), 0, &pl050_kbd);
+        irq_register(inr, device_assign_devno(), 0, &pl050_kbd);
         
         return 0;