From owner-p4-projects@FreeBSD.ORG  Sat Jul 22 13:07:31 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 9A69E16A4DF; Sat, 22 Jul 2006 13:07:31 +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 2D68016A4DD
	for <perforce@freebsd.org>; Sat, 22 Jul 2006 13:07:31 +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 D2A5443D49
	for <perforce@freebsd.org>; Sat, 22 Jul 2006 13:07:30 +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 k6MD7UrG044026
	for <perforce@freebsd.org>; Sat, 22 Jul 2006 13:07:30 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6MD7UdR044023
	for perforce@freebsd.org; Sat, 22 Jul 2006 13:07:30 GMT
	(envelope-from piso@freebsd.org)
Date: Sat, 22 Jul 2006 13:07:30 GMT
Message-Id: <200607221307.k6MD7UdR044023@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 102145 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 13:07:31 -0000

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

Change 102145 by piso@piso_longino on 2006/07/22 13:07:21

	compilation

Affected files ...

.. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#4 edit
.. //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#7 edit
.. //depot/projects/soc2006/intr_filter/kern/subr_bus.c#6 edit

Differences ...

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

@@ -84,6 +84,7 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/kthread.h>
+#include <sys/interrupt.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>

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

@@ -32,6 +32,7 @@
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
+#include <sys/interrupt.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/serial.h>
@@ -498,7 +499,7 @@
 
 int
 scc_bus_setup_intr(device_t dev, device_t child, struct resource *r, int flags,
-    driver_filter_t *filter __unused, void (*ihand)(void *), void *arg, 
+    driver_filter_t *filter, void (*ihand)(void *), void *arg, 
     void **cookiep)
 {
 	struct scc_chan *ch;
@@ -510,14 +511,14 @@
 		return (EINVAL);
 
 	/* Interrupt handlers must be FAST or MPSAFE. */
-	if (!(IS_FAST(filter, handler)) || ((flags & INTR_MPSAFE) == 0))
+	if (!(IS_FAST(filter, ihand)) || ((flags & INTR_MPSAFE) == 0))
 		return (EINVAL);
 
 	sc = device_get_softc(dev);
 	if (sc->sc_polled)
 		return (ENXIO);
 
-	if (sc->sc_fastintr && !(IS_FAST(filter, handler))) {
+	if (sc->sc_fastintr && !(IS_FAST(filter, ihand))) {
 		sc->sc_fastintr = 0;
 		for (c = 0; c < sc->sc_class->cl_channels; c++) {
 			ch = &sc->sc_chan[c];
@@ -532,7 +533,7 @@
 
 	m = device_get_ivars(child);
 	m->m_hasintr = 1;
-	m->m_fastintr = IS_FAST(filter, handler) ? 1 : 0;
+	m->m_fastintr = IS_FAST(filter, ihand) ? 1 : 0;
 	m->ih = ihand;
 	m->ih_arg = arg;
 

==== //depot/projects/soc2006/intr_filter/kern/subr_bus.c#6 (text+ko) ====

@@ -50,6 +50,7 @@
 #include <sys/systm.h>
 #include <sys/uio.h>
 #include <sys/bus.h>
+#include <sys/interrupt.h>
 
 #include <machine/stdarg.h>