Changes in uspace/srv/hid/input/port/pl050.c [21063c2:1875a0c] in mainline

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[] = {
@@ -101 +91 @@
 
 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
@@ -114 +102 @@
         
         sysarg_t addr;
-        if (sysinfo_get_value("kbd.address.physical", &addr) != EOK)
+        if (sysinfo_get_value("kbd.address.status", &addr) != EOK)
                 return -1;
         
-        pl050_kbd.ranges[0].base = addr;
-        pl050_kbd.cmds[0].addr = (void *) addr + PL050_STAT;
-        pl050_kbd.cmds[3].addr = (void *) addr + PL050_DATA;
+        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;
         
         sysarg_t inr;
@@ -126 +117 @@
         
         async_set_interrupt_received(pl050_irq_handler);
-        irq_register(inr, device_assign_devno(), 0, &pl050_kbd);
+        register_irq(inr, device_assign_devno(), 0, &pl050_kbd);
         
         return 0;