PERFORCE change 193068 for review

[John Baldwin]

http://p4web.freebsd.org/@@193068?ac=10

Change 193068 by jhb at jhb_fiver on 2011/05/13 17:05:22

	Compile.

Affected files ...

.. //depot/projects/pci/sys/x86/x86/mptable.c#5 edit

Differences ...

==== //depot/projects/pci/sys/x86/x86/mptable.c#5 (text+ko) ====

@@ -33,21 +33,29 @@
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
+#ifdef NEW_PCIB
+#include <sys/rman.h>
+#endif
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 
+#include <dev/pci/pcivar.h>
+#ifdef NEW_PCIB
+#include <dev/pci/pcib_private.h>
+#endif
 #include <x86/apicreg.h>
 #include <x86/mptable.h>
 #include <machine/frame.h>
 #include <machine/intr_machdep.h>
 #include <machine/apicvar.h>
 #include <machine/md_var.h>
+#ifdef NEW_PCIB
+#include <machine/resource.h>
+#endif
 #include <machine/specialreg.h>
 
-#include <dev/pci/pcivar.h>
-
 /* string defined by the Intel MP Spec as identifying the MP table */
 #define	MP_SIG			0x5f504d5f	/* _MP_ */
 
@@ -147,7 +155,7 @@
 
 static mpfps_t mpfps;
 static mpcth_t mpct;
-static char *mpet;
+static ext_entry_ptr mpet;
 static void *ioapics[MAX_APIC_ID + 1];
 static bus_datum *busses;
 static int mptable_nioapics, mptable_nbusses, mptable_maxbusid;
@@ -1195,10 +1203,10 @@
 	struct host_res_args args;
 
 	KASSERT(pci0 != -1, ("do not know how to map PCI bus IDs"));
-	args.bus = pci_get_bus(dev) + pci0;
-	args.dev = dev;
-	args.sc = device_get_softc(dev);
-	if (pcib_host_res_init(dev, &sc->sc_host_res) != 0)
+	args.bus = pci_get_bus(pcib) + pci0;
+	args.dev = pcib;
+	args.sc = device_get_softc(pcib);
+	if (pcib_host_res_init(pcib, &args.sc->sc_host_res) != 0)
 		panic("failed to init hostb resources");
 	mptable_walk_extended_table(mptable_host_res_handler, &args);
 }