diff options
| author | joerg <joerg@FreeBSD.org> | 1995-06-25 14:02:57 +0000 |
|---|---|---|
| committer | joerg <joerg@FreeBSD.org> | 1995-06-25 14:02:57 +0000 |
| commit | c54e2295b7f2db09802e0bc1874072840e4d75f7 (patch) | |
| tree | 11d2af9626479eeb2779d418af536370d62162a8 /sys/i386/boot/biosboot/io.c | |
| parent | adeb3e01da6a734bd8cba36acb8160a633948c35 (diff) | |
| download | FreeBSD-src-c54e2295b7f2db09802e0bc1874072840e4d75f7.zip FreeBSD-src-c54e2295b7f2db09802e0bc1874072840e4d75f7.tar.gz | |
Reset defaults in case of boot() is looping several times (e.g. the
user has entered a bogus kernel name in the first place).
Also fix the broken #ifdef FORCE_COMCONSOLE, it has been disabled by
accident. (NB: the keyboard probe remains disabled however.)
Few cosmetic fixes (declare functions to be void instead of int),
while i've been at this.
Pointed out by: wosch@cs.tu-berlin.de (Wolfram Schneider), for the init bug
Diffstat (limited to 'sys/i386/boot/biosboot/io.c')
| -rw-r--r-- | sys/i386/boot/biosboot/io.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/i386/boot/biosboot/io.c b/sys/i386/boot/biosboot/io.c index 394c271..a9d4844 100644 --- a/sys/i386/boot/biosboot/io.c +++ b/sys/i386/boot/biosboot/io.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:57 rpd - * $Id: io.c,v 1.13 1995/04/14 21:26:51 joerg Exp $ + * $Id: io.c,v 1.14 1995/05/30 07:58:33 rgrimes Exp $ */ #include "boot.h" @@ -68,13 +68,14 @@ gateA20(void) /* printf - only handles %d as decimal, %c as char, %s as string */ +void printf(const char *format, ...) { int *dataptr = (int *)&format; char c; dataptr++; - while (c = *format++) + while ((c = *format++)) if (c != '%') putchar(c); else @@ -110,7 +111,7 @@ printf(const char *format, ...) case 'c': putchar((*dataptr++)&0xff); break; case 's': { char *ptr = (char *)*dataptr++; - while (c = *ptr++) + while ((c = *ptr++)) putchar(c); break; } |
