svn commit: r261791 - head/sys/dev/fdt

[Warner Losh]

Author: imp
Date: Wed Feb 12 04:56:34 2014
New Revision: 261791
URL: http://svnweb.freebsd.org/changeset/base/261791

Log:
  Better nomatch messages: include compat string.  Also, flag devices as
  disabled in the successful probe message, but leave what that means to
  the actual driver (no semantic changes).

Modified:
  head/sys/dev/fdt/simplebus.c

Modified: head/sys/dev/fdt/simplebus.c
==============================================================================
--- head/sys/dev/fdt/simplebus.c	Wed Feb 12 04:30:37 2014	(r261790)
+++ head/sys/dev/fdt/simplebus.c	Wed Feb 12 04:56:34 2014	(r261791)
@@ -401,18 +401,24 @@ simplebus_print_res(struct simplebus_dev
 static void
 simplebus_probe_nomatch(device_t bus, device_t child)
 {
-	const char *name, *type;
+	const char *name, *type, *compat;
 
 	if (!bootverbose)
 		return;
 
 	name = ofw_bus_get_name(child);
 	type = ofw_bus_get_type(child);
+	compat = ofw_bus_get_compat(child);
 
 	device_printf(bus, "<%s>", name != NULL ? name : "unknown");
 	simplebus_print_res(device_get_ivars(child));
-	printf(" type %s (no driver attached)\n",
-	    type != NULL ? type : "unknown");
+	if (!ofw_bus_status_okay(child))
+		printf(" disabled");
+	if (type)
+		printf(" type %s", type);
+	if (compat)
+		printf(" compat %s", compat);
+	printf(" (no driver attached)\n");
 }
 
 static int
@@ -422,7 +428,8 @@ simplebus_print_child(device_t bus, devi
 
 	rv = bus_print_child_header(bus, child);
 	rv += simplebus_print_res(device_get_ivars(child));
+	if (!ofw_bus_status_okay(child))
+		rv += printf(" disabled");
 	rv += bus_print_child_footer(bus, child);
 	return (rv);
 }
-