PERFORCE change 94441 for review

[Kip Macy]

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

Change 94441 by kmacy at kmacy_storage:sun4v_work on 2006/04/02 04:44:08

	compile

Affected files ...

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

Differences ...

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

@@ -37,6 +37,7 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/pcpu.h>
+#include <dev/pci/pcireg.h>
 
 #include <machine/bus.h>
 
@@ -46,7 +47,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/openfirm.h>
 
-#include "hv_pcivar.h"
+#include <machine/hv_pcivar.h>
 
 #include "pcib_if.h"
 
@@ -54,7 +55,7 @@
  * Methods
  */
 static device_probe_t hvpci_probe;
-static device_attach-t hvpci_attach;
+static device_attach_t hvpci_attach;
 static bus_setup_intr_t hvpci_setup_intr;
 static bus_teardown_intr_t hvpci_teardown_intr;
 static bus_alloc_resource_t hvpci_alloc_resource;
@@ -64,7 +65,9 @@
 static pcib_maxslots_t hvpci_maxslots;
 static pcib_read_config_t hvpci_read_config;
 static pcib_write_config_t hvpci_write_config;
+#ifdef notyet
 static pcib_route_interrupt_t hvpci_route_interrupt;
+#endif
 
 static device_method_t hv_pcib_methods[] = {
 	/* Device interface */
@@ -96,13 +99,13 @@
 
 static driver_t hvpci_driver = {
 	"pcib",
-	hvpci_methods,
+	hv_pcib_methods,
 	sizeof(struct hvpci_softc),
 };
 
 static devclass_t hvpci_devclass;
 
-DRIVER_MODULE(hvpci, nexus, hvcpi_driver, hvpci_devclass, 0, 0);
+DRIVER_MODULE(hvpci, nexus, hvpci_driver, hvpci_devclass, 0, 0);
 
 static int
 hvpci_probe(device_t dev)
@@ -153,7 +156,10 @@
     int width)
 {
 	struct hvpci_softc *sc;
+#ifdef notyet
 	pci_cfg_data_t data;
+#endif
+	uint32_t data;
 
 	sc = device_get_softc(dev);
 
@@ -174,49 +180,57 @@
      uint32_t val, int width)
 {
 	struct hvpci_softc *sc;
+	uint32_t err_flags;
 
 	sc = device_get_softc(dev);
 	hvio_config_put(sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg,
-	    size, val);
+			width, val, &err_flags);
 }
 
+#ifdef notyet
 static int
 hvpci_route_interrupt(device_t bridge, device_t dev, int pin)
 {
 }
-
+#endif
 static int
 hvpci_setup_intr(device_t dev, device_t child, struct resource *ires,
     int flags, driver_intr_t *intr, void *arg, void **cookiep)
 {
+	return (0);
 }
 
 static int
 hvpci_teardown_intr(device_t dev, device_t child, struct resource *vec,
      void *cookie)
 {
+	return (0);
 }
 
 static struct resource *
 hvpci_alloc_resource(device_t bus, device_t child, int type, int *rid,
     u_long start, u_long end, u_long count, u_int flags)
 {
+	return (NULL);
 }
 
 static int
 hvpci_activate_resource(device_t bus, device_t child, int type, int rid,
     struct resource *r) 
 {
+	return (0);
 }
 
 static int
 hvpci_deactivate_resource(device_t bus, device_t child, int type, int rid,
     struct resource *r) 
 {
+	return (0);
 }
 
 static int
 hvpci_release_resource(device_t bus, device_t child, int type, int rid,
     struct resource *r)
 {
+	return (0);
 }