Changes in uspace/srv/hid/input/port/ns16550.c [a31aad1:5da7199] in mainline

File:

• uspace/srv/hid/input/port/ns16550.c (modified) (4 diffs)

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

@@ -70 +70 @@
 #define LSR_DATA_READY  0x01
 
-static irq_pio_range_t ns16550_ranges[] = {
-        {
-                .base = 0,
-                .size = 8
-        }
-};
-
 static irq_cmd_t ns16550_cmds[] = {
         {
@@ -105 +98 @@
 
 irq_code_t ns16550_kbd = {
-        sizeof(ns16550_ranges) / sizeof(irq_pio_range_t),
-        ns16550_ranges,
         sizeof(ns16550_cmds) / sizeof(irq_cmd_t),
         ns16550_cmds
@@ -114 +105 @@
 
 static uintptr_t ns16550_physical;
+static uintptr_t ns16550_kernel;
 
 static kbd_dev_t *kbd_dev;
@@ -132 +124 @@
                 return -1;
         
+        if (sysinfo_get_value("kbd.address.kernel", &ns16550_kernel) != EOK)
+                return -1;
+        
         sysarg_t inr;
         if (sysinfo_get_value("kbd.inr", &inr) != EOK)
                 return -1;
         
-        ns16550_kbd.ranges[0].base = ns16550_physical;
-        ns16550_kbd.cmds[0].addr = (void *) (ns16550_physical + LSR_REG);
-        ns16550_kbd.cmds[3].addr = (void *) (ns16550_physical + RBR_REG);
+        ns16550_kbd.cmds[0].addr = (void *) (ns16550_kernel + LSR_REG);
+        ns16550_kbd.cmds[3].addr = (void *) (ns16550_kernel + RBR_REG);
         
         async_set_interrupt_received(ns16550_irq_handler);
-        irq_register(inr, device_assign_devno(), inr, &ns16550_kbd);
+        register_irq(inr, device_assign_devno(), inr, &ns16550_kbd);
         
         return pio_enable((void *) ns16550_physical, 8, &vaddr);