diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1998-08-08 23:01:18 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1998-08-08 23:01:18 +0000 |
| commit | 0679cc48be413867f5cb01bdf4166bd53c71dd29 (patch) | |
| tree | dfa5400cadbe02cb9ab3fe5daf5e537f913aed9b /sys/dev/isa/wdreg.h | |
| parent | 7b7d3bf5446882748838cffa95723ee58500c695 (diff) | |
Split ioh allocations so that the devices no longer overlap.
Also disable the diag return check in wdc.c for now.
Diffstat (limited to 'sys/dev/isa/wdreg.h')
| -rw-r--r-- | sys/dev/isa/wdreg.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sys/dev/isa/wdreg.h b/sys/dev/isa/wdreg.h index a44110de3d8..9def532b136 100644 --- a/sys/dev/isa/wdreg.h +++ b/sys/dev/isa/wdreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wdreg.h,v 1.7 1998/07/23 04:40:14 csapuntz Exp $ */ +/* $OpenBSD: wdreg.h,v 1.8 1998/08/08 23:01:12 downsj Exp $ */ /* $NetBSD: wdreg.h,v 1.13 1995/03/29 21:56:46 briggs Exp $ */ /*- @@ -55,12 +55,19 @@ #define wd_command 0x007 /* command register (W) */ #define wd_status 0x007 /* immediate status (R) */ -#define wd_altsts 0x206 /* alternate fixed disk status (via 1015) (R) */ -#define wd_ctlr 0x206 /* fixed disk controller control (via 1015) (W) */ +/* + * Control register definiations. + */ +#define WDCTL_OFFSET 0x206 /* offset from the first set. */ + +#define wd_altsts 0x000 /* alternate fixed disk status (via 1015) (R) */ +#define wd_ctlr 0x000 /* fixed disk controller control (via 1015) (W) */ #define WDCTL_4BIT 0x08 /* use four head bits (wd1003) */ #define WDCTL_RST 0x04 /* reset the controller */ #define WDCTL_IDS 0x02 /* disable controller interrupts */ -#define wd_digin 0x207 /* disk controller input (via 1015) (R) */ +#if 0 +#define wd_digin 0x001 /* disk controller input (via 1015) (R) */ +#endif /* * Status bits. |