From owner-p4-projects@FreeBSD.ORG  Fri May 13 17:06:26 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DA5DA1065673; Fri, 13 May 2011 17:06:25 +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 9CF691065670
	for <perforce@freebsd.org>; Fri, 13 May 2011 17:06:25 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 8B3478FC13
	for <perforce@freebsd.org>; Fri, 13 May 2011 17:06:25 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p4DH6PbI000219
	for <perforce@freebsd.org>; Fri, 13 May 2011 17:06:25 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p4DH6PZ6000216
	for perforce@freebsd.org; Fri, 13 May 2011 17:06:25 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 13 May 2011 17:06:25 GMT
Message-Id: <201105131706.p4DH6PZ6000216@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 193068 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 13 May 2011 17:06:26 -0000

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

Change 193068 by jhb@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);
 }