diff options
| author | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2014-07-12 21:54:59 +0000 |
|---|---|---|
| committer | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2014-07-12 21:54:59 +0000 |
| commit | 55a05995977ff661af3b9e512515abc461867ca5 (patch) | |
| tree | d4bb8dcc9cdf6a4c586530a373c0849e4080678a /sys/arch/octeon/stand | |
| parent | 131b9116e2e83a04a7aab4b8596774aa49ed6935 (diff) | |
move getchar() into libsa where applicable
ok miod@
Diffstat (limited to 'sys/arch/octeon/stand')
| -rw-r--r-- | sys/arch/octeon/stand/boot/machdep.c | 18 | ||||
| -rw-r--r-- | sys/arch/octeon/stand/libsa/Makefile | 4 |
2 files changed, 3 insertions, 19 deletions
diff --git a/sys/arch/octeon/stand/boot/machdep.c b/sys/arch/octeon/stand/boot/machdep.c index 78d6ae877a2..6675c7aa83e 100644 --- a/sys/arch/octeon/stand/boot/machdep.c +++ b/sys/arch/octeon/stand/boot/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.3 2014/07/12 20:36:52 jasper Exp $ */ +/* $OpenBSD: machdep.c,v 1.4 2014/07/12 21:54:58 jasper Exp $ */ /* * Copyright (c) 2009, 2010 Miodrag Vallat. @@ -79,22 +79,6 @@ cnspeed(dev_t dev, int s) return (CONSPEED); } -int -getchar() -{ - int c = cngetc(); - - if (c == '\r') - c = '\n'; - - if ((c < ' ' && c != '\n') || c == '\177') - return c; - - putchar(c); - - return c; -} - int pch_pos; void diff --git a/sys/arch/octeon/stand/libsa/Makefile b/sys/arch/octeon/stand/libsa/Makefile index c0b134c38de..65ecba5c9df 100644 --- a/sys/arch/octeon/stand/libsa/Makefile +++ b/sys/arch/octeon/stand/libsa/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2013/06/05 01:32:11 jasper Exp $ +# $OpenBSD: Makefile,v 1.3 2014/07/12 21:54:58 jasper Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -16,7 +16,7 @@ CFLAGS+= ${CEXTRAFLAGS} ${SAABI} -nostdinc -mno-abicalls -D_NO_ABICALLS \ -I${.OBJDIR} # stand routines -SRCS= alloc.c cons.c ctime.c exit.c getfile.c gets.c globals.c \ +SRCS= alloc.c cons.c ctime.c exit.c getchar.c getfile.c gets.c globals.c \ memcmp.c memcpy.c memset.c printf.c \ snprintf.c strchr.c strcmp.c strerror.c strncmp.c strncpy.c strtol.c |