use printf() from libsa, move remainder to the related drivers.

3 files changed, 24 insertions, 60 deletions

diff --git a/sys/arch/i386/stand/cga.c b/sys/arch/i386/stand/cga.c
index 182dd5df9d1..d17cf8a9e79 100644
--- a/sys/arch/i386/stand/cga.c
+++ b/sys/arch/i386/stand/cga.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cga.c,v 1.3 1996/09/23 15:15:37 mickey Exp $	*/
+/*	$OpenBSD: cga.c,v 1.4 1996/09/23 15:23:32 mickey Exp $	*/
 /*	$NetBSD: cga.c,v 1.3 1994/10/27 04:21:51 cgd Exp $	*/
 
 /*-
@@ -40,6 +40,7 @@
  */
 
 #include <sys/param.h>
+#include <stand.h>
 #include <dev/ic/mc6845.h>
 
 #define	COL		80
@@ -48,7 +49,7 @@
 #define MONO_BUF	0xB0000
 #define CGA_BUF		0xB8000
 
-static u_char	att = 0x7 ;
+static u_char	att = 0x7;
 u_char *Crtat = (u_char *)CGA_BUF;
 
 static unsigned int addr_6845 = CGA_BASE;
@@ -145,3 +146,12 @@ sput(c)
 
 	cursor((crtat-Crtat)/CHR);
 }
+
+void
+putchar(c)
+	int	c;
+{
+        if (c == '\n')
+		sput('\r');
+	sput(c);
+}
diff --git a/sys/arch/i386/stand/kbd.c b/sys/arch/i386/stand/kbd.c
index fccb32a20af..8a115f16016 100644
--- a/sys/arch/i386/stand/kbd.c
+++ b/sys/arch/i386/stand/kbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kbd.c,v 1.4 1996/09/23 14:46:51 mickey Exp $	*/
+/*	$OpenBSD: kbd.c,v 1.5 1996/09/23 15:23:33 mickey Exp $	*/
 /*	$NetBSD: kbd.c,v 1.3 1994/10/27 04:21:56 cgd Exp $	*/
 
 /*-
@@ -52,6 +52,7 @@
 
 typedef unsigned char u_char;
 
+void wait(int n);
 u_char inb();
 
 #ifdef notdef
@@ -271,3 +272,13 @@ reset_cpu() {
 	wait(4000000);
 	/* NOTREACHED */
 }
+
+void
+wait(n)
+	int	n;
+{
+	int v;
+
+	while(n-- && (v = scankbd()) == 0);
+	if (v) kbdreset();
+}
diff --git a/sys/arch/i386/stand/prf.c b/sys/arch/i386/stand/prf.c
deleted file mode 100644
index 97a89826063..00000000000
--- a/sys/arch/i386/stand/prf.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: prf.c,v 1.3 1994/10/27 04:21:57 cgd Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)prf.c	7.4 (Berkeley) 5/4/91
- */
-
-#include <sys/types.h>
-
-putchar(c)
-char c;
-{
-        if (c == '\n')
-		sput('\r');
-	sput(c);
-	return(0);
-}
-
-wait(n) {
-	int v;
-
-	while(n-- && (v = scankbd()) == 0);
-	if (v) kbdreset();
-}