diff options
| author | deraadt <deraadt@NetBSD.org> | 1993-05-28 09:10:52 +0000 |
|---|---|---|
| committer | deraadt <deraadt@NetBSD.org> | 1993-05-28 09:10:52 +0000 |
| commit | 2adecf84f607a767133017cf100671439414bb9d (patch) | |
| tree | 541cb4f472db22b5c41fca2c93145aaef9e3f0a1 /sys/dev | |
| parent | a5a32a3cd74ea5a95015d17797db68f02c7d67e9 (diff) | |
1. It is now possible to build a kernel that does not have a pc0 device driver.
2. "press any key to reboot" reads the key from the console.
3. wddump() still needs a non-blocking getc() routine (or flush)
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ata/wd.c | 14 | ||||
| -rw-r--r-- | sys/dev/isa/isa.c | 6 | ||||
| -rw-r--r-- | sys/dev/isa/wd.c | 14 |
3 files changed, 23 insertions, 11 deletions
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c index 842a9226919..8613ab01fac 100644 --- a/sys/dev/ata/wd.c +++ b/sys/dev/ata/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.15 1993/05/22 08:01:43 cgd Exp $ + * $Id: wd.c,v 1.16 1993/05/28 09:10:57 deraadt Exp $ */ /* Note: This code heavily modified by tih@barsoom.nhh.no; use at own risk! */ @@ -1395,9 +1395,11 @@ wddump(dev_t dev) addr = (char *) 0; /* starting address */ - /* toss any characters present prior to dump */ - while (sgetc(1)) +#if DO_NOT_KNOW_HOW + /* toss any characters present prior to dump, ie. non-blocking getc */ + while (cngetc()) ; +#endif /* size of memory to dump */ num = Maxmem; @@ -1532,9 +1534,11 @@ wddump(dev_t dev) blknum++; (int) addr += 512; - /* operator aborting dump? */ - if (sgetc(1)) +#if DO_NOT_KNOW_HOW + /* operator aborting dump? non-blocking getc() */ + if (cngetc()) return(EINTR); +#endif } return(0); } diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c index bb95cf3092b..48c8eab6498 100644 --- a/sys/dev/isa/isa.c +++ b/sys/dev/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.13 1993/05/22 08:01:27 cgd Exp $ + * $Id: isa.c,v 1.14 1993/05/28 09:10:52 deraadt Exp $ */ /* @@ -64,6 +64,10 @@ #include "i386/isa/ic/i8237.h" #include "i386/isa/ic/i8042.h" +/* sorry, has to be here, no place else really suitable */ +#include "machine/pc/display.h" +u_short *Crtat = (u_short *)MONO_BUF; + /* ** Register definitions for DMA controller 1 (channels 0..3): */ diff --git a/sys/dev/isa/wd.c b/sys/dev/isa/wd.c index 842a9226919..8613ab01fac 100644 --- a/sys/dev/isa/wd.c +++ b/sys/dev/isa/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.15 1993/05/22 08:01:43 cgd Exp $ + * $Id: wd.c,v 1.16 1993/05/28 09:10:57 deraadt Exp $ */ /* Note: This code heavily modified by tih@barsoom.nhh.no; use at own risk! */ @@ -1395,9 +1395,11 @@ wddump(dev_t dev) addr = (char *) 0; /* starting address */ - /* toss any characters present prior to dump */ - while (sgetc(1)) +#if DO_NOT_KNOW_HOW + /* toss any characters present prior to dump, ie. non-blocking getc */ + while (cngetc()) ; +#endif /* size of memory to dump */ num = Maxmem; @@ -1532,9 +1534,11 @@ wddump(dev_t dev) blknum++; (int) addr += 512; - /* operator aborting dump? */ - if (sgetc(1)) +#if DO_NOT_KNOW_HOW + /* operator aborting dump? non-blocking getc() */ + if (cngetc()) return(EINTR); +#endif } return(0); } |
