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

Timestamp:

2009-04-21T12:46:26Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

f2d2c7ba

Parents:

44b7783

Message:

change the way how input devices are wired together according to ticket #44
(also the proposal ​http://lists.modry.cz/cgi-bin/private/helenos-devel/2009-March/002507.html)

File:

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

uspace/srv/kbd/port/sun.c

@@ -40 +40 @@
 #include <sysinfo.h>
 
-typedef enum {
-        KBD_UNKNOWN,
-        KBD_Z8530,
-        KBD_NS16550,
-        KBD_SGCN
-} kbd_type_t;
-
 /** Sun keyboard virtual port driver.
  *
@@ -57 +50 @@
 int kbd_port_init(void)
 {
-        if (sysinfo_value("kbd.type") == KBD_Z8530)
-                return z8530_port_init();
-        else if (sysinfo_value("kbd.type") == KBD_NS16550)
-                return ns16550_port_init();
+        if (sysinfo_value("kbd.type.z8530")) {
+                if (z8530_port_init() == 0)
+                        return 0;
+        }
+        
+        if (sysinfo_value("kbd.type.ns16550")) {
+                if (ns16550_port_init() == 0)
+                        return 0;
+        }
         
         return -1;