Module Name: src
Committed By: snj
Date: Wed Mar 18 16:30:44 UTC 2015
Modified Files:
src/sys/dev [netbsd-5]: cons.c
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #1952):
sys/dev/cons.c: revision 1.74
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.65 -r1.65.20.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.65 src/sys/dev/cons.c:1.65.20.1
--- src/sys/dev/cons.c:1.65 Thu Jan 24 17:32:52 2008
+++ src/sys/dev/cons.c Wed Mar 18 16:30:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cons.c,v 1.65 2008/01/24 17:32:52 ad Exp $ */
+/* $NetBSD: cons.c,v 1.65.20.1 2015/03/18 16:30:44 snj Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.65 2008/01/24 17:32:52 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.65.20.1 2015/03/18 16:30:44 snj Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -336,9 +336,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);
}
}
