From owner-p4-projects@FreeBSD.ORG  Mon Apr  3 00:05: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 CD5F716A423; Mon,  3 Apr 2006 00:05: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 7DC9F16A420
	for <perforce@freebsd.org>; Mon,  3 Apr 2006 00:05:31 +0000 (UTC)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4764443D45
	for <perforce@freebsd.org>; Mon,  3 Apr 2006 00:05:31 +0000 (GMT)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3305Vfd014284
	for <perforce@freebsd.org>; Mon, 3 Apr 2006 00:05:31 GMT
	(envelope-from jmg@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3305UTs014281
	for perforce@freebsd.org; Mon, 3 Apr 2006 00:05:30 GMT
	(envelope-from jmg@freebsd.org)
Date: Mon, 3 Apr 2006 00:05:30 GMT
Message-Id: <200604030005.k3305UTs014281@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmg@freebsd.org using -f
From: John-Mark Gurney <jmg@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 94500 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: Mon, 03 Apr 2006 00:05:32 -0000

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

Change 94500 by jmg@jmg_arlene on 2006/04/03 00:05:01

	make compile...

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#15 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#15 (text+ko) ====

@@ -39,6 +39,7 @@
 #include <sys/pcpu.h>
 #include <sys/endian.h>
 #include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 #include <machine/bus.h>
 
@@ -59,6 +60,8 @@
  */
 static device_probe_t hvpci_probe;
 static device_attach_t hvpci_attach;
+static bus_read_ivar_t hvpci_read_ivar;
+static bus_write_ivar_t hvpci_write_ivar;
 static bus_setup_intr_t hvpci_setup_intr;
 static bus_teardown_intr_t hvpci_teardown_intr;
 static bus_alloc_resource_t hvpci_alloc_resource;
@@ -143,7 +146,7 @@
 	n = OF_getprop(node, "bus-range", (void *)br, sizeof br);
 	if (n == -1)
 		panic("%s: could not get bus-range", __func__);
-	if (n != sizeof(psycho_br))
+	if (n != sizeof br)
 		panic("%s: broken bus-range (%d)", __func__, n);
 	sc->hs_busnum = br[0];
 #if 0
@@ -250,7 +253,7 @@
 #endif
 
 static int
-hypci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
+hvpci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
 {
 	struct hvpci_softc *sc;
 
@@ -266,11 +269,12 @@
 }
 
 static int
-hypci_write_ivar(device_t dev, device_t child, int which, uintptr_t value)
+hvpci_write_ivar(device_t dev, device_t child, int which, uintptr_t value)
 {
 	struct hvpci_softc *sc;
 
 	sc = device_get_softc(dev);
+	switch (which) {
 	case PCIB_IVAR_BUS:
 		sc->hs_busnum = value;
 		return (0);