diff options
| author |   downsj <downsj@openbsd.org> | 1996-10-26 08:07:24 +0000 |
|---|---|---|
| committer | downsj <downsj@openbsd.org> | 1996-10-26 08:07:24 +0000 |
| commit | 4ce62bedebcd378dd62cf4c0a65577ddec46164a (patch) | |
| tree | 47165c0a0b5abc56cb56a0b8a74a85b2b367c894 | |
| parent | Verify arguments to fcntl(, F_GETLK, ) (diff) | |
| download | wireguard-openbsd-4ce62bedebcd378dd62cf4c0a65577ddec46164a.tar.xz wireguard-openbsd-4ce62bedebcd378dd62cf4c0a65577ddec46164a.zip | |
more move changes
| -rw-r--r-- | sys/dev/isa/fd.c | 7 | ||||
| -rw-r--r-- | sys/dev/isa/fdc.c | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index a0e57c02c16..4a3bd5f9413 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.24 1996/10/26 06:22:37 downsj Exp $ */ +/* $OpenBSD: fd.c,v 1.25 1996/10/26 08:07:24 downsj Exp $ */ /* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */ /*- @@ -74,7 +74,6 @@ #include <dev/isa/fdreg.h> #if defined(i386) -#include <dev/ic/mc146818reg.h> /* for NVRAM access */ #include <i386/isa/nvram.h> #endif @@ -276,6 +275,7 @@ fd_nvtotype(fdc, nvraminfo, drive) char *fdc; int nvraminfo, drive; { +#if defined(i386) int type; type = (drive == 0 ? nvraminfo : nvraminfo << 4) & 0xf0; @@ -298,6 +298,9 @@ fd_nvtotype(fdc, nvraminfo, drive) fdc, drive, type); return NULL; } +#else + return NULL; +#endif } __inline struct fd_type * diff --git a/sys/dev/isa/fdc.c b/sys/dev/isa/fdc.c index f64205f8701..dc94d849aa6 100644 --- a/sys/dev/isa/fdc.c +++ b/sys/dev/isa/fdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fdc.c,v 1.3 1996/10/26 06:22:38 downsj Exp $ */ +/* $OpenBSD: fdc.c,v 1.4 1996/10/26 08:07:26 downsj Exp $ */ /* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */ /*- @@ -206,6 +206,7 @@ fdcattach(parent, self, aux) fdc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE, IPL_BIO, fdcintr, fdc, fdc->sc_dev.dv_xname); +#if defined(i386) /* * The NVRAM info only tells us about the first two disks on the * `primary' floppy controller. @@ -213,6 +214,7 @@ fdcattach(parent, self, aux) if (fdc->sc_dev.dv_unit == 0) type = mc146818_read(NULL, NVRAM_DISKETTE); /* XXX softc */ else +#endif type = -1; /* physical limit: four drives per controller. */ |