diff options
| author | gibbs <gibbs@FreeBSD.org> | 2004-08-17 00:14:31 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 2004-08-17 00:14:31 +0000 |
| commit | 5c67ec4668e0f194d323b210e1b6302bd2b996ce (patch) | |
| tree | 1f605d3851fde8ce9f9fdf9c7ffc02dc19fb336b /sys/modules/aic7xxx | |
| parent | 45d2f83e648a04e901a1108589958b2c268fe6ae (diff) | |
| download | FreeBSD-src-5c67ec4668e0f194d323b210e1b6302bd2b996ce.zip FreeBSD-src-5c67ec4668e0f194d323b210e1b6302bd2b996ce.tar.gz | |
Add an ISA attachement to the aic7xxx driver to handle 284X controllers.
The ISA probe uses an identify routine to probe all slot locations from
1 to 14 that do not conflict with other allocated resources. This required
making aic7770.c part of the driver core when compiled as a module.
aic7xxx.c:
aic79xx.c:
aic_osm_lib.c:
Use aic_scb_timer_start() consistently to start the watchdog timer.
This removes a few places that verbatum copied the code in
aic_scb_timer_start().
During recovery processing, allow commands to still be queued to
the controller. The only requirement we have is that our recovery
command be queued first - something the code already guaranteed.
The only other change required to make this work is to prevent
timers from being started for these newly queued commands.
Approved by: re
Diffstat (limited to 'sys/modules/aic7xxx')
| -rw-r--r-- | sys/modules/aic7xxx/ahc/Makefile | 4 | ||||
| -rw-r--r-- | sys/modules/aic7xxx/ahc/ahc_eisa/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/modules/aic7xxx/ahc/Makefile b/sys/modules/aic7xxx/ahc/Makefile index 6ef8ae0..34a47f5 100644 --- a/sys/modules/aic7xxx/ahc/Makefile +++ b/sys/modules/aic7xxx/ahc/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../../dev/aic7xxx KMOD= ahc -SUBDIR= ahc_eisa ahc_pci +SUBDIR= ahc_eisa ahc_isa ahc_pci GENSRCS= aic7xxx_{seq,reg}.h AHC_REG_PRETTY_PRINT=1 @@ -29,7 +29,7 @@ ${GENSRCS}: \ ${.CURDIR}/../../../dev/aic7xxx/aic7xxx.seq SRCS= ${GENSRCS} -SRCS+= aic7xxx.c aic7xxx_93cx6.c aic7xxx_osm.c +SRCS+= aic7xxx.c aic7xxx_93cx6.c aic7xxx_osm.c aic7770.c SRCS+= opt_scsi.h opt_aic7xxx.h opt_cam.h SRCS+= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile b/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile index da63774..5e5d9c2 100644 --- a/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile +++ b/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile @@ -7,8 +7,8 @@ KMOD= ahc_eisa ../aic7xxx_reg.h: ( cd .. ; ${MAKE} aic7xxx_reg.h ) -SRCS= ahc_eisa.c aic7770.c ../aic7xxx_reg.h -SRCS+= device_if.h bus_if.h pci_if.h eisa_if.h +SRCS= ahc_eisa.c ../aic7xxx_reg.h +SRCS+= device_if.h bus_if.h eisa_if.h SRCS+= opt_scsi.h opt_cam.h opt_aic7xxx.h CFLAGS+= -I${.CURDIR}/../../../../dev/aic7xxx -I.. |
