From owner-p4-projects@FreeBSD.ORG  Sat Jul 22 12:17:27 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 6412916A4E0; Sat, 22 Jul 2006 12:17:27 +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 267A216A4DF
	for <perforce@freebsd.org>; Sat, 22 Jul 2006 12:17:27 +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 D63BC43D5C
	for <perforce@freebsd.org>; Sat, 22 Jul 2006 12:17: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 k6MCHOQL032623
	for <perforce@freebsd.org>; Sat, 22 Jul 2006 12:17:24 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6MCHOTe032620
	for perforce@freebsd.org; Sat, 22 Jul 2006 12:17:24 GMT
	(envelope-from piso@freebsd.org)
Date: Sat, 22 Jul 2006 12:17:24 GMT
Message-Id: <200607221217.k6MCHOTe032620@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 102140 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, 22 Jul 2006 12:17:27 -0000

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

Change 102140 by piso@piso_longino on 2006/07/22 12:17:03

	Use IF_FAST() instead of testing INTR_FAST in flags.

Affected files ...

.. //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#6 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#6 (text) ====

@@ -510,14 +510,14 @@
 		return (EINVAL);
 
 	/* Interrupt handlers must be FAST or MPSAFE. */
-	if ((flags & (INTR_FAST|INTR_MPSAFE)) == 0)
+	if (!(IS_FAST(filter, handler)) || ((flags & INTR_MPSAFE) == 0))
 		return (EINVAL);
 
 	sc = device_get_softc(dev);
 	if (sc->sc_polled)
 		return (ENXIO);
 
-	if (sc->sc_fastintr && !(flags & INTR_FAST)) {
+	if (sc->sc_fastintr && !(IS_FAST(filter, handler))) {
 		sc->sc_fastintr = 0;
 		for (c = 0; c < sc->sc_class->cl_channels; c++) {
 			ch = &sc->sc_chan[c];
@@ -532,7 +532,7 @@
 
 	m = device_get_ivars(child);
 	m->m_hasintr = 1;
-	m->m_fastintr = (flags & INTR_FAST) ? 1 : 0;
+	m->m_fastintr = IS_FAST(filter, handler) ? 1 : 0;
 	m->ih = ihand;
 	m->ih_arg = arg;