diff options
| author | mdodd <mdodd@FreeBSD.org> | 2000-04-16 06:12:08 +0000 |
|---|---|---|
| committer | mdodd <mdodd@FreeBSD.org> | 2000-04-16 06:12:08 +0000 |
| commit | 9826fdb61961527c74e8ad2b6fad8baa429e13c1 (patch) | |
| tree | 483a721eb1d966e725166f56446e61113ea2e942 /sys/dev/ida | |
| parent | b994f34b423b6388671c4589883c999195c8ccb5 (diff) | |
| download | FreeBSD-src-9826fdb61961527c74e8ad2b6fad8baa429e13c1.zip FreeBSD-src-9826fdb61961527c74e8ad2b6fad8baa429e13c1.tar.gz | |
- Define registers as offsets from register base rather than offsets from
EISA slot base.
- Remove unused IOPORT resource.
Reviewed by: jlemon
Diffstat (limited to 'sys/dev/ida')
| -rw-r--r-- | sys/dev/ida/ida_eisa.c | 1 | ||||
| -rw-r--r-- | sys/dev/ida/idareg.h | 23 |
2 files changed, 10 insertions, 14 deletions
diff --git a/sys/dev/ida/ida_eisa.c b/sys/dev/ida/ida_eisa.c index f5e8af1..fd3fd29 100644 --- a/sys/dev/ida/ida_eisa.c +++ b/sys/dev/ida/ida_eisa.c @@ -247,7 +247,6 @@ ida_eisa_probe(device_t dev) return (ENXIO); } - eisa_add_iospace(dev, io_base, 0x100, RESVADDR_NONE); eisa_add_iospace(dev, (io_base + IDA_EISA_IOPORT_START), IDA_EISA_IOPORT_LEN, RESVADDR_NONE); diff --git a/sys/dev/ida/idareg.h b/sys/dev/ida/idareg.h index 8a28c15..3ba7952 100644 --- a/sys/dev/ida/idareg.h +++ b/sys/dev/ida/idareg.h @@ -33,21 +33,20 @@ /* * defines for older EISA controllers (IDA, IDA-2, IAES, SMART) */ -#define R_EISA_INT_MASK 0xC89 -#define R_EISA_LOCAL_MASK 0xC8C -#define R_EISA_LOCAL_DOORBELL 0xC8D -#define R_EISA_SYSTEM_MASK 0xC8E -#define R_EISA_SYSTEM_DOORBELL 0xC8F -#define R_EISA_LIST_ADDR 0xC90 -#define R_EISA_LIST_LEN 0xC94 -#define R_EISA_TAG 0xC97 -#define R_EISA_COMPLETE_ADDR 0xC98 -#define R_EISA_LIST_STATUS 0xC9E +#define R_EISA_INT_MASK 0x01 +#define R_EISA_LOCAL_MASK 0x04 +#define R_EISA_LOCAL_DOORBELL 0x05 +#define R_EISA_SYSTEM_MASK 0x06 +#define R_EISA_SYSTEM_DOORBELL 0x07 +#define R_EISA_LIST_ADDR 0x08 +#define R_EISA_LIST_LEN 0x0c +#define R_EISA_TAG 0x0f +#define R_EISA_COMPLETE_ADDR 0x10 +#define R_EISA_LIST_STATUS 0x16 #define EISA_CHANNEL_BUSY 0x01 #define EISA_CHANNEL_CLEAR 0x02 - /* * board register offsets for SMART-2 controllers */ @@ -63,7 +62,6 @@ #define INT_DISABLE 0x00 #define INT_ENABLE 0x01 - /* * board offsets for the 42xx series */ @@ -79,7 +77,6 @@ #define INT_DISABLE_42XX 0x08 #define STATUS_42XX_INT_PENDING 0x08 - /* * return status codes */ |
