From eaa73a368b4254f67fb1b32564dc5e215ba28a5e Mon Sep 17 00:00:00 2001 From: "Justin T. Gibbs" Date: Wed, 18 Aug 2004 16:31:56 +0000 Subject: [PATCH] Remove ISA attachments dependence on eisaconf.h Noticed by: Takahashi Yoshihiro --- sys/dev/aic7xxx/ahc_isa.c | 5 ++--- 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 48138ba5ed2d..87f58be7b98a 100644 --- a/sys/dev/aic7xxx/ahc_isa.c +++ b/sys/dev/aic7xxx/ahc_isa.c @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include #include /* For CHAR_BIT*/ -#include /* For EISA constants */ #include /* 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 6273a90b9a8a..fc72f03df431 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