Changeset 9693835 in mainline for kernel/arch/sparc64/src/drivers/kbd.c

Timestamp:

2009-03-13T09:00:58Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0b16e9d

Parents:

648c9d9

Message:

get back support for framebuffer and keyboard for sparc64 (generic)

File:

• kernel/arch/sparc64/src/drivers/kbd.c (modified) (4 diffs)

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

@@ -58 +58 @@
 kbd_type_t kbd_type = KBD_UNKNOWN;
 
-#if defined (CONFIG_Z8530) || defined (CONFIG_NS16550)
+#ifdef CONFIG_SUN_KBD
 
 /** Initialize keyboard.
@@ -169 +169 @@
                     offset;
                 
-                indev_t *kbrdin = z8530_init(z8530, devno, inr, cir, cir_arg);
-                if (kbrdin)
-                        kbrd_init(kbrdin);
+                indev_t *kbrdin_z8530 = z8530_init(z8530, devno, inr, cir, cir_arg);
+                if (kbrdin_z8530)
+                        kbrd_init(kbrdin_z8530);
                 
                 /*
@@ -192 +192 @@
                     offset;
                 
-                indev_t *kbrdin = ns16550_init(ns16550, devno, inr, cir, cir_arg);
-                if (kbrdin)
-                        kbrd_init(kbrdin);
+                indev_t *kbrdin_ns16550 = ns16550_init(ns16550, devno, inr, cir, cir_arg);
+                if (kbrdin_ns16550)
+                        kbrd_init(kbrdin_ns16550);
                 
                 /*
@@ -215 +215 @@
 }
 
-        #endif
+#endif
+
 /** @}
  */