From owner-p4-projects@FreeBSD.ORG  Sat Aug 26 19:09:05 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3092816A589; Sat, 26 Aug 2006 19:09:05 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0EA7516A513
	for <perforce@freebsd.org>; Sat, 26 Aug 2006 19:09:04 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8BEFD4476C
	for <perforce@freebsd.org>; Sat, 26 Aug 2006 18:50:35 +0000 (GMT)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7QIoZVD001534
	for <perforce@freebsd.org>; Sat, 26 Aug 2006 18:50:35 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7QIoZRk001531
	for perforce@freebsd.org; Sat, 26 Aug 2006 18:50:35 GMT
	(envelope-from mjacob@freebsd.org)
Date: Sat, 26 Aug 2006 18:50:35 GMT
Message-Id: <200608261850.k7QIoZRk001531@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 105129 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Aug 2006 19:09:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=105129

Change 105129 by mjacob@newisp on 2006/08/26 18:50:32

	Put lack of interrupts working hack in place for 24XX cards only.

Affected files ...

.. //depot/projects/newisp/dev/isp/isp_pci.c#3 edit

Differences ...

==== //depot/projects/newisp/dev/isp/isp_pci.c#3 (text+ko) ====

@@ -335,7 +335,7 @@
 	int16_t				pci_poff[_NREG_BLKS];
 	bus_dma_tag_t			dmat;
 	bus_dmamap_t			*dmaps;
-struct callout_handle xx;
+	struct callout_handle		xx;
 };
 static timeout_t isp_kick;
 
@@ -1097,7 +1097,8 @@
 	 */
 	ISP_UNLOCK(isp);
 
-	pcs->xx = timeout(isp_kick, isp, hz/10);
+	if (IS_24XX(isp))
+		pcs->xx = timeout(isp_kick, isp, hz/10);
 
 	return (0);
 
@@ -1152,7 +1153,9 @@
 	}
 	isp = (ispsoftc_t *) pcs;
 	ISP_LOCK(isp);
-	untimeout(isp_kick, isp, pcs->xx);
+	if (IS_24XX(isp)) {
+		untimeout(isp_kick, isp, pcs->xx);
+	}
 	DISABLE_INTS(isp);
 	ISP_UNLOCK(isp);
 	return (0);