Changeset 04803bf in mainline for uspace/srv/hid/kbd/port/pl050.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/srv/hid/kbd/port/pl050.c (moved) (moved from uspace/srv/kbd/port/pl050.c ) (4 diffs)

uspace/srv/hid/kbd/port/pl050.c

@@ -37 +37 @@
 #include <ddi.h>
 #include <libarch/ddi.h>
-#include <ipc/ipc.h>
 #include <async.h>
 #include <unistd.h>
@@ -45 +44 @@
 #include <ddi.h>
 #include <stdio.h>
+#include <errno.h>
 
-#define PL050_STAT_RXFULL (1 << 4)
+#define PL050_STAT_RXFULL  (1 << 4)
+
 static irq_cmd_t pl050_cmds[] = {
         {
@@ -66 +67 @@
         {
                 .cmd = CMD_PIO_READ_8,
-                .addr = NULL,   /* will be patched in run-time */
+                .addr = NULL,  /* Will be patched in run-time */
                 .dstarg = 2
         },
@@ -83 +84 @@
 int kbd_port_init(void)
 {
-
-        pl050_kbd.cmds[0].addr = (void *) sysinfo_value("kbd.address.status");
-        pl050_kbd.cmds[3].addr = (void *) sysinfo_value("kbd.address.data");
-
+        sysarg_t addr;
+        if (sysinfo_get_value("kbd.address.status", &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;
+        
+        sysarg_t inr;
+        if (sysinfo_get_value("kbd.inr", &inr) != EOK)
+                return -1;
+        
         async_set_interrupt_received(pl050_irq_handler);
-
-        ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(), 0, &pl050_kbd);
-
+        register_irq(inr, device_assign_devno(), 0, &pl050_kbd);
+        
         return 0;
 }