From 7afc02188a1c5a57e04358992d8261f0d22822a3 Mon Sep 17 00:00:00 2001 From: "Justin T. Gibbs" Date: Tue, 17 Aug 2004 00:14:31 +0000 Subject: 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 --- sys/modules/aic7xxx/ahc/Makefile | 4 ++-- sys/modules/aic7xxx/ahc/ahc_eisa/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/modules') diff --git a/sys/modules/aic7xxx/ahc/Makefile b/sys/modules/aic7xxx/ahc/Makefile index 6ef8ae0dc99a0..34a47f52f840b 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 da637744cb84b..5e5d9c2088579 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.. -- cgit v1.3