diff --git a/sys/boot/i386/libi386/bootinfo.c b/sys/boot/i386/libi386/bootinfo.c index 4111980da2a7..13a9103a88a9 100644 --- a/sys/boot/i386/libi386/bootinfo.c +++ b/sys/boot/i386/libi386/bootinfo.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bootinfo.c,v 1.7 1998/10/03 14:13:30 rnordier Exp $ + * $Id: bootinfo.c,v 1.8 1998/10/06 07:27:05 msmith Exp $ */ #include @@ -316,4 +316,3 @@ bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip) return(0); } - diff --git a/sys/boot/i386/libi386/bootinfo32.c b/sys/boot/i386/libi386/bootinfo32.c index 4111980da2a7..13a9103a88a9 100644 --- a/sys/boot/i386/libi386/bootinfo32.c +++ b/sys/boot/i386/libi386/bootinfo32.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bootinfo.c,v 1.7 1998/10/03 14:13:30 rnordier Exp $ + * $Id: bootinfo.c,v 1.8 1998/10/06 07:27:05 msmith Exp $ */ #include @@ -316,4 +316,3 @@ bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip) return(0); } - diff --git a/sys/boot/i386/libi386/bootinfo64.c b/sys/boot/i386/libi386/bootinfo64.c index 4111980da2a7..13a9103a88a9 100644 --- a/sys/boot/i386/libi386/bootinfo64.c +++ b/sys/boot/i386/libi386/bootinfo64.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bootinfo.c,v 1.7 1998/10/03 14:13:30 rnordier Exp $ + * $Id: bootinfo.c,v 1.8 1998/10/06 07:27:05 msmith Exp $ */ #include @@ -316,4 +316,3 @@ bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip) return(0); } - diff --git a/sys/boot/i386/libi386/vidconsole.c b/sys/boot/i386/libi386/vidconsole.c index 31f6fee266c9..b14b155e7c5b 100644 --- a/sys/boot/i386/libi386/vidconsole.c +++ b/sys/boot/i386/libi386/vidconsole.c @@ -26,12 +26,13 @@ * * From Id: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp * - * $Id: vidconsole.c,v 1.2 1998/09/17 23:52:10 msmith Exp $ + * $Id: vidconsole.c,v 1.3 1998/10/02 16:32:45 msmith Exp $ */ #include #include #include +#include #include "libi386.h" #if KEYBOARD_PROBE @@ -76,6 +77,10 @@ vidc_probe(struct console *cp) static int vidc_init(int arg) { + int i = 0; + + while((i < 10) && (vidc_ischar())) + (void)vidc_getchar(); return(0); /* XXX reinit? */ } @@ -110,7 +115,9 @@ vidc_ischar(void) v86.addr = 0x16; v86.eax = 0x100; v86int(); - return(v86.eax); + if (!(v86.efl & PSL_Z)) + return(v86.eax & 0xff); + return(0); } #if KEYBOARD_PROBE