[src/netbsd-1-6]: src/sys/dev/pcmcia Pull up revision 1.23 (requested by mart...

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

details:   https://anonhg.NetBSD.org/src/rev/15a1ed4112f8
branches:  netbsd-1-6
changeset: 529132:15a1ed4112f8
user:      lukem <lukem%NetBSD.org@localhost>
date:      Wed Oct 02 02:56:55 2002 +0000

description:
Pull up revision 1.23 (requested by martin in ticket #891):
Apply a patch from Murray Armfield in PR kern/18372: bring in some changes
from FreeBSD to improve receive performance.

diffstat:

 sys/dev/pcmcia/if_xi.c |  16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diffs (46 lines):

diff -r 5ac727f89cd0 -r 15a1ed4112f8 sys/dev/pcmcia/if_xi.c
--- a/sys/dev/pcmcia/if_xi.c    Wed Oct 02 01:29:36 2002 +0000
+++ b/sys/dev/pcmcia/if_xi.c    Wed Oct 02 02:56:55 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_xi.c,v 1.21 2002/05/05 03:19:26 takemura Exp $ */
+/*     $NetBSD: if_xi.c,v 1.21.4.1 2002/10/02 02:56:55 lukem Exp $ */
 /*     OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp   */
 
 /*
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.21 2002/05/05 03:19:26 takemura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.21.4.1 2002/10/02 02:56:55 lukem Exp $");
 
 #include "opt_inet.h"
 #include "bpfilter.h"
@@ -834,13 +834,14 @@
        PAGE(sc, 40);
        rx_status =
            bus_space_read_1(sc->sc_bst, sc->sc_bsh, sc->sc_offset + RXST0);
+       bus_space_write_1(sc->sc_bst, sc->sc_bsh, sc->sc_offset + RXST0,
+           ~rx_status & 0xff);
        tx_status =
            bus_space_read_1(sc->sc_bst, sc->sc_bsh, sc->sc_offset + TXST0);
-
-       /*
-        * XXX Linux writes to RXST0 and TXST* here.  My CE2 works just fine
-        * without it, and I can't see an obvious reason for it.
-        */
+       tx_status |=
+           bus_space_read_1(sc->sc_bst, sc->sc_bsh, sc->sc_offset + TXST1) << 8;
+       bus_space_write_1(sc->sc_bst, sc->sc_bsh, sc->sc_offset + TXST0,0);
+       bus_space_write_1(sc->sc_bst, sc->sc_bsh, sc->sc_offset + TXST1,0);
 
        PAGE(sc, 0);
        while (esr & FULL_PKT_RCV) {
@@ -885,6 +886,7 @@
 
        /* Check for rx overrun. */
        if (rx_status & RX_OVERRUN) {
+               ifp->if_ierrors++;
                bus_space_write_1(sc->sc_bst, sc->sc_bsh, sc->sc_offset + CR,
                    CLR_RX_OVERRUN);
                DPRINTF(XID_INTR, ("xi: overrun cleared\n"));