From owner-p4-projects@FreeBSD.ORG  Wed Apr  4 21:14:45 2007
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 E849116A401; Wed,  4 Apr 2007 21:14:44 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C046E16A403
	for <perforce@FreeBSD.org>; Wed,  4 Apr 2007 21:14:44 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id AF7C113C455
	for <perforce@FreeBSD.org>; Wed,  4 Apr 2007 21:14:44 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34LEiBZ087585
	for <perforce@FreeBSD.org>; Wed, 4 Apr 2007 21:14:44 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34LEinA087582
	for perforce@freebsd.org; Wed, 4 Apr 2007 21:14:44 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Wed, 4 Apr 2007 21:14:44 GMT
Message-Id: <200704042114.l34LEinA087582@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 117394 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, 04 Apr 2007 21:14:45 -0000

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

Change 117394 by gonzo@gonzo_jeeves on 2007/04/04 21:13:52

	o Add filtering support to interrupts-related code.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/tick.c#4 edit
.. //depot/projects/mips2/src/sys/mips/mips4k/malta/gt.c#3 edit
.. //depot/projects/mips2/src/sys/mips/mips4k/malta/gt_pci.c#4 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips/tick.c#4 (text+ko) ====

@@ -194,7 +194,7 @@
 /*
  * Device section of file below
  */  
-static void
+static int
 clock_intr(void *arg)
 {
 	struct trapframe	*tf;
@@ -206,7 +206,6 @@
 
 	mips_wr_compare(mips_rd_count() + counter_freq / hz);
 
-
 	/*
 	 * Magic.  Setting up with an arg of NULL means we get passed tf.
 	 */
@@ -219,6 +218,7 @@
 		hardclock(usermode, pc);
 	}
 
+	return (FILTER_HANDLED);
 }
 
 static int
@@ -252,7 +252,7 @@
 	}
 	error = bus_setup_intr(dev, irq,
 				   INTR_TYPE_CLK | INTR_MPSAFE | INTR_FAST,
-				   clock_intr, NULL, NULL);
+				   clock_intr, NULL, NULL, NULL);
 	if (error != 0) {
 		device_printf(dev, "bus_setup_intr returned %d\n", error);
 		return (error);

==== //depot/projects/mips2/src/sys/mips/mips4k/malta/gt.c#3 (text+ko) ====

@@ -85,11 +85,11 @@
 
 static int
 gt_setup_intr(device_t dev, device_t child,
-    struct resource *ires, int flags, driver_intr_t *intr, void *arg,
-    void **cookiep)
+    struct resource *ires, int flags, driver_filter_t *filt, 
+    driver_intr_t *intr, void *arg, void **cookiep)
 {
 	return BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, 
-	    intr, arg, cookiep);
+	    filt, intr, arg, cookiep);
 }
 
 static int

==== //depot/projects/mips2/src/sys/mips/mips4k/malta/gt_pci.c#4 (text+ko) ====

@@ -352,7 +352,7 @@
         }
 
         if ((bus_setup_intr(dev, sc->sc_irq, INTR_FAST | INTR_MPSAFE,
-                            gt_pci_intr, sc, &sc->sc_ih))) {
+                            NULL, gt_pci_intr, sc, &sc->sc_ih))) {
 		device_printf(dev, 
 		    "WARNING: unable to register interrupt handler\n");
 		return ENXIO;