From owner-cvs-src@FreeBSD.ORG Tue Aug 17 00:14:32 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F2AD916A4CE; Tue, 17 Aug 2004 00:14:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF83443D3F; Tue, 17 Aug 2004 00:14:31 +0000 (GMT) (envelope-from gibbs@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7H0EVCs043874; Tue, 17 Aug 2004 00:14:31 GMT (envelope-from gibbs@repoman.freebsd.org) Received: (from gibbs@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7H0EVEh043873; Tue, 17 Aug 2004 00:14:31 GMT (envelope-from gibbs) Message-Id: <200408170014.i7H0EVEh043873@repoman.freebsd.org> From: "Justin T. Gibbs" Date: Tue, 17 Aug 2004 00:14:31 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/conf files src/sys/dev/aic7xxx ahc_eisa.c ahc_pci.c aic79xx.c aic79xx.h aic79xx_osm.c aic7xxx.c aic7xxx.h aic7xxx_osm.c aic7xxx_osm.h aic_osm_lib.c aic_osm_lib.h src/sys/modules/aic7xxx/ahc/ahc_eisa ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2004 00:14:32 -0000 gibbs 2004-08-17 00:14:31 UTC FreeBSD src repository Modified files: sys/conf files sys/dev/aic7xxx ahc_eisa.c ahc_pci.c aic79xx.c aic79xx.h aic79xx_osm.c aic7xxx.c aic7xxx.h aic7xxx_osm.c aic7xxx_osm.h aic_osm_lib.c aic_osm_lib.h sys/modules/aic7xxx/ahc Makefile sys/modules/aic7xxx/ahc/ahc_eisa Makefile Log: 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 Revision Changes Path 1.942 +2 -2 src/sys/conf/files 1.34 +0 -35 src/sys/dev/aic7xxx/ahc_eisa.c 1.62 +0 -19 src/sys/dev/aic7xxx/ahc_pci.c 1.31 +7 -11 src/sys/dev/aic7xxx/aic79xx.c 1.21 +5 -0 src/sys/dev/aic7xxx/aic79xx.h 1.19 +18 -38 src/sys/dev/aic7xxx/aic79xx_osm.c 1.102 +10 -2 src/sys/dev/aic7xxx/aic7xxx.c 1.51 +4 -0 src/sys/dev/aic7xxx/aic7xxx.h 1.41 +58 -25 src/sys/dev/aic7xxx/aic7xxx_osm.c 1.27 +22 -10 src/sys/dev/aic7xxx/aic7xxx_osm.h 1.3 +1 -9 src/sys/dev/aic7xxx/aic_osm_lib.c 1.3 +2 -1 src/sys/dev/aic7xxx/aic_osm_lib.h 1.5 +2 -2 src/sys/modules/aic7xxx/ahc/Makefile 1.3 +2 -2 src/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile