cnputc() will take care of the necessary cr->cr/lf translation, so don't

do it in those consoles either.

9 files changed, 12 insertions, 40 deletions

diff --git a/sys/arch/mvme68k/dev/bugtty.c b/sys/arch/mvme68k/dev/bugtty.c
index 89473d018c0..c5a4556ddb0 100644
--- a/sys/arch/mvme68k/dev/bugtty.c
+++ b/sys/arch/mvme68k/dev/bugtty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bugtty.c,v 1.7 2002/04/27 23:21:05 miod Exp $ */
+/*	$OpenBSD: bugtty.c,v 1.8 2002/06/12 03:49:53 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Dale Rahn.
@@ -497,7 +497,5 @@ bugttycnputc(dev, c)
 	dev_t dev;
 	char c;
 {
-	if (c == '\n')
-		bug_outchr('\r');
 	bug_outchr(c);
 }
diff --git a/sys/arch/mvme68k/dev/cl.c b/sys/arch/mvme68k/dev/cl.c
index cb08bdbab7e..af9c4de7c7c 100644
--- a/sys/arch/mvme68k/dev/cl.c
+++ b/sys/arch/mvme68k/dev/cl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cl.c,v 1.27 2002/06/11 05:13:39 miod Exp $ */
+/*	$OpenBSD: cl.c,v 1.28 2002/06/12 03:49:54 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Dale Rahn. All rights reserved.
@@ -1080,10 +1080,6 @@ clcnputc(dev, c)
 	dev_t dev;
 	u_char c;
 {
-	/* is this the correct location for the cr -> cr/lf tranlation? */
-	if (c == '\n')
-		clputc(0, 0, '\r');
-
 	clputc(0, 0, c);
 }
 
diff --git a/sys/arch/mvme88k/dev/bugtty.c b/sys/arch/mvme88k/dev/bugtty.c
index 23cecb7a69e..8dedbde2e49 100644
--- a/sys/arch/mvme88k/dev/bugtty.c
+++ b/sys/arch/mvme88k/dev/bugtty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bugtty.c,v 1.12 2002/04/28 15:17:09 miod Exp $ */
+/*	$OpenBSD: bugtty.c,v 1.13 2002/06/12 03:49:56 miod Exp $ */
 
 /* Copyright (c) 1998 Steve Murphree, Jr. 
  * Copyright (c) 1995 Dale Rahn.
@@ -515,7 +515,5 @@ bugttycnputc(dev, c)
 	dev_t dev;
 	char c;
 {
-	if (c == '\n')
-		bugoutchr('\r');
 	bugoutchr(c);
 }
diff --git a/sys/arch/mvme88k/dev/cl.c b/sys/arch/mvme88k/dev/cl.c
index 38fd995aa74..0d15542f16e 100644
--- a/sys/arch/mvme88k/dev/cl.c
+++ b/sys/arch/mvme88k/dev/cl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cl.c,v 1.25 2002/06/11 05:13:39 miod Exp $ */
+/*	$OpenBSD: cl.c,v 1.26 2002/06/12 03:49:56 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Dale Rahn. All rights reserved.
@@ -1064,10 +1064,6 @@ clcnputc(dev, c)
 	dev_t dev;
 	u_char c;
 {
-	/* is this the correct location for the cr -> cr/lf tranlation? */
-	if (c == '\n')
-		clputc(0, 0, '\r');
-
 	clputc(0, 0, c);
 }
 
diff --git a/sys/arch/mvme88k/dev/dart.c b/sys/arch/mvme88k/dev/dart.c
index baecc2aa2db..301b6f71c4d 100644
--- a/sys/arch/mvme88k/dev/dart.c
+++ b/sys/arch/mvme88k/dev/dart.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dart.c,v 1.17 2002/04/28 15:17:09 miod Exp $	*/
+/*	$OpenBSD: dart.c,v 1.18 2002/06/12 03:49:56 miod Exp $	*/
 
 /*
  * Mach Operating System
@@ -1193,16 +1193,9 @@ dartcnputc(dev, c)
 	DELAY_CR;
 	ptaddr->write.wr_cr = TXEN;
 
-	/* If the character is a line feed(\n) */
-	/* then follow it with carriage return (\r) */
-	for (;;) {
-		while (!(ptaddr->read.rd_sr & TXRDY))
-			;
-		ptaddr->write.wr_tb = c;
-		if (c != '\n')
-			break;
-		c = '\r';
-	}
+	while (!(ptaddr->read.rd_sr & TXRDY))
+		;
+	ptaddr->write.wr_tb = c;
 
 	/* wait for transmitter to empty */
 	while (!(ptaddr->read.rd_sr & TXEMT))
diff --git a/sys/arch/mvmeppc/dev/bugtty.c b/sys/arch/mvmeppc/dev/bugtty.c
index d0cc0e8de36..80c78be3a68 100644
--- a/sys/arch/mvmeppc/dev/bugtty.c
+++ b/sys/arch/mvmeppc/dev/bugtty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bugtty.c,v 1.5 2002/06/08 15:47:31 miod Exp $ */
+/*	$OpenBSD: bugtty.c,v 1.6 2002/06/12 03:49:58 miod Exp $ */
 /* Copyright (c) 1998 Steve Murphree, Jr. 
  * Copyright (c) 1995 Dale Rahn.
  * All rights reserved.
@@ -453,7 +453,5 @@ bugttycnputc(dev, c)
 	dev_t dev;
 	char c;
 {
-	if (c == '\n')
-		mvmeprom_outchar('\r');
 	mvmeprom_outchar(c);
 }
diff --git a/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c b/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c
index cc235a685f8..7952241829a 100644
--- a/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c
+++ b/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ppc1_machdep.c,v 1.8 2002/06/08 15:50:00 miod Exp $	*/
+/*	$OpenBSD: ppc1_machdep.c,v 1.9 2002/06/12 03:49:59 miod Exp $	*/
 /*	$NetBSD: ofw_machdep.c,v 1.1 1996/09/30 16:34:50 ws Exp $	*/
 
 /*
@@ -360,7 +360,5 @@ bootcnputc(dev, c)
 	dev_t dev;
 	char c;
 {
-	if (c == '\n')
-		mvmeprom_outchar('\r');
 	mvmeprom_outchar(c);
 }
diff --git a/sys/arch/vax/qbus/qd.c b/sys/arch/vax/qbus/qd.c
index 515e516f926..5e9ec1cd481 100644
--- a/sys/arch/vax/qbus/qd.c
+++ b/sys/arch/vax/qbus/qd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qd.c,v 1.5 2002/06/10 21:56:08 miod Exp $	*/
+/*	$OpenBSD: qd.c,v 1.6 2002/06/12 03:50:05 miod Exp $	*/
 /*	$NetBSD: qd.c,v 1.17 2000/01/24 02:40:29 matt Exp $	*/
 
 /*-
@@ -2924,9 +2924,6 @@ qdcnputc(dev, chr)
 		return;
 
 	blitc(0, (u_char)(chr & 0xff));
-	if ((chr & 0177) == '\n')
-		blitc(0, '\r');
-
 } /* qdputc */
 
 /*
diff --git a/sys/arch/vax/uba/qv.c b/sys/arch/vax/uba/qv.c
index 563d40c8b04..75fcc6f95e1 100644
--- a/sys/arch/vax/uba/qv.c
+++ b/sys/arch/vax/uba/qv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qv.c,v 1.4 2000/11/10 15:33:09 provos Exp $	*/
+/*	$OpenBSD: qv.c,v 1.5 2002/06/12 03:50:10 miod Exp $	*/
 /*	$NetBSD: qv.c,v 1.2 1996/09/02 06:44:28 mycroft Exp $	*/
 
 /*-
@@ -981,8 +981,6 @@ qvputc(c)
 char c;
 {
 	qvputchar(c);
-	if (c == '\n')
-		qvputchar('\r');
 }
 
 /*