From owner-p4-projects@FreeBSD.ORG  Thu Mar 22 19:18:14 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 718301065674; Thu, 22 Mar 2012 19:18:14 +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 34406106566B
	for <perforce@freebsd.org>; Thu, 22 Mar 2012 19:18:14 +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 02EEA8FC0A
	for <perforce@freebsd.org>; Thu, 22 Mar 2012 19:18:14 +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 q2MJIDWp010855
	for <perforce@freebsd.org>; Thu, 22 Mar 2012 19:18:13 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 q2MJIDSV010852
	for perforce@freebsd.org; Thu, 22 Mar 2012 19:18:13 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 22 Mar 2012 19:18:13 GMT
Message-Id: <201203221918.q2MJIDSV010852@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 208387 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: Thu, 22 Mar 2012 19:18:14 -0000

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

Change 208387 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/03/22 19:17:48

	Tweaks to the Altera JTAG UART and gxemul console drivers -- check
	for alt-break sequences in input, not output, and name the gxemul
	console device "gxcons" rather than "gcons".

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/altera_jtag_uart.c#4 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/gxemul_cons.c#3 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/altera_jtag_uart.c#4 (text+ko) ====

@@ -374,9 +374,6 @@
 	 * rescheduling on our timer tick if work remains to be done.
 	 */
 	for (;;) {
-#ifdef KDB
-		kdb_alt_break(ch, &aj_uart_alt_break_state);
-#endif
 		len = ttydisc_getc(tp, &ch, sizeof(ch));
 		if (len == 0)
 			break;
@@ -398,6 +395,9 @@
 	while (aj_uart_readable()) {
 		c = aj_uart_read();
 		AJU_UNLOCK();
+#ifdef KDB
+		kdb_alt_break(c, &aj_uart_alt_break_state);
+#endif
 		ttydisc_rint(tp, c, 0);
 		AJU_LOCK();
 	}

==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/gxemul_cons.c#3 (text+ko) ====

@@ -278,7 +278,7 @@
 
 	tp = tty_alloc(&gxemul_cons_ttydevsw, NULL);
 	tty_init_console(tp, 0);
-	tty_makedev(tp, NULL, "%s", "gcons");
+	tty_makedev(tp, NULL, "%s", "gxcons");
 	callout_init(&gxemul_cons_callout, CALLOUT_MPSAFE);
 	callout_reset(&gxemul_cons_callout, gxemul_cons_polltime,
 	    gxemul_cons_timeout, tp);
@@ -298,9 +298,6 @@
 	 * rescheduling on our timer tick if work remains to be done..
 	 */
 	for (;;) {
-#ifdef KDB
-		kdb_alt_break(ch, &gxemul_cons_alt_break_state);
-#endif
 		len = ttydisc_getc(tp, &ch, sizeof(ch));
 		if (len == 0)
 			break;
@@ -322,6 +319,9 @@
 	while (gxemul_cons_readable()) {
 		c = gxemul_cons_read();
 		GC_UNLOCK();
+#ifdef KDB
+		kdb_alt_break(c, &gxemul_cons_alt_break_state);
+#endif
 		ttydisc_rint(tp, c, 0);
 		GC_LOCK();
 	}