PERFORCE change 154197 for review

[Nathan Whitehorn]

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

Change 154197 by nwhitehorn at nwhitehorn_trantor on 2008/12/06 16:00:55

	As pointed out by Marius, the name= and compat= are infinitely more
	appropriate as part of the pnpinfo instead of in the location string.
	
	I had attempted to draw an analogy with ACPI's added information, but
	the ACPI handles are full pathnames. Since OFW pathnames have a 
	tendency to be quite long, I don't have any interest in adding those.
	
	Obvious change due to: marius

Affected files ...

.. //depot/projects/ppc-g5/sys/dev/ofw/ofw_bus_subr.c#5 edit
.. //depot/projects/ppc-g5/sys/dev/ofw/ofw_bus_subr.h#4 edit
.. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcibus.c#6 edit
.. //depot/projects/ppc-g5/sys/powerpc/powermac/macio.c#7 edit

Differences ...

==== //depot/projects/ppc-g5/sys/dev/ofw/ofw_bus_subr.c#5 (text+ko) ====

@@ -75,7 +75,7 @@
 }
 
 int 
-ofw_bus_gen_child_location_str(device_t cbdev, device_t child, char *buf,
+ofw_bus_gen_child_pnpinfo_str(device_t cbdev, device_t child, char *buf,
     size_t buflen)
 {
 	strlcat(buf, "name=", buflen);

==== //depot/projects/ppc-g5/sys/dev/ofw/ofw_bus_subr.h#4 (text+ko) ====

@@ -50,8 +50,8 @@
 int	ofw_bus_gen_setup_devinfo(struct ofw_bus_devinfo *, phandle_t);
 void	ofw_bus_gen_destroy_devinfo(struct ofw_bus_devinfo *);
 
-/* Helper method to append interesting OF properties to devinfo location */
-int	ofw_bus_gen_child_location_str(device_t, device_t, char *, size_t);
+/* Helper method to report interesting OF properties in pnpinfo */
+int	ofw_bus_gen_child_pnpinfo_str(device_t, device_t, char *, size_t);
 
 /* Routines for processing firmware interrupt maps */
 

==== //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcibus.c#6 (text+ko) ====

@@ -59,7 +59,7 @@
 static device_attach_t ofw_pcibus_attach;
 static pci_assign_interrupt_t ofw_pcibus_assign_interrupt;
 static ofw_bus_get_devinfo_t ofw_pcibus_get_devinfo;
-static int ofw_pcibus_child_location_str_method(device_t cbdev, device_t child,
+static int ofw_pcibus_child_pnpinfo_str_method(device_t cbdev, device_t child,
     char *buf, size_t buflen);
 
 static void ofw_pcibus_enum_devtree(device_t dev, u_int domain, u_int busno);
@@ -71,7 +71,7 @@
 	DEVMETHOD(device_attach,	ofw_pcibus_attach),
 
 	/* Bus interface */
-	DEVMETHOD(bus_child_location_str, ofw_pcibus_child_location_str_method),
+	DEVMETHOD(bus_child_pnpinfo_str, ofw_pcibus_child_pnpinfo_str_method),
 
 	/* PCI interface */
 	DEVMETHOD(pci_assign_interrupt, ofw_pcibus_assign_interrupt),
@@ -262,14 +262,14 @@
 }
 
 static int
-ofw_pcibus_child_location_str_method(device_t cbdev, device_t child, char *buf,
+ofw_pcibus_child_pnpinfo_str_method(device_t cbdev, device_t child, char *buf,
     size_t buflen)
 {
-	pci_child_location_str_method(cbdev, child, buf, buflen);
+	pci_child_pnpinfo_str_method(cbdev, child, buf, buflen);
 
 	if (ofw_bus_get_node(child) != -1)  {
 		strlcat(buf, " ", buflen); /* Separate info */
-		ofw_bus_gen_child_location_str(cbdev, child, buf, buflen);
+		ofw_bus_gen_child_pnpinfo_str(cbdev, child, buf, buflen);
 	}
 
 	return (0);

==== //depot/projects/ppc-g5/sys/powerpc/powermac/macio.c#7 (text+ko) ====

@@ -107,7 +107,7 @@
         DEVMETHOD(bus_deactivate_resource, macio_deactivate_resource),
         DEVMETHOD(bus_get_resource_list, macio_get_resource_list),	
 
-	DEVMETHOD(bus_child_location_str, ofw_bus_gen_child_location_str),
+	DEVMETHOD(bus_child_pnpinfo_str, ofw_bus_gen_child_pnpinfo_str),
 
 	/* ofw_bus interface */
 	DEVMETHOD(ofw_bus_get_devinfo,	macio_get_devinfo),