move putchar() into libsa

"sure" miod@

2 files changed, 3 insertions, 35 deletions

diff --git a/sys/arch/armish/stand/boot/Makefile b/sys/arch/armish/stand/boot/Makefile
index b3499d3d892..e9149055cb8 100644
--- a/sys/arch/armish/stand/boot/Makefile
+++ b/sys/arch/armish/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 2014/07/12 21:54:58 jasper Exp $
+#	$OpenBSD: Makefile,v 1.11 2014/07/13 09:26:08 jasper Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -22,7 +22,7 @@ SRCS=		start.S
 SRCS+=		boot.c cmd.c vars.c
 SRCS+=		conf.c devopen.c exec.c machdep.c dev_armish.c time.c
 SRCS+=		clock.c ns16550.c wd.c wdc.c pciide.c
-SRCS+=		ctime.c strtol.c getchar.c
+SRCS+=		ctime.c strtol.c getchar.c putchar.c
 
 .PATH:	${S}/lib/libkern/arch/arm ${S}/lib/libkern
 SRCS+=	divsi3.S divdi3.c moddi3.c qdivrem.c strlcpy.c strlen.c ashrdi3.c
diff --git a/sys/arch/armish/stand/boot/dev_armish.c b/sys/arch/armish/stand/boot/dev_armish.c
index 061fcf7b60c..5cb7eb3c049 100644
--- a/sys/arch/armish/stand/boot/dev_armish.c
+++ b/sys/arch/armish/stand/boot/dev_armish.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev_armish.c,v 1.3 2014/07/12 21:54:58 jasper Exp $	*/
+/*	$OpenBSD: dev_armish.c,v 1.4 2014/07/13 09:26:08 jasper Exp $	*/
 
 /*
  * Copyright (c) 2006 Mark Kettenis
@@ -39,38 +39,6 @@ cnspeed(dev_t dev, int sp)
 	return CONSPEED;
 }
 
-int pch_pos;
-
-void
-putchar(c)
-	int c;
-{
-	switch(c) {
-	case '\177':	/* DEL erases */
-		cnputc('\b');
-		cnputc(' ');
-	case '\b':
-		cnputc('\b');
-		if (pch_pos)
-			pch_pos--;
-		break;
-	case '\t':
-		do
-			cnputc(' ');
-		while(++pch_pos % 8);
-		break;
-	case '\n':
-	case '\r':
-		cnputc(c);
-		pch_pos=0;
-		break;
-	default:
-		cnputc(c);
-		pch_pos++;
-		break;
-	}
-}
-
 char ttyname_buf[8];
 
 char *