From owner-p4-projects@FreeBSD.ORG  Sat Apr 26 18:05:33 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 126FF1065670; Sat, 26 Apr 2008 18:05:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C88C0106566B
	for <perforce@freebsd.org>; Sat, 26 Apr 2008 18:05:32 +0000 (UTC)
	(envelope-from marius@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BA2DD8FC0A
	for <perforce@freebsd.org>; Sat, 26 Apr 2008 18:05:32 +0000 (UTC)
	(envelope-from marius@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3QI5WKw048675
	for <perforce@freebsd.org>; Sat, 26 Apr 2008 18:05:32 GMT
	(envelope-from marius@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3QI5WAr048673
	for perforce@freebsd.org; Sat, 26 Apr 2008 18:05:32 GMT
	(envelope-from marius@freebsd.org)
Date: Sat, 26 Apr 2008 18:05:32 GMT
Message-Id: <200804261805.m3QI5WAr048673@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marius@freebsd.org using -f
From: Marius Strobl <marius@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 140687 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, 26 Apr 2008 18:05:33 -0000

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

Change 140687 by marius@flak on 2008/04/26 18:04:34

	Actually adjust schizo(4) to the removal of isa_irq_pending().

Affected files ...

.. //depot/projects/usiii/sparc64/pci/schizo.c#7 edit

Differences ...

==== //depot/projects/usiii/sparc64/pci/schizo.c#7 (text+ko) ====

@@ -116,7 +116,6 @@
 static pcib_read_config_t schizo_read_config;
 static pcib_write_config_t schizo_write_config;
 static pcib_route_interrupt_t schizo_route_interrupt;
-static ofw_pci_intr_pending_t schizo_intr_pending;
 static ofw_bus_get_node_t schizo_get_node;
 
 static device_method_t schizo_methods[] = {
@@ -147,9 +146,6 @@
 	/* ofw_bus interface */
 	DEVMETHOD(ofw_bus_get_node,	schizo_get_node),
 
-	/* ofw_pci interface */
-	DEVMETHOD(ofw_pci_intr_pending,	schizo_intr_pending),
-
 	{ 0, 0 }
 };
 
@@ -1174,16 +1170,6 @@
 	return (sc->sc_pci_dmat);
 }
 
-static int
-schizo_intr_pending(device_t dev, ofw_pci_intr_t intr)
-{
-	struct schizo_softc *sc;
-
-	sc = device_get_softc(dev);
-	return (SCZTOM_PCI_READ_8(sc, SCZTOM_PCI_IOBIO_DIAG) >>
-	   ((intr & 0x1f) << 1) != 0);
-}
-
 static phandle_t
 schizo_get_node(device_t bus, device_t dev)
 {