From owner-svn-src-all@FreeBSD.ORG Wed Feb 12 04:56:35 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 71174FBA; Wed, 12 Feb 2014 04:56:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5CFCF1488; Wed, 12 Feb 2014 04:56:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1C4uZxL097505; Wed, 12 Feb 2014 04:56:35 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1C4uZhE097504; Wed, 12 Feb 2014 04:56:35 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201402120456.s1C4uZhE097504@svn.freebsd.org> From: Warner Losh Date: Wed, 12 Feb 2014 04:56:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r261791 - head/sys/dev/fdt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Feb 2014 04:56:35 -0000 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); } -