[src/netbsd-2]: src/sys/dev/ic Back out 1.72.2.1.2.2 (requested by itohy in t...

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

details:   https://anonhg.NetBSD.org/src/rev/a6922bd9b7bf
branches:  netbsd-2
changeset: 564570:a6922bd9b7bf
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Dec 16 11:04:25 2006 +0000

description:
Back out 1.72.2.1.2.2 (requested by itohy in ticket #10825)
        The problem fixed by 1.85 (pulled up in ticket #5942) is an
        inconsistency between elinkxl.c and elink3reg.h, that was introduced
        by elink3reg.h rev 1.27. elink3reg.h in netbsd-2 branch is 1.26, and
        pulling up the change made them inconsistent, and caused problem
        kern/31455 that had not been in netbsd-2 branch.

diffstat:

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

diffs (29 lines):

diff -r a49f2c72d3a9 -r a6922bd9b7bf sys/dev/ic/elinkxl.c
--- a/sys/dev/ic/elinkxl.c      Sat Dec 02 13:10:07 2006 +0000
+++ b/sys/dev/ic/elinkxl.c      Sat Dec 16 11:04:25 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: elinkxl.c,v 1.72.2.1.2.2 2005/10/28 19:35:21 jmc Exp $ */
+/*     $NetBSD: elinkxl.c,v 1.72.2.1.2.3 2006/12/16 11:04:25 bouyer Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.72.2.1.2.2 2005/10/28 19:35:21 jmc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.72.2.1.2.3 2006/12/16 11:04:25 bouyer Exp $");
 
 #include "bpfilter.h"
 #include "rnd.h"
@@ -786,8 +786,8 @@
         * We need to read+write TX_STATUS until we get a 0 status
         * in order to turn off the interrupt flag.
         */
-       while ((i = bus_space_read_2(iot, ioh, ELINK_TIMER)) & TXS_COMPLETE) {
-               bus_space_write_2(iot, ioh, ELINK_TIMER, 0x0);
+       while ((i = bus_space_read_1(iot, ioh, ELINK_TXSTATUS)) & TXS_COMPLETE) {
+               bus_space_write_1(iot, ioh, ELINK_TXSTATUS, 0x0);
 
                if (i & TXS_JABBER) {
                        ++sc->sc_ethercom.ec_if.if_oerrors;