PERFORCE change 205417 for review

[John Baldwin]

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

Change 205417 by jhb at jhb_jhbbsd on 2012/01/30 19:19:11

	Update files that were renamed.

Affected files ...

.. //depot/projects/multipass/sys/x86/bios/smbios.c#2 edit
.. //depot/projects/multipass/sys/x86/bios/vpd.c#2 edit
.. //depot/projects/multipass/sys/x86/isa/orm.c#2 edit
.. //depot/projects/multipass/sys/x86/pci/pci_bus.c#2 edit
.. //depot/projects/multipass/sys/x86/x86/io_apic.c#2 edit
.. //depot/projects/multipass/sys/x86/x86/mptable_pci.c#2 edit
.. //depot/projects/multipass/sys/x86/x86/nexus.c#2 edit

Differences ...

==== //depot/projects/multipass/sys/x86/bios/smbios.c#2 (text+ko) ====

@@ -131,7 +131,7 @@
 				return;
 		}
 
-		child = BUS_ADD_CHILD(parent, 5, "smbios", -1);
+		child = BUS_ADD_CHILD(parent, 0, "smbios", -1);
 		device_set_driver(child, driver);
 		bus_set_resource(child, SYS_RES_MEMORY, rid, addr, length);
 		device_set_desc(child, "System Management BIOS");

==== //depot/projects/multipass/sys/x86/bios/vpd.c#2 (text+ko) ====

@@ -128,7 +128,7 @@
 		rid = 0;
 		length = ADDR2VPD(addr)->Length;
 
-		child = BUS_ADD_CHILD(parent, 5, "vpd", -1);
+		child = BUS_ADD_CHILD(parent, 0, "vpd", -1);
 		device_set_driver(child, driver);
 		bus_set_resource(child, SYS_RES_MEMORY, rid, addr, length);
 		device_set_desc(child, "Vital Product Data Area");

==== //depot/projects/multipass/sys/x86/isa/orm.c#2 (text+ko) ====

@@ -182,4 +182,5 @@
 
 static devclass_t orm_devclass;
 
-DRIVER_MODULE(orm, isa, orm_driver, orm_devclass, 0, 0);
+EARLY_DRIVER_MODULE(orm, isa, orm_driver, orm_devclass, 0, 0,
+    BUS_PASS_RESOURCE);

==== //depot/projects/multipass/sys/x86/pci/pci_bus.c#2 (text+ko) ====

@@ -445,12 +445,7 @@
 
 			if (s == NULL)
 				continue;
-			/*
-			 * Add at priority 100 to make sure we
-			 * go after any motherboard resources
-			 */
-			child = BUS_ADD_CHILD(parent, 100,
-					      "pcib", busnum);
+			child = BUS_ADD_CHILD(parent, 0, "pcib", busnum);
 			device_set_desc(child, s);
 			legacy_set_pcibus(child, busnum);
 
@@ -475,7 +470,7 @@
 		if (bootverbose)
 			printf(
 	"legacy_pcib_identify: no bridge found, adding pcib0 anyway\n");
-		child = BUS_ADD_CHILD(parent, 100, "pcib", 0);
+		child = BUS_ADD_CHILD(parent, 0, "pcib", 0);
 		legacy_set_pcibus(child, 0);
 	}
 }
@@ -624,7 +619,8 @@
 static devclass_t hostb_devclass;
 
 DEFINE_CLASS_0(pcib, legacy_pcib_driver, legacy_pcib_methods, 1);
-DRIVER_MODULE(pcib, legacy, legacy_pcib_driver, hostb_devclass, 0, 0);
+EARLY_DRIVER_MODULE(pcib, legacy, legacy_pcib_driver, hostb_devclass, 0, 0,
+    BUS_PASS_BUS);
 
 
 /*
@@ -697,7 +693,8 @@
 
 DEFINE_CLASS_1(pcib, pcibios_pcib_driver, pcibios_pcib_pci_methods,
     sizeof(struct pcib_softc), pcib_driver);
-DRIVER_MODULE(pcibios_pcib, pci, pcibios_pcib_driver, pcib_devclass, 0, 0);
+EARLY_DRIVER_MODULE(pcibios_pcib, pci, pcibios_pcib_driver, pcib_devclass, 0, 0,
+    BUS_PASS_BUS);
 
 static int
 pcibios_pcib_probe(device_t dev)

==== //depot/projects/multipass/sys/x86/x86/io_apic.c#2 (text+ko) ====

@@ -856,12 +856,8 @@
 apic_identify(driver_t *driver, device_t parent)
 {
 
-	/*
-	 * Add at order 12.  acpi0 is probed at order 10 and legacy0
-	 * is probed at order 11.
-	 */
 	if (lapic_paddr != 0)
-		BUS_ADD_CHILD(parent, 12, "apic", 0);
+		BUS_ADD_CHILD(parent, 0, "apic", 0);
 }
 
 static int
@@ -921,4 +917,5 @@
 DEFINE_CLASS_0(apic, apic_driver, apic_methods, 0);
 
 static devclass_t apic_devclass;
-DRIVER_MODULE(apic, nexus, apic_driver, apic_devclass, 0, 0);
+EARLY_DRIVER_MODULE(apic, nexus, apic_driver, apic_devclass, 0, 0,
+    BUS_PASS_RESOURCE);

==== //depot/projects/multipass/sys/x86/x86/mptable_pci.c#2 (text+ko) ====

@@ -223,7 +223,8 @@
 
 DEFINE_CLASS_0(pcib, mptable_hostb_driver, mptable_hostb_methods,
     sizeof(struct mptable_hostb_softc));
-DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, hostb_devclass, 0, 0);
+EARLY_DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, hostb_devclass,
+    0, 0, BUS_PASS_BUS);
 
 /* PCI to PCI bridge driver. */
 
@@ -258,4 +259,5 @@
 
 DEFINE_CLASS_1(pcib, mptable_pcib_driver, mptable_pcib_pci_methods,
     sizeof(struct pcib_softc), pcib_driver);
-DRIVER_MODULE(mptable_pcib, pci, mptable_pcib_driver, pcib_devclass, 0, 0);
+EARLY_DRIVER_MODULE(mptable_pcib, pci, mptable_pcib_driver, pcib_devclass, 0, 0,
+    BUS_PASS_BUS);

==== //depot/projects/multipass/sys/x86/x86/nexus.c#2 (text+ko) ====

@@ -177,7 +177,8 @@
 DEFINE_CLASS_0(nexus, nexus_driver, nexus_methods, 1);
 static devclass_t nexus_devclass;
 
-DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0);
+EARLY_DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0,
+    BUS_PASS_BUS);
 
 static int
 nexus_probe(device_t dev)
@@ -279,7 +280,7 @@
 	 * types (such as ACPI), use their own nexus(4) subclass
 	 * driver to override this routine and add their own root bus.
 	 */
-	if (BUS_ADD_CHILD(dev, 10, "legacy", 0) == NULL)
+	if (BUS_ADD_CHILD(dev, 0, "legacy", 0) == NULL)
 		panic("legacy: could not attach");
 	bus_generic_attach(dev);
 	return 0;
@@ -772,7 +773,8 @@
 
 static devclass_t ram_devclass;
 
-DRIVER_MODULE(ram, nexus, ram_driver, ram_devclass, 0, 0);
+EARLY_DRIVER_MODULE(ram, nexus, ram_driver, ram_devclass, 0, 0,
+    BUS_PASS_RESOURCE);
 
 #ifdef DEV_ISA
 /*
@@ -821,5 +823,6 @@
 
 static devclass_t sysresource_devclass;
 
-DRIVER_MODULE(sysresource, isa, sysresource_driver, sysresource_devclass, 0, 0);
+EARLY_DRIVER_MODULE(sysresource, isa, sysresource_driver, sysresource_devclass,
+    0, 0, BUS_PASS_RESOURCE - 1);
 #endif /* DEV_ISA */