[src/netbsd-1-5]: src/sys/dev/ic pull up 1.15 (approved by thorpej):

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

details:   https://anonhg.NetBSD.org/src/rev/f88207d9125f
branches:  netbsd-1-5
changeset: 488833:f88207d9125f
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Jul 31 05:33:27 2000 +0000

description:
pull up 1.15 (approved by thorpej):
>Get PCI HME working.

diffstat:

 sys/dev/ic/hme.c |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (66 lines):

diff -r 14dfa31a4023 -r f88207d9125f sys/dev/ic/hme.c
--- a/sys/dev/ic/hme.c  Mon Jul 31 05:12:43 2000 +0000
+++ b/sys/dev/ic/hme.c  Mon Jul 31 05:33:27 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hme.c,v 1.14 2000/06/15 15:34:32 pk Exp $      */
+/*     $NetBSD: hme.c,v 1.14.2.1 2000/07/31 05:33:27 mrg Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -439,16 +439,16 @@
         * Initialize transmit buffer descriptors
         */
        for (i = 0; i < ntbuf; i++) {
-               HME_XD_SETADDR(hr->rb_txd, i, txbufdma + i * _HME_BUFSZ);
-               HME_XD_SETFLAGS(hr->rb_txd, i, 0);
+               HME_XD_SETADDR(sc->sc_pci, hr->rb_txd, i, txbufdma + i * _HME_BUFSZ);
+               HME_XD_SETFLAGS(sc->sc_pci, hr->rb_txd, i, 0);
        }
 
        /*
         * Initialize receive buffer descriptors
         */
        for (i = 0; i < nrbuf; i++) {
-               HME_XD_SETADDR(hr->rb_rxd, i, rxbufdma + i * _HME_BUFSZ);
-               HME_XD_SETFLAGS(hr->rb_rxd, i,
+               HME_XD_SETADDR(sc->sc_pci, hr->rb_rxd, i, rxbufdma + i * _HME_BUFSZ);
+               HME_XD_SETFLAGS(sc->sc_pci, hr->rb_rxd, i,
                                HME_XD_OWN | HME_XD_ENCODE_RSIZE(_HME_BUFSZ));
        }
 
@@ -839,7 +839,7 @@
                /*
                 * Initialize transmit registers and start transmission
                 */
-               HME_XD_SETFLAGS(txd, ri,
+               HME_XD_SETFLAGS(sc->sc_pci, txd, ri,
                        HME_XD_OWN | HME_XD_SOP | HME_XD_EOP |
                        HME_XD_ENCODE_TSIZE(len));
 
@@ -895,7 +895,7 @@
                if (sc->sc_rb.rb_td_nbusy <= 0)
                        break;
 
-               txflags = HME_XD_GETFLAGS(sc->sc_rb.rb_txd, ri);
+               txflags = HME_XD_GETFLAGS(sc->sc_pci, sc->sc_rb.rb_txd, ri);
 
                if (txflags & HME_XD_OWN)
                        break;
@@ -938,7 +938,7 @@
         * Process all buffers with valid data.
         */
        for (;;) {
-               flags = HME_XD_GETFLAGS(xdr, ri);
+               flags = HME_XD_GETFLAGS(sc->sc_pci, xdr, ri);
                if (flags & HME_XD_OWN)
                        break;
 
@@ -951,7 +951,7 @@
                }
 
                /* This buffer can be used by the hardware again */
-               HME_XD_SETFLAGS(xdr, ri,
+               HME_XD_SETFLAGS(sc->sc_pci, xdr, ri,
                                HME_XD_OWN | HME_XD_ENCODE_RSIZE(_HME_BUFSZ));
 
                if (++ri == nrbuf)