summaryrefslogtreecommitdiff
path: root/sys/arch/socppc/stand/boot
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/socppc/stand/boot')
-rw-r--r--sys/arch/socppc/stand/boot/Makefile4
-rw-r--r--sys/arch/socppc/stand/boot/dev_socppc.c34
2 files changed, 3 insertions, 35 deletions
diff --git a/sys/arch/socppc/stand/boot/Makefile b/sys/arch/socppc/stand/boot/Makefile
index 377b5e69adb..61cabdbc21a 100644
--- a/sys/arch/socppc/stand/boot/Makefile
+++ b/sys/arch/socppc/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2014/07/12 21:54:58 jasper Exp $
+# $OpenBSD: Makefile,v 1.15 2014/07/13 09:26:08 jasper Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -27,7 +27,7 @@ SRCS+= clock.c ns16550.c wd.c wdc.c pciide.c wdc_obio.c fdt.c
SRCS+= ctime.c strtol.c cmd_socppc.c
.PATH: ${S}/lib/libkern/arch/powerpc ${S}/lib/libkern
-SRCS+= getchar.c strlcpy.c strlen.c ashrdi3.c moddi3.c
+SRCS+= getchar.c putchar.c strlcpy.c strlen.c ashrdi3.c moddi3.c
### find out what to use for libz
Z_AS= library
diff --git a/sys/arch/socppc/stand/boot/dev_socppc.c b/sys/arch/socppc/stand/boot/dev_socppc.c
index 934de580014..7cf9401c51e 100644
--- a/sys/arch/socppc/stand/boot/dev_socppc.c
+++ b/sys/arch/socppc/stand/boot/dev_socppc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dev_socppc.c,v 1.3 2014/07/12 21:54:58 jasper Exp $ */
+/* $OpenBSD: dev_socppc.c,v 1.4 2014/07/13 09:26:08 jasper Exp $ */
/*
* Copyright (c) 2008 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 *