diff options
| author | gibbs <gibbs@FreeBSD.org> | 2004-08-18 16:31:56 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 2004-08-18 16:31:56 +0000 |
| commit | 4108d3b3ac2d8b9b292c982df19aca0ee44076d8 (patch) | |
| tree | f34901840ccd6079e1941e3b2ea6fd26f8ea4226 /sys/dev/aic7xxx | |
| parent | 5acde78f19df35434f952ff7ea29669b437127ed (diff) | |
| download | FreeBSD-src-4108d3b3ac2d8b9b292c982df19aca0ee44076d8.zip FreeBSD-src-4108d3b3ac2d8b9b292c982df19aca0ee44076d8.tar.gz | |
Remove ISA attachments dependence on eisaconf.h
Noticed by: Takahashi Yoshihiro <nyan@jp.FreeBSD.org>
Diffstat (limited to 'sys/dev/aic7xxx')
| -rw-r--r-- | sys/dev/aic7xxx/ahc_isa.c | 5 | ||||
| -rw-r--r-- | sys/dev/aic7xxx/aic7xxx.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/aic7xxx/ahc_isa.c b/sys/dev/aic7xxx/ahc_isa.c index 48138ba..87f58be 100644 --- a/sys/dev/aic7xxx/ahc_isa.c +++ b/sys/dev/aic7xxx/ahc_isa.c @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include <dev/aic7xxx/aic7xxx_osm.h> #include <sys/limits.h> /* For CHAR_BIT*/ -#include <dev/eisa/eisaconf.h> /* For EISA constants */ #include <isa/isavar.h> /* For ISA attach glue */ @@ -62,7 +61,7 @@ static int ahc_isa_attach(device_t dev); */ static struct aic7770_identity * ahc_isa_find_device(bus_space_tag_t tag, bus_space_handle_t bsh) { - eisa_id_t id; + uint32_t id; u_int id_size; int i; @@ -93,7 +92,7 @@ ahc_isa_identify(driver_t *driver, device_t parent) int rid; rid = 0; - iobase = (slot * EISA_SLOT_SIZE) + AHC_EISA_SLOT_OFFSET; + iobase = (slot * AHC_EISA_SLOT_SIZE) + AHC_EISA_SLOT_OFFSET; regs = bus_alloc_resource(parent, SYS_RES_IOPORT, &rid, iobase, iobase, AHC_EISA_IOSIZE, RF_ACTIVE); diff --git a/sys/dev/aic7xxx/aic7xxx.h b/sys/dev/aic7xxx/aic7xxx.h index 6273a90..fc72f03 100644 --- a/sys/dev/aic7xxx/aic7xxx.h +++ b/sys/dev/aic7xxx/aic7xxx.h @@ -1175,6 +1175,7 @@ struct aic7770_identity { extern struct aic7770_identity aic7770_ident_table[]; extern const int ahc_num_aic7770_devs; +#define AHC_EISA_SLOT_SIZE 0x1000 #define AHC_EISA_SLOT_OFFSET 0xc00 #define AHC_EISA_IOSIZE 0x100 |
