diff --git a/sys/arch/sparc64/dev/kd.c b/sys/arch/sparc64/dev/kd.c index e9a968f01ec1..69aca8c29717 100644 --- a/sys/arch/sparc64/dev/kd.c +++ b/sys/arch/sparc64/dev/kd.c @@ -1,4 +1,4 @@ -/* $NetBSD: kd.c,v 1.7 2000/03/19 13:29:15 pk Exp $ */ +/* $NetBSD: kd.c,v 1.8 2000/03/19 14:41:48 pk Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -75,8 +75,6 @@ #include struct tty *fbconstty = 0; /* tty structure for frame buffer console */ -int cnrom __P((void)); -void cnrint __P((void)); #define KDMAJOR 1 #define PUT_WSIZE 64 @@ -102,20 +100,8 @@ static void kdstart(struct tty *); static void kd_init __P((struct kd_softc *)); static void kd_cons_input __P((int)); -int rom_console_input; /* when set, hardclock calls cnrom() */ int cons_ocount; /* output byte count */ -/* Now talking directly to the zs, so this is not needed. */ -int -cnrom() -{ - return (0); -} -void -cnrint() -{ -} - /* * This is called by kbd_attach() * XXX - Make this a proper child of kbd? diff --git a/sys/arch/sparc64/sparc64/clock.c b/sys/arch/sparc64/sparc64/clock.c index 2c1c535bb4c5..c3f97e7ff2bf 100644 --- a/sys/arch/sparc64/sparc64/clock.c +++ b/sys/arch/sparc64/sparc64/clock.c @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.17 2000/03/14 00:04:19 soren Exp $ */ +/* $NetBSD: clock.c,v 1.18 2000/03/19 14:41:49 pk Exp $ */ /* * Copyright (c) 1992, 1993 @@ -91,8 +91,6 @@ #include #include -#include "kbd.h" - /* * Statistics clock interval and variance, in usec. Variance must be a * power of two. Since this gives us an even number, not an odd number, @@ -612,10 +610,6 @@ clockintr(cap) void *cap; { int s; -#if NKBD > 0 - extern int cnrom __P((void)); - extern int rom_console_input; -#endif #if 1 /* Let locore.s clear the interrupt for us. */ @@ -637,11 +631,6 @@ clockintr(cap) #endif hardclock((struct clockframe *)cap); -#if NKBD > 0 - if (rom_console_input && cnrom()) - setsoftint(); -#endif - return (1); } diff --git a/sys/arch/sparc64/sparc64/intr.c b/sys/arch/sparc64/sparc64/intr.c index 3f7acda7bba2..2f68222b4d78 100644 --- a/sys/arch/sparc64/sparc64/intr.c +++ b/sys/arch/sparc64/sparc64/intr.c @@ -1,4 +1,4 @@ -/* $NetBSD: intr.c,v 1.21 2000/03/16 02:36:58 eeh Exp $ */ +/* $NetBSD: intr.c,v 1.22 2000/03/19 14:41:49 pk Exp $ */ /* * Copyright (c) 1992, 1993 @@ -155,7 +155,6 @@ strayintr(fp, vectored) /* * Level 1 software interrupt (could also be Sbus level 1 interrupt). * Three possible reasons: - * ROM console input needed * Network software interrupt * Soft clock interrupt */ @@ -163,10 +162,7 @@ int softintr(fp) void *fp; { - extern int rom_console_input; - if (rom_console_input && cnrom()) - cnrint(); return (1); }