From owner-p4-projects@FreeBSD.ORG  Fri Mar 31 16:57:45 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D334B16A420; Fri, 31 Mar 2006 16:57:44 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B35B116A401
	for <perforce@freebsd.org>; Fri, 31 Mar 2006 16:57:44 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7ED7943D48
	for <perforce@freebsd.org>; Fri, 31 Mar 2006 16:57:44 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2VGvii2096337
	for <perforce@freebsd.org>; Fri, 31 Mar 2006 16:57:44 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2VGviI9096334
	for perforce@freebsd.org; Fri, 31 Mar 2006 16:57:44 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 31 Mar 2006 16:57:44 GMT
Message-Id: <200603311657.k2VGviI9096334@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 94358 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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, 31 Mar 2006 16:57:45 -0000

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

Change 94358 by jhb@jhb_slimer on 2006/03/31 16:57:25

	- Fix setting of device description in common case.
	- Shut npx up for modern systems, it just adds needless clutter to
	  the dmesg.

Affected files ...

.. //depot/projects/smpng/sys/i386/isa/npx.c#54 edit

Differences ...

==== //depot/projects/smpng/sys/i386/isa/npx.c#54 (text+ko) ====

@@ -253,6 +253,8 @@
 	KASSERT((rcr0() & (CR0_MP | CR0_NE)) == (CR0_MP | CR0_NE),
 	    ("cr0 busted"));
 
+	device_set_desc(dev, "math processor");
+
 	/*
 	 * Modern CPUs all have an FPU that uses the INT16 interface
 	 * and provide a simple way to verify that, so handle the
@@ -261,6 +263,7 @@
 	if (cpu_feature & CPUID_FPU) {
 		hw_float = npx_exists = 1;
 		npx_ex16 = 1;
+		device_quiet(dev);
 		return (0);
 	}
 
@@ -317,8 +320,6 @@
 	 */
 	fninit();
 
-	device_set_desc(dev, "math processor");
-
 	/*
 	 * Don't use fwait here because it might hang.
 	 * Don't use fnop here because it usually hangs if there is no FPU.
@@ -418,12 +419,14 @@
 
 	flags = device_get_flags(dev);
 
-	if (npx_irq13)
-		device_printf(dev, "IRQ 13 interface\n");
-	else if (npx_ex16)
-		device_printf(dev, "INT 16 interface\n");
-	else
-		device_printf(dev, "WARNING: no FPU!\n");
+	if (!device_is_quiet(dev) || bootverbose) {
+		if (npx_irq13)
+			device_printf(dev, "IRQ 13 interface\n");
+		else if (npx_ex16)
+			device_printf(dev, "INT 16 interface\n");
+		else
+			device_printf(dev, "WARNING: no FPU!\n");
+	}
 
 	npxinit(__INITIAL_NPXCW__);