PERFORCE change 208387 for review

[Robert Watson]

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

Change 208387 by rwatson at 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();
 	}