diff options
| author | asami <asami@FreeBSD.org> | 1996-11-14 08:46:21 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1996-11-14 08:46:21 +0000 |
| commit | 15ab0f62afc28304dad2e833d74adb3733130766 (patch) | |
| tree | 8f729367d0b6eb8f238437df654fef4b140215dc /sys/i386/isa/wdreg.h | |
| parent | fb0769b75343e74a31335638696c104c3eae08e2 (diff) | |
| download | FreeBSD-src-15ab0f62afc28304dad2e833d74adb3733130766.zip FreeBSD-src-15ab0f62afc28304dad2e833d74adb3733130766.tar.gz | |
Some more updates.
wdreg.h: Delete wd_ctlr macro. PC98 version of wd.c treats it as a
variable.
GENERIC98: Delete ep0 entry. Current ep driver write I/O port 0x100.
This clobbers ICW of i8259, because upper 8bits of address line is not
masked on mother board.
if_fe.c: Merge from revision 1.18 of sys/i386/isa/if_fe.c.
pc98.c: Globalize dmapageport, because SCSI driver use this
variable.
wd82371.c: Yet another merge.
These are 2.2 candidates.
Submitted by: The FreeBSD(98) Development Team
Diffstat (limited to 'sys/i386/isa/wdreg.h')
| -rw-r--r-- | sys/i386/isa/wdreg.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/i386/isa/wdreg.h b/sys/i386/isa/wdreg.h index 2a0a32f..73d0ba9 100644 --- a/sys/i386/isa/wdreg.h +++ b/sys/i386/isa/wdreg.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wdreg.h 7.1 (Berkeley) 5/9/91 - * $Id: wdreg.h,v 1.12 1996/06/08 10:03:38 bde Exp $ + * $Id: wdreg.h,v 1.13 1996/11/02 10:37:08 asami Exp $ */ /* @@ -63,7 +63,6 @@ #define wd_altsts_epson 0x3 /*alternate fixed disk status(via 1015) (R)*/ #define wd_ctlr_epson 0x3 /*fixed disk controller control(via 1015) (W)*/ #define wd_altsts wd_alsts_nec -#define wd_ctlr wd_ctlr_nec #define WDCTL_4BIT 0x8 /* use four head bits (wd1003) */ #define WDCTL_RST 0x4 /* reset the controller */ |
