WebSVN – HelenOS – Path Comparison – / – /trunk/ Rev 4043 and /trunk Rev 4042

Ignore whitespace Rev 4043 → Rev 4042

/trunk/kernel/genarch/include/srln/srln.h
File deleted

 /trunk/kernel/genarch/Makefile.inc
 ,11 → 95,6
         genarch/src/kbrd/scanc_sun.c
 endif
-ifeq ($(CONFIG_SRLN),y)
-    GENARCH_SOURCES += \
-        genarch/src/srln/srln.c
-endif
 ifeq ($(CONFIG_OFW_TREE),y)
     GENARCH_SOURCES += \
         genarch/src/ofw/ofw_tree.c \

/trunk/kernel/genarch/src/srln/srln.c
File deleted
\ No newline at end of file

 /trunk/kernel/arch/ia64/src/ia64.c
 ,10 → 55,8
 #include <genarch/drivers/legacy/ia32/io.h>
 #include <genarch/drivers/ega/ega.h>
 #include <genarch/kbrd/kbrd.h>
-#include <genarch/srln/srln.h>
 #include <genarch/drivers/i8042/i8042.h>
-#include <genarch/drivers/ns16550/ns16550.h>
-#include <arch/drivers/kbd.h>
+#include <genarch/kbd/ns16550.h>
 #include <smp/smp.h>
 #include <smp/ipi.h>
 #include <arch/atomic.h>
 ,9 → 170,7
 #ifdef CONFIG_NS16550
     inr = NS16550_IRQ;
-    srln_init(stdin);
-    (void) ns16550_init((ns16550_t *)NS16550_BASE, devno, inr, NULL, NULL,
-        &srlnin);
+    (void) ns16550_init((ns16550_t *)NS16550_BASE, devno, inr, NULL, NULL);
     sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550);
     sysinfo_set_item_val("kbd.address.physical", NULL,
         (uintptr_t) NS16550_BASE);

 /trunk/HelenOS.config
 ,9 → 323,6
 % Sun keyboard support
 ! [PLATFORM=sparc64] CONFIG_SUN_KBD (y/n)
-% Serial line input module
-! [PLATFORM=ia64&machine!=ski] CONFIG_SRLN (n/y)
 % EGA support
 ! [PLATFORM=ia32|PLATFORM=amd64|(PLATFORM=ia64&MACHINE=i460GX)] CONFIG_EGA (y)