From owner-p4-projects@FreeBSD.ORG  Wed Apr 18 11:01:29 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 D816C16A409; Wed, 18 Apr 2007 11:01:28 +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 ABB3B16A402
	for <perforce@FreeBSD.org>; Wed, 18 Apr 2007 11:01:28 +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 9D07C13C45E
	for <perforce@FreeBSD.org>; Wed, 18 Apr 2007 11:01:28 +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 l3IB1SLd010250
	for <perforce@FreeBSD.org>; Wed, 18 Apr 2007 11:01:28 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3IB1SlE010247
	for perforce@freebsd.org; Wed, 18 Apr 2007 11:01:28 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Wed, 18 Apr 2007 11:01:28 GMT
Message-Id: <200704181101.l3IB1SlE010247@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 118353 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, 18 Apr 2007 11:01:29 -0000

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

Change 118353 by gonzo@gonzo_jeeves on 2007/04/18 11:00:39

	o gt_pci_intr should by fiter interrupt.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips4k/malta/gt_pci.c#6 edit

Differences ...

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

@@ -137,7 +137,7 @@
 	    (sc->sc_elcr >> 8) & 0xff);
 }
 
-static void
+static int
 gt_pci_intr(void *v)
 {
 	struct gt_pci_softc *sc = v;
@@ -151,7 +151,7 @@
 		irq = bus_space_read_1(sc->sc_pciio, sc->sc_ioh_icu1, PIC_OCW3);
 		if ((irq & OCW3_POLL_PENDING) == 0)
 		{
-			return;
+			return FILTER_HANDLED;
 		}
 
 		irq = OCW3_POLL_IRQ(irq);
@@ -196,6 +196,8 @@
 		bus_space_write_1(sc->sc_pciio, sc->sc_ioh_icu1, PIC_OCW2,
 		    OCW2_SELECT | OCW2_EOI | OCW2_SL | OCW2_ILS(irq));
 	}
+
+	return FILTER_HANDLED;
 }
 
 static int
@@ -351,7 +353,7 @@
 	}
 
 	if ((bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_MISC,
-			    NULL, gt_pci_intr, sc, &sc->sc_ih))) {
+			    gt_pci_intr, NULL, sc, &sc->sc_ih))) {
 		device_printf(dev, 
 		    "WARNING: unable to register interrupt handler\n");
 		return ENXIO;