From owner-p4-projects@FreeBSD.ORG  Wed Jul 19 13:50:13 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 1683416A4E7; Wed, 19 Jul 2006 13:50:13 +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 CE70016A4E1
	for <perforce@freebsd.org>; Wed, 19 Jul 2006 13:50:12 +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 86FC943D46
	for <perforce@freebsd.org>; Wed, 19 Jul 2006 13:50:12 +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 k6JDoCvf042891
	for <perforce@freebsd.org>; Wed, 19 Jul 2006 13:50:12 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6JDoCFx042888
	for perforce@freebsd.org; Wed, 19 Jul 2006 13:50:12 GMT
	(envelope-from piso@freebsd.org)
Date: Wed, 19 Jul 2006 13:50:12 GMT
Message-Id: <200607191350.k6JDoCFx042888@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 101929 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: Wed, 19 Jul 2006 13:50:13 -0000

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

Change 101929 by piso@piso_longino on 2006/07/19 13:49:32

	Axe INTR_FAST. 

Affected files ...

.. //depot/projects/soc2006/intr_filter/dev/puc/puc.c#5 edit

Differences ...

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

@@ -314,7 +314,7 @@
 	    RF_ACTIVE|RF_SHAREABLE);
 	if (sc->sc_ires != NULL) {
 		error = bus_setup_intr(dev, sc->sc_ires,
-		    INTR_TYPE_TTY | INTR_FAST, puc_intr, NULL,
+		    INTR_TYPE_TTY, puc_intr, NULL,
 		    sc, &sc->sc_icookie);
 		if (error)
 			error = bus_setup_intr(dev, sc->sc_ires,
@@ -606,7 +606,7 @@
 	port = device_get_ivars(child);
 	KASSERT(port != NULL, ("%s %d", __func__, __LINE__));
 
-	if (ihand == NULL || cookiep == NULL || res != port->p_ires)
+	if (filter == NULL || cookiep == NULL || res != port->p_ires)
 		return (EINVAL);
 	if (rman_get_device(port->p_ires) != originator)
 		return (ENXIO);
@@ -630,14 +630,14 @@
 		return (BUS_SETUP_INTR(device_get_parent(dev), originator,
 		    sc->sc_ires, flags, filter, ihand, arg, cookiep));
 
-	/* We demand that serdev devices use fast interrupts. */
-	if (!(flags & INTR_FAST))
+	/* We demand that serdev devices use fast/filter_only interrupts. */
+	if (ihand != NULL)
 		return (ENXIO);
 
 	sc->sc_serdevs |= 1UL << (port->p_nr - 1);
 
 	port->p_hasintr = 1;
-	port->p_ih = ihand;
+	port->p_ih = i(driver_intr_t *)filter;
 	port->p_iharg = arg;
 
 	*cookiep = port;