Module Name: src
Committed By: snj
Date: Tue Mar 24 08:58:30 UTC 2015
Modified Files:
src/sys/dev [netbsd-6]: cons.c
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #1267):
sys/dev/cons.c: revision 1.74 via patch
Fix strange kernel output sequence "\n\r" observed in serial
consoles. Output '\r' before '\n' in conversion.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.68.10.1 src/sys/dev/cons.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/cons.c
diff -u src/sys/dev/cons.c:1.68 src/sys/dev/cons.c:1.68.10.1
--- src/sys/dev/cons.c:1.68 Tue Feb 8 20:20:26 2011
+++ src/sys/dev/cons.c Tue Mar 24 08:58:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cons.c,v 1.68 2011/02/08 20:20:26 rmind Exp $ */
+/* $NetBSD: cons.c,v 1.68.10.1 2015/03/24 08:58:29 snj Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.68 2011/02/08 20:20:26 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.68.10.1 2015/03/24 08:58:29 snj Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -296,9 +296,9 @@ cnputc(int c)
return;
if (c) {
- (*cn_tab->cn_putc)(cn_tab->cn_dev, c);
if (c == '\n')
(*cn_tab->cn_putc)(cn_tab->cn_dev, '\r');
+ (*cn_tab->cn_putc)(cn_tab->cn_dev, c);
}
}
