[src/trunk]: src/sys/dev/cardbus Reverse the mapping of the control/status re...

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

details:   https://anonhg.NetBSD.org/src/rev/55a7107d0846
branches:  trunk
changeset: 483551:55a7107d0846
user:      veego <veego%NetBSD.org@localhost>
date:      Sun Mar 12 17:05:23 2000 +0000

description:
Reverse the mapping of the control/status registers. Use I/O before MEM.
My card works now on a TI1220 chipset. Approved by Jason.

diffstat:

 sys/dev/cardbus/if_fxp_cardbus.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (36 lines):

diff -r 3e6a104faafd -r 55a7107d0846 sys/dev/cardbus/if_fxp_cardbus.c
--- a/sys/dev/cardbus/if_fxp_cardbus.c  Sun Mar 12 16:56:42 2000 +0000
+++ b/sys/dev/cardbus/if_fxp_cardbus.c  Sun Mar 12 17:05:23 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_fxp_cardbus.c,v 1.9 2000/03/10 07:11:47 thorpej Exp $       */
+/*     $NetBSD: if_fxp_cardbus.c,v 1.10 2000/03/12 17:05:23 veego Exp $        */
 
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -156,19 +156,19 @@
        /*
          * Map control/status registers.
          */
-       if (Cardbus_mapreg_map(csc->ct, CARDBUS_BASE0_REG,
+       if (Cardbus_mapreg_map(csc->ct, CARDBUS_BASE1_REG,
+           PCI_MAPREG_TYPE_IO, 0, &iot, &ioh, &adr, &size) == 0) {
+               csc->base1_reg = adr | 1;
+               sc->sc_st = iot;
+               sc->sc_sh = ioh;
+               csc->size = size;
+       } else if (Cardbus_mapreg_map(csc->ct, CARDBUS_BASE0_REG,
            PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT,
            0, &memt, &memh, &adr, &size) == 0) {
                csc->base0_reg = adr;
                sc->sc_st = memt;
                sc->sc_sh = memh;
                csc->size = size;
-       } else if (Cardbus_mapreg_map(csc->ct, CARDBUS_BASE1_REG,
-           PCI_MAPREG_TYPE_IO, 0, &iot, &ioh, &adr, &size) == 0) {
-               csc->base1_reg = adr | 1;
-               sc->sc_st = iot;
-               sc->sc_sh = ioh;
-               csc->size = size;
        } else
                panic("%s: failed to allocate mem and io space", __func__);