From owner-p4-projects@FreeBSD.ORG  Thu Mar 29 23:30:13 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 47FB316A401; Thu, 29 Mar 2007 23:30:13 +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 04A3416A403
	for <perforce@freebsd.org>; Thu, 29 Mar 2007 23:30:13 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id E66F113C489
	for <perforce@freebsd.org>; Thu, 29 Mar 2007 23:30:12 +0000 (UTC)
	(envelope-from marcel@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 l2TNUCgX068864
	for <perforce@freebsd.org>; Thu, 29 Mar 2007 23:30:12 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2TNUCjw068861
	for perforce@freebsd.org; Thu, 29 Mar 2007 23:30:12 GMT
	(envelope-from marcel@freebsd.org)
Date: Thu, 29 Mar 2007 23:30:12 GMT
Message-Id: <200703292330.l2TNUCjw068861@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 116892 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: Thu, 29 Mar 2007 23:30:13 -0000

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

Change 116892 by marcel@marcel_xcllnt on 2007/03/29 23:29:26

	Catch up with the interrupt filter changes.

Affected files ...

.. //depot/projects/uart/dev/bsc/bsc_core.c#2 edit
.. //depot/projects/uart/dev/hdlc/hdlc_core.c#2 edit

Differences ...

==== //depot/projects/uart/dev/bsc/bsc_core.c#2 (text+ko) ====

@@ -46,9 +46,11 @@
 
 MALLOC_DEFINE(M_BSC, "BSC", "BSC driver");
 
-static void
-bsc_bus_intr(void *arg)
+static int
+bsc_intr(void *arg)
 {
+
+	return (FILTER_STRAY);
 }
 
 int
@@ -70,13 +72,12 @@
 	sc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_irid,
 	    RF_ACTIVE);
 	if (sc->sc_ires != NULL) {
-		error = BUS_SETUP_INTR(device_get_parent(dev), dev,
-		    sc->sc_ires, INTR_TYPE_TTY | INTR_FAST, bsc_bus_intr,
-		    sc, &sc->sc_icookie);
+		error = bus_setup_intr(dev, sc->sc_ires, INTR_TYPE_TTY,
+		    bsc_intr, NULL, sc, &sc->sc_icookie);
 		if (error)
-			error = BUS_SETUP_INTR(device_get_parent(dev), dev,
-			    sc->sc_ires, INTR_TYPE_TTY | INTR_MPSAFE,
-			    bsc_bus_intr, sc, &sc->sc_icookie);
+			error = bus_setup_intr(dev, sc->sc_ires,
+			    INTR_TYPE_TTY | INTR_MPSAFE, NULL,
+			    (driver_intr_t *)bsc_intr, sc, &sc->sc_icookie);
 		else
 			sc->sc_fastintr = 1;
 

==== //depot/projects/uart/dev/hdlc/hdlc_core.c#2 (text+ko) ====

@@ -46,9 +46,11 @@
 
 MALLOC_DEFINE(M_HDLC, "HDLC", "HDLC driver");
 
-static void
-hdlc_bus_intr(void *arg)
+static int
+hdlc_intr(void *arg)
 {
+
+	return (FILTER_STRAY);
 }
 
 int
@@ -70,13 +72,12 @@
 	sc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_irid,
 	    RF_ACTIVE);
 	if (sc->sc_ires != NULL) {
-		error = BUS_SETUP_INTR(device_get_parent(dev), dev,
-		    sc->sc_ires, INTR_TYPE_TTY | INTR_FAST, hdlc_bus_intr,
-		    sc, &sc->sc_icookie);
+		error = bus_setup_intr(dev, sc->sc_ires, INTR_TYPE_TTY,
+		    hdlc_intr, NULL, sc, &sc->sc_icookie);
 		if (error)
-			error = BUS_SETUP_INTR(device_get_parent(dev), dev,
-			    sc->sc_ires, INTR_TYPE_TTY | INTR_MPSAFE,
-			    hdlc_bus_intr, sc, &sc->sc_icookie);
+			error = bus_setup_intr(dev, sc->sc_ires,
+			    INTR_TYPE_TTY | INTR_MPSAFE, NULL,
+			    (driver_intr_t *)hdlc_intr, sc, &sc->sc_icookie);
 		else
 			sc->sc_fastintr = 1;