Changeset 0a208110 in mainline for uspace/srv/hid/input/port/ns16550.c

Timestamp:

2012-02-24T18:04:56Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2578199

Parents:

b9bbaad (diff), 087768f (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:

Mainline changes.

Registering OHCI irq handler panics on ppc32.

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[] = {
         {
@@ -98 +105 @@
 
 irq_code_t ns16550_kbd = {
+        sizeof(ns16550_ranges) / sizeof(irq_pio_range_t),
+        ns16550_ranges,
         sizeof(ns16550_cmds) / sizeof(irq_cmd_t),
         ns16550_cmds
@@ -105 +114 @@
 
 static uintptr_t ns16550_physical;
-static uintptr_t ns16550_kernel;
 
 static kbd_dev_t *kbd_dev;
@@ -124 +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);