[src/netbsd-2]: src/sys/dev/ic Pullup rev 1.85 (requested by christos in tick...

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

details:   https://anonhg.NetBSD.org/src/rev/9a64bc8a31ed
branches:  netbsd-2
changeset: 564312:9a64bc8a31ed
user:      jmc <jmc%NetBSD.org@localhost>
date:      Fri Oct 28 19:35:21 2005 +0000

description:
Pullup rev 1.85 (requested by christos in ticket #5942)
 The previous change (to use bus_space_read_2), was broken because it was
 reading from an odd offset.

diffstat:

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

diffs (29 lines):

diff -r 659076cf48b8 -r 9a64bc8a31ed sys/dev/ic/elinkxl.c
--- a/sys/dev/ic/elinkxl.c      Fri Oct 28 19:26:22 2005 +0000
+++ b/sys/dev/ic/elinkxl.c      Fri Oct 28 19:35:21 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: elinkxl.c,v 1.72.2.1.2.1 2005/01/24 21:40:47 he Exp $  */
+/*     $NetBSD: elinkxl.c,v 1.72.2.1.2.2 2005/10/28 19:35:21 jmc 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.1 2005/01/24 21:40:47 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.72.2.1.2.2 2005/10/28 19:35:21 jmc 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_1(iot, ioh, ELINK_TXSTATUS)) & TXS_COMPLETE) {
-               bus_space_write_1(iot, ioh, ELINK_TXSTATUS, 0x0);
+       while ((i = bus_space_read_2(iot, ioh, ELINK_TIMER)) & TXS_COMPLETE) {
+               bus_space_write_2(iot, ioh, ELINK_TIMER, 0x0);
 
                if (i & TXS_JABBER) {
                        ++sc->sc_ethercom.ec_if.if_oerrors;