From owner-p4-projects@FreeBSD.ORG  Mon May  7 13:33:33 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 204C01065672; Mon,  7 May 2012 13:33:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D6EA0106566B
	for <perforce@freebsd.org>; Mon,  7 May 2012 13:33:32 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id BF1DB8FC19
	for <perforce@freebsd.org>; Mon,  7 May 2012 13:33:32 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q47DXWxJ097095
	for <perforce@freebsd.org>; Mon, 7 May 2012 13:33:32 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q47DXWHF097092
	for perforce@freebsd.org; Mon, 7 May 2012 13:33:32 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 7 May 2012 13:33:32 GMT
Message-Id: <201205071333.q47DXWHF097092@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 210786 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 07 May 2012 13:33:33 -0000

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

Change 210786 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/05/07 13:33:13

	Check for the RB_SERIAL boot flag and change the relative priority
	of the gxemul console and Altera JTAG UART in line with their role
	as "serial consoles" on their respective platforms.  This allows
	them to override video console drivers that might otherwise take
	precedence, subject to that boot flag.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.c#3 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/gxemul/cons/gxemul_cons.c#4 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.c#3 (text+ko) ====

@@ -37,6 +37,7 @@
 #include <sys/kdb.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/reboot.h>
 #include <sys/tty.h>
 
 #include <ddb/ddb.h>
@@ -297,7 +298,7 @@
 {
 
 	sprintf(cp->cn_name, "ttyu0");
-	cp->cn_pri = CN_NORMAL;
+	cp->cn_pri = (boothowto & RB_SERIAL) ? CN_REMOTE : CN_NORMAL;
 }
 
 static void

==== //depot/projects/ctsrd/beribsd/src/sys/dev/gxemul/cons/gxemul_cons.c#4 (text+ko) ====

@@ -37,6 +37,7 @@
 #include <sys/kdb.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/reboot.h>
 #include <sys/tty.h>
 
 #include <ddb/ddb.h>
@@ -219,7 +220,7 @@
 {
 
 	sprintf(cp->cn_name, "ttyu0");
-	cp->cn_pri = CN_NORMAL;
+	cp->cn_pri = (boothowto & RB_SERIAL) ? CN_REMOTE : CN_NORMAL;
 }
 
 static void