From owner-p4-projects@FreeBSD.ORG  Fri Jul 21 10:21:25 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 6A21E16A4E0; Fri, 21 Jul 2006 10:21:25 +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 2BBB616A4DD
	for <perforce@freebsd.org>; Fri, 21 Jul 2006 10:21:25 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CFB5A43D49
	for <perforce@freebsd.org>; Fri, 21 Jul 2006 10:21:24 +0000 (GMT)
	(envelope-from piso@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 k6LALOAK039362
	for <perforce@freebsd.org>; Fri, 21 Jul 2006 10:21:24 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6LALOmp039359
	for perforce@freebsd.org; Fri, 21 Jul 2006 10:21:24 GMT
	(envelope-from piso@freebsd.org)
Date: Fri, 21 Jul 2006 10:21:24 GMT
Message-Id: <200607211021.k6LALOmp039359@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 102049 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: Fri, 21 Jul 2006 10:21:25 -0000

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

Change 102049 by piso@piso_longino on 2006/07/21 10:21:18

	Axe INTR_FAST.

Affected files ...

.. //depot/projects/soc2006/intr_filter/dev/aac/aac.c#4 edit
.. //depot/projects/soc2006/intr_filter/dev/adlink/adlink.c#4 edit
.. //depot/projects/soc2006/intr_filter/dev/cy/cy_isa.c#4 edit
.. //depot/projects/soc2006/intr_filter/dev/cy/cy_pci.c#5 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/dev/aac/aac.c#4 (text+ko) ====

@@ -312,7 +312,7 @@
 		}
 	} else {
 		if (bus_setup_intr(sc->aac_dev, sc->aac_irq,
-				   INTR_FAST|INTR_TYPE_BIO, 
+				   INTR_TYPE_BIO, 
 				   aac_fast_intr, NULL,
 				   sc, &sc->aac_intr)) {
 			device_printf(sc->aac_dev,

==== //depot/projects/soc2006/intr_filter/dev/adlink/adlink.c#4 (text+ko) ====

@@ -373,14 +373,15 @@
 	if (error)
 		return (error);
 
+	/* XXX why do we need INTR_MPSAFE if INTR_FAST was declared too?!?!? */
 	i = bus_setup_intr(self, sc->res[2],
-	    INTR_MPSAFE | INTR_TYPE_MISC | INTR_FAST,
-	    (driver_filter_t *)adlink_intr, NULL, sc, &sc->intrhand);
+	    INTR_MPSAFE | INTR_TYPE_MISC,
+	    adlink_intr, NULL, sc, &sc->intrhand);
 	if (i) {
 		printf("adlink: Couldn't get FAST intr\n");
 		i = bus_setup_intr(self, sc->res[2],
 		    INTR_MPSAFE | INTR_TYPE_MISC,
-		    adlink_intr, sc, &sc->intrhand);
+		    NULL, (driver_intr_t *)adlink_intr, sc, &sc->intrhand);
 	}
 
 	if (i) {

==== //depot/projects/soc2006/intr_filter/dev/cy/cy_isa.c#4 (text+ko) ====

@@ -132,8 +132,8 @@
 		device_printf(dev, "interrupt resource allocation failed\n");
 		goto fail;
 	}
-	if (bus_setup_intr(dev, irq_res, INTR_TYPE_TTY | INTR_FAST, 
-			   (driver_filter_t *)cyintr, NULL, vsc, &irq_cookie) != 0) {	    
+	if (bus_setup_intr(dev, irq_res, INTR_TYPE_TTY, 
+			   cyintr, NULL, vsc, &irq_cookie) != 0) {	    
 		device_printf(dev, "interrupt setup failed\n");
 		goto fail;
 	}

==== //depot/projects/soc2006/intr_filter/dev/cy/cy_pci.c#5 (text+ko) ====

@@ -145,8 +145,8 @@
 		goto fail;
 	}
 #ifdef CY_PCI_FASTINTR
-	irq_setup = bus_setup_intr(dev, irq_res, INTR_TYPE_TTY | INTR_FAST,
-	    (driver_filter_t *)cyintr, NULL, vsc, &irq_cookie);
+	irq_setup = bus_setup_intr(dev, irq_res, INTR_TYPE_TTY,
+	    cyintr, NULL, vsc, &irq_cookie);
 #else
 	irq_setup = ENXIO;
 #endif