diff options
| -rw-r--r-- | sys/dev/fdc/fdcreg.h | 4 | ||||
| -rw-r--r-- | sys/i386/isa/fdreg.h | 4 | ||||
| -rw-r--r-- | sys/isa/fdreg.h | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/sys/dev/fdc/fdcreg.h b/sys/dev/fdc/fdcreg.h index ad5c34430d4d..148a23136380 100644 --- a/sys/dev/fdc/fdcreg.h +++ b/sys/dev/fdc/fdcreg.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)fdreg.h 7.1 (Berkeley) 5/9/91 - * $Id: fdreg.h,v 1.5 1994/08/13 03:49:58 wollman Exp $ + * $Id: fdreg.h,v 1.6 1994/09/17 16:56:08 davidg Exp $ */ /* @@ -54,12 +54,14 @@ #define FDSTS 4 /* NEC 765 Main Status Register (R) */ #define FDDATA 5 /* NEC 765 Data Register (R/W) */ +#ifndef FDC_500KBPS #define FDCTL 7 /* Control Register (W) */ #define FDC_500KBPS 0x00 /* 500KBPS MFM drive transfer rate */ #define FDC_300KBPS 0x01 /* 300KBPS MFM drive transfer rate */ #define FDC_250KBPS 0x02 /* 250KBPS MFM drive transfer rate */ #define FDC_125KBPS 0x03 /* 125KBPS FM drive transfer rate */ /* for some controllers 1MPBS instead */ +#endif /* FDC_500KBPS */ #define FDIN 7 /* Digital Input Register (R) */ #define FDI_DCHG 0x80 /* diskette has been changed */ diff --git a/sys/i386/isa/fdreg.h b/sys/i386/isa/fdreg.h index ad5c34430d4d..148a23136380 100644 --- a/sys/i386/isa/fdreg.h +++ b/sys/i386/isa/fdreg.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)fdreg.h 7.1 (Berkeley) 5/9/91 - * $Id: fdreg.h,v 1.5 1994/08/13 03:49:58 wollman Exp $ + * $Id: fdreg.h,v 1.6 1994/09/17 16:56:08 davidg Exp $ */ /* @@ -54,12 +54,14 @@ #define FDSTS 4 /* NEC 765 Main Status Register (R) */ #define FDDATA 5 /* NEC 765 Data Register (R/W) */ +#ifndef FDC_500KBPS #define FDCTL 7 /* Control Register (W) */ #define FDC_500KBPS 0x00 /* 500KBPS MFM drive transfer rate */ #define FDC_300KBPS 0x01 /* 300KBPS MFM drive transfer rate */ #define FDC_250KBPS 0x02 /* 250KBPS MFM drive transfer rate */ #define FDC_125KBPS 0x03 /* 125KBPS FM drive transfer rate */ /* for some controllers 1MPBS instead */ +#endif /* FDC_500KBPS */ #define FDIN 7 /* Digital Input Register (R) */ #define FDI_DCHG 0x80 /* diskette has been changed */ diff --git a/sys/isa/fdreg.h b/sys/isa/fdreg.h index ad5c34430d4d..148a23136380 100644 --- a/sys/isa/fdreg.h +++ b/sys/isa/fdreg.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)fdreg.h 7.1 (Berkeley) 5/9/91 - * $Id: fdreg.h,v 1.5 1994/08/13 03:49:58 wollman Exp $ + * $Id: fdreg.h,v 1.6 1994/09/17 16:56:08 davidg Exp $ */ /* @@ -54,12 +54,14 @@ #define FDSTS 4 /* NEC 765 Main Status Register (R) */ #define FDDATA 5 /* NEC 765 Data Register (R/W) */ +#ifndef FDC_500KBPS #define FDCTL 7 /* Control Register (W) */ #define FDC_500KBPS 0x00 /* 500KBPS MFM drive transfer rate */ #define FDC_300KBPS 0x01 /* 300KBPS MFM drive transfer rate */ #define FDC_250KBPS 0x02 /* 250KBPS MFM drive transfer rate */ #define FDC_125KBPS 0x03 /* 125KBPS FM drive transfer rate */ /* for some controllers 1MPBS instead */ +#endif /* FDC_500KBPS */ #define FDIN 7 /* Digital Input Register (R) */ #define FDI_DCHG 0x80 /* diskette has been changed */ |