diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-08-12 21:51:36 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-08-12 21:51:36 +0000 |
| commit | d6fe849bd3209d7689e1c64d7c0a65efd1dfb299 (patch) | |
| tree | b8920c49cdb91951637575d63e2578148774f46b /sys/arch | |
| parent | 50596454deda6587438a2da4b850d67ffa20434a (diff) | |
new cons
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/i386/stand/boot/cmd.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/machdep.c | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/arch/i386/stand/boot/cmd.c b/sys/arch/i386/stand/boot/cmd.c index edcd007d773..c18d7e17ec5 100644 --- a/sys/arch/i386/stand/boot/cmd.c +++ b/sys/arch/i386/stand/boot/cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.c,v 1.19 1997/08/06 18:45:02 mickey Exp $ */ +/* $OpenBSD: cmd.c,v 1.20 1997/08/12 21:51:35 mickey Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -244,10 +244,10 @@ readline(buf, to) register char *p = buf, *pe = buf, ch; time_t tt; - for (tt = getsecs() + to; getsecs() < tt && !ischar(); ) + for (tt = getsecs() + to; getsecs() < tt && !cnischar(); ) ; - if (!ischar()) + if (!cnischar()) return 0; while (1) { diff --git a/sys/arch/i386/stand/libsa/machdep.c b/sys/arch/i386/stand/libsa/machdep.c index 110e289b549..8adffedd699 100644 --- a/sys/arch/i386/stand/libsa/machdep.c +++ b/sys/arch/i386/stand/libsa/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.7 1997/08/07 11:51:02 niklas Exp $ */ +/* $OpenBSD: machdep.c,v 1.8 1997/08/12 21:51:30 mickey Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -33,7 +33,6 @@ */ #include "libsa.h" -#include <machine/tss.h> #include <machine/biosvar.h> #include <machine/apmvar.h> #include "debug.h" @@ -54,7 +53,7 @@ machdep() #ifdef DEBUG *(u_int16_t*)0xb8148 = 0x4732; #endif - cons_probe(); /* call console init before doing any io */ + cninit(); /* call console init before doing any io */ #ifdef DEBUG *(u_int16_t*)0xb8148 = 0x4733; #endif |