Changeset f4f866c in mainline for uspace/srv/hid/kbd/port/sun.c

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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.

File:

• uspace/srv/hid/kbd/port/sun.c (modified) (2 diffs)

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

@@ -39 +39 @@
 #include <sun.h>
 #include <sysinfo.h>
+#include <errno.h>
+#include <bool.h>
 
 /** Sun keyboard virtual port driver.
@@ -50 +52 @@
 int kbd_port_init(void)
 {
-        if (sysinfo_value("kbd.type.z8530")) {
+        sysarg_t z8530;
+        if (sysinfo_get_value("kbd.type.z8530", &z8530) != EOK)
+                z8530 = false;
+        
+        sysarg_t ns16550;
+        if (sysinfo_get_value("kbd.type.ns16550", &ns16550) != EOK)
+                ns16550 = false;
+        
+        if (z8530) {
                 if (z8530_port_init() == 0)
                         return 0;
         }
         
-        if (sysinfo_value("kbd.type.ns16550")) {
+        if (ns16550) {
                 if (ns16550_port_init() == 0)
                         return 0;