[src/netbsd-3]: 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/1bbbba5040f0
branches:  netbsd-3
changeset: 577407:1bbbba5040f0
user:      jmc <jmc%NetBSD.org@localhost>
date:      Fri Oct 28 19:46:55 2005 +0000

description:
Pullup rev 1.85 (requested by christos in ticket #913)
 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 2ba1c0cb04fe -r 1bbbba5040f0 sys/dev/ic/elinkxl.c
--- a/sys/dev/ic/elinkxl.c      Sat Oct 22 03:58:00 2005 +0000
+++ b/sys/dev/ic/elinkxl.c      Fri Oct 28 19:46:55 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: elinkxl.c,v 1.79.2.1 2005/10/06 11:48:49 tron Exp $    */
+/*     $NetBSD: elinkxl.c,v 1.79.2.2 2005/10/28 19:46:55 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.79.2.1 2005/10/06 11:48:49 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.79.2.2 2005/10/28 19:46:55 jmc Exp $");
 
 #include "bpfilter.h"
 #include "rnd.h"
@@ -791,8 +791,8 @@
         * XXX: Big Endian? Can we assume that TXSTATUS will be the
         * upper byte?
         */
-       while ((i = bus_space_read_2(iot, ioh, ELINK_TXSTATUS)) & TXS_COMPLETE) {
-               bus_space_write_2(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;