Changeset 8b4be29 in mainline for kernel/arch/sparc64/src/console.c

Timestamp:

2006-08-09T18:33:32Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5f24137

Parents:

d46c6ecd

Message:

Add an option to compile the sparc64 kernel for Ultra 5 or Enterprise E6500.
Basic keyboard support (polling) based on ns16550 serial port (deployed on Ultra).

File:

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

kernel/arch/sparc64/src/console.c

@@ -43 +43 @@
 #include <genarch/kbd/z8530.h>
 #endif
-#ifdef CONFIG_16550A
-#include <genarch/kbd/16550a.h>
+#ifdef CONFIG_NS16550
+#include <genarch/kbd/ns16550.h>
 #endif
 
@@ -65 +65 @@
                 bootinfo.screen.bpp, bootinfo.screen.scanline, true);
 
+#ifdef KBD_ADDR_OVRD
+        if (!bootinfo.keyboard.addr)
+                bootinfo.keyboard.addr = KBD_ADDR_OVRD;
+#endif
+
         if (bootinfo.keyboard.addr)
                 kbd_init();
@@ -82 +87 @@
                 z8530_poll();
 #endif
-#ifdef CONFIG_16550A
-                16550a_poll();
+#ifdef CONFIG_NS16550
+                ns16550_poll();
 #endif
                 thread_usleep(KEYBOARD_POLL_PAUSE);