CVS commit: [netbsd-7] src/sys/dev

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Mon Mar  9 08:00:46 UTC 2015

Modified Files:
        src/sys/dev [netbsd-7]: cons.c

Log Message:
Pull up following revision(s) (requested by nakayama in ticket #574):
        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.72 -r1.72.2.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.72 src/sys/dev/cons.c:1.72.2.1
--- src/sys/dev/cons.c:1.72	Fri Jul 25 08:10:35 2014
+++ src/sys/dev/cons.c	Mon Mar  9 08:00:46 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: cons.c,v 1.72 2014/07/25 08:10:35 dholland Exp $	*/
+/*	$NetBSD: cons.c,v 1.72.2.1 2015/03/09 08:00:46 snj Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.72 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.72.2.1 2015/03/09 08:00:46 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -314,11 +314,11 @@ cnputc(int c)
 		return;
 
 	if (c) {
-		(*cn_tab->cn_putc)(cn_tab->cn_dev, c);
 		if (c == '\n') {
-			docritpollhooks();
 			(*cn_tab->cn_putc)(cn_tab->cn_dev, '\r');
+			docritpollhooks();
 		}
+		(*cn_tab->cn_putc)(cn_tab->cn_dev, c);
 	}
 }