PERFORCE change 94500 for review

[John-Mark Gurney]

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

Change 94500 by jmg at 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);