CVS commit: [matt-nb5-mips64] src/sys/dev/ic

[Cliff Neighbors]

Module Name:    src
Committed By:   cliff
Date:           Sun Sep 13 03:32:33 UTC 2009

Modified Files:
        src/sys/dev/ic [matt-nb5-mips64]: com.c

Log Message:
when attaching com, (frequency == -1) means leave the BRG divisor as-is
(inherit values established by firmware)


To generate a diff of this commit:
cvs rdiff -u -r1.286 -r1.286.10.1 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.286 src/sys/dev/ic/com.c:1.286.10.1
--- src/sys/dev/ic/com.c:1.286	Sat Oct 25 17:50:29 2008
+++ src/sys/dev/ic/com.c	Sun Sep 13 03:32:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.286 2008/10/25 17:50:29 matt Exp $ */
+/* $NetBSD: com.c,v 1.286.10.1 2009/09/13 03:32:33 cliff 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.286 2008/10/25 17:50:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.286.10.1 2009/09/13 03:32:33 cliff Exp $");
 
 #include "opt_com.h"
 #include "opt_ddb.h"
@@ -2151,18 +2151,21 @@
 		CSR_WRITE_1(regsp, COM_REG_MDR1, MDR1_MODE_DISABLE);
 	}
 
-	rate = comspeed(rate, frequency, type);
-	if (type != COM_TYPE_AU1x00) {
-		/* no EFR on alchemy */ 
-		if (type != COM_TYPE_16550_NOERS) {
-			CSR_WRITE_1(regsp, COM_REG_LCR, LCR_EERS);
-			CSR_WRITE_1(regsp, COM_REG_EFR, 0);
+	/* frequency==-1 means leave the rate as-is */
+	if (frequency != -1) {
+		rate = comspeed(rate, frequency, type);
+		if (type != COM_TYPE_AU1x00) {
+			/* no EFR on alchemy */ 
+			if (type != COM_TYPE_16550_NOERS) {
+				CSR_WRITE_1(regsp, COM_REG_LCR, LCR_EERS);
+				CSR_WRITE_1(regsp, COM_REG_EFR, 0);
+			}
+			CSR_WRITE_1(regsp, COM_REG_LCR, LCR_DLAB);
+			CSR_WRITE_1(regsp, COM_REG_DLBL, rate & 0xff);
+			CSR_WRITE_1(regsp, COM_REG_DLBH, rate >> 8);
+		} else {
+			CSR_WRITE_1(regsp, COM_REG_DLBL, rate);
 		}
-		CSR_WRITE_1(regsp, COM_REG_LCR, LCR_DLAB);
-		CSR_WRITE_1(regsp, COM_REG_DLBL, rate & 0xff);
-		CSR_WRITE_1(regsp, COM_REG_DLBH, rate >> 8);
-	} else {
-		CSR_WRITE_1(regsp, COM_REG_DLBL, rate);
 	}
 	CSR_WRITE_1(regsp, COM_REG_LCR, cflag2lcr(cflag));
 	CSR_WRITE_1(regsp, COM_REG_MCR, MCR_DTR | MCR_RTS);