Changeset 287920f in mainline for kernel/arch/sparc64/src/console.c

Timestamp:

2006-08-09T13:27:55Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d46c6ecd

Parents:

da74747

Message:

i8042 and z8530 separated, the tree compiles again.
Now there is some duplicated code in i8042.c and z8530.c,
but that can be eliminated in slower pace.

File:

• kernel/arch/sparc64/src/console.c (modified) (2 diffs)

kernel/arch/sparc64/src/console.c

@@ -38 +38 @@
 #include <genarch/fb/fb.h>
 #include <arch/drivers/fb.h>
-#include <arch/drivers/i8042.h>
-#include <genarch/i8042/i8042.h>
+
+#include <arch/drivers/kbd.h>
+#ifdef CONFIG_Z8530
+#include <genarch/kbd/z8530.h>
+#endif
+#ifdef CONFIG_16550A
+#include <genarch/kbd/16550a.h>
+#endif
+
 #include <console/chardev.h>
 #include <console/console.h>
@@ -72 +79 @@
                 
         while (1) {
-                i8042_poll();           
+#ifdef CONFIG_Z8530
+                z8530_poll();
+#endif
+#ifdef CONFIG_16550A
+                16550a_poll();
+#endif
                 thread_usleep(KEYBOARD_POLL_PAUSE);
         }