[src/netbsd-1-4]: src/sys/dev/ic Pull up revision 1.8 (requested by scw):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9a5ffcf51e88
branches:  netbsd-1-4
changeset: 469730:9a5ffcf51e88
user:      he <he%NetBSD.org@localhost>
date:      Sun Nov 21 15:15:45 1999 +0000

description:
Pull up revision 1.8 (requested by scw):
  Fix a problem with changing baud rate to > 9600, and a problem
  with setting the Rx FIFO threshold register.

diffstat:

 sys/dev/ic/clmpcc.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r b7bfe9873eec -r 9a5ffcf51e88 sys/dev/ic/clmpcc.c
--- a/sys/dev/ic/clmpcc.c       Sun Nov 21 15:11:56 1999 +0000
+++ b/sys/dev/ic/clmpcc.c       Sun Nov 21 15:15:45 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clmpcc.c,v 1.4.2.2 1999/09/10 23:32:12 he Exp $ */
+/*     $NetBSD: clmpcc.c,v 1.4.2.3 1999/11/21 15:15:45 he Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -965,7 +965,7 @@
        u_char r1;
        u_char r2;
 
-       if ( ch->ch_tcor && ch->ch_tbpr ) {
+       if ( ch->ch_tcor || ch->ch_tbpr ) {
                r1 = clmpcc_rdreg(sc, CLMPCC_REG_TCOR);
                r2 = clmpcc_rdreg(sc, CLMPCC_REG_TBPR);
                /* Only write Tx rate if it really has changed */
@@ -975,7 +975,7 @@
                }
        }
 
-       if ( ch->ch_rcor && ch->ch_rbpr ) {
+       if ( ch->ch_rcor || ch->ch_rbpr ) {
                r1 = clmpcc_rdreg(sc, CLMPCC_REG_RCOR);
                r2 = clmpcc_rdreg(sc, CLMPCC_REG_RBPR);
                /* Only write Rx rate if it really has changed */
@@ -1114,7 +1114,7 @@
                 * further receive timeout interrupts.
                 */
                reg = clmpcc_rdreg(sc, CLMPCC_REG_COR4);
-               clmpcc_wrreg(sc, CLMPCC_REG_COR4, reg & CLMPCC_COR4_FIFO_MASK);
+               clmpcc_wrreg(sc, CLMPCC_REG_COR4, reg & ~CLMPCC_COR4_FIFO_MASK);
                reg = clmpcc_rdreg(sc, CLMPCC_REG_IER);
                clmpcc_wrreg(sc, CLMPCC_REG_IER, reg & ~CLMPCC_IER_RET);
                clmpcc_wrreg(sc, CLMPCC_REG_REOIR, CLMPCC_REOIR_NO_TRANS);