Module Name: src
Committed By: tsutsui
Date: Sat Jan 22 16:59:27 UTC 2011
Modified Files:
src/sys/dev/ic: com.c
Log Message:
Revert part of changes in rev 1.298:
- it breaks cobalt's serial console as mentioned in PR port-cobalt/44292
- MCR_PRESCALE doesn't affect unless EFR_EFCR is set in the EFR register
- even if MCR_PRESCALE is enabled we should define appropriate sc_type
variants and BRG values should be adjusted in comspeed() per sc_type
- sc_frequency should be adjusted in MD attachment if necessary
Tested on cobalt by several people, ok from jklos@
To generate a diff of this commit:
cvs rdiff -u -r1.298 -r1.299 src/sys/dev/ic/com.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/ic/com.c
diff -u src/sys/dev/ic/com.c:1.298 src/sys/dev/ic/com.c:1.299
--- src/sys/dev/ic/com.c:1.298 Tue Jul 20 06:17:20 2010
+++ src/sys/dev/ic/com.c Sat Jan 22 16:59:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.298 2010/07/20 06:17:20 jklos Exp $ */
+/* $NetBSD: com.c,v 1.299 2011/01/22 16:59:26 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.298 2010/07/20 06:17:20 jklos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.299 2011/01/22 16:59:26 tsutsui Exp $");
#include "opt_com.h"
#include "opt_ddb.h"
@@ -465,8 +465,6 @@
sc->sc_fifolen = 0;
} else {
SET(sc->sc_hwflags, COM_HW_FLOW);
- SET(sc->sc_mcr, MCR_PRESCALE);
- sc->sc_frequency /= 4;
sc->sc_fifolen = 32;
}
} else
