Changeset a31aad1 in mainline

Timestamp:

2012-02-14T22:29:02Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

27ed3edd

Parents:

cfb79747

Message:

Define PIO range for the ns16550 driver.

Files:

• kernel/arch/ia64/src/ia64.c (modified) (1 diff)
• kernel/arch/sparc64/src/drivers/kbd.c (modified) (1 diff)
• uspace/srv/hid/input/port/ns16550.c (modified) (4 diffs)

kernel/arch/ia64/src/ia64.c

@@ -188 +188 @@
         sysinfo_set_item_val("kbd.address.physical", NULL,
             (uintptr_t) NS16550_BASE);
-        sysinfo_set_item_val("kbd.address.kernel", NULL,
-            (uintptr_t) NS16550_BASE);
 #endif
         

kernel/arch/sparc64/src/drivers/kbd.c

@@ -133 +133 @@
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.inr", NULL, inr);
-        sysinfo_set_item_val("kbd.address.kernel", NULL,
-            (uintptr_t) ns16550);
         sysinfo_set_item_val("kbd.address.physical", NULL, pa);
         sysinfo_set_item_val("kbd.type.ns16550", NULL, true);

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[] = {
         {
@@ -98 +105 @@
 
 irq_code_t ns16550_kbd = {
-        0,
-        NULL,
+        sizeof(ns16550_ranges) / sizeof(irq_pio_range_t),
+        ns16550_ranges,
         sizeof(ns16550_cmds) / sizeof(irq_cmd_t),
         ns16550_cmds
@@ -107 +114 @@
 
 static uintptr_t ns16550_physical;
-static uintptr_t ns16550_kernel;
 
 static kbd_dev_t *kbd_dev;
@@ -126 +132 @@
                 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.cmds[0].addr = (void *) (ns16550_kernel + LSR_REG);
-        ns16550_kbd.cmds[3].addr = (void *) (ns16550_kernel + RBR_REG);
+        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);
         
         async_set_interrupt_received(ns16550_irq_handler);