[src/trunk]: src/sys/dev/pcmcia Move the call to the xi_pcmcia_identify to be...

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

details:   https://anonhg.NetBSD.org/src/rev/d242eeed03d5
branches:  trunk
changeset: 515472:d242eeed03d5
user:      chris <chris%NetBSD.org@localhost>
date:      Wed Sep 26 09:01:30 2001 +0000

description:
Move the call to the xi_pcmcia_identify to before the first use of sc->sc_flags.
Doesn't fix my problem with auto negotiate, but it might help others.

diffstat:

 sys/dev/pcmcia/if_xi.c |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (41 lines):

diff -r e135387b1e2f -r d242eeed03d5 sys/dev/pcmcia/if_xi.c
--- a/sys/dev/pcmcia/if_xi.c    Wed Sep 26 07:54:19 2001 +0000
+++ b/sys/dev/pcmcia/if_xi.c    Wed Sep 26 09:01:30 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_xi.c,v 1.14 2001/07/07 16:51:47 thorpej Exp $ */
+/*     $NetBSD: if_xi.c,v 1.15 2001/09/26 09:01:30 chris Exp $ */
 /*     OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp   */
 
 /*
@@ -412,6 +412,15 @@
        }
        psc->sc_resource |= XI_RES_IO_MAP;
 
+       xpp = xi_pcmcia_identify(parent,pa);
+       if (xpp == NULL) {
+               printf(": unrecognised model\n");
+               return;
+       }
+       sc->sc_flags = xpp->xpp_flags;
+
+       printf(": %s\n", xpp->xpp_name);
+
        /*
         * Configuration as advised by DINGO documentation.
         * Dingo has some extra configuration registers in the CCR space.
@@ -453,15 +462,6 @@
                pcmcia_mem_free(psc->sc_pf, &pcmh);
        }
 
-       xpp = xi_pcmcia_identify(parent,pa);
-       if (xpp == NULL) {
-               printf(": unrecognised model\n");
-               return;
-       }
-       sc->sc_flags = xpp->xpp_flags;
-
-       printf(": %s\n", xpp->xpp_name);
-
        /*
         * Get the ethernet address from FUNCE/LAN_NID tuple.
         */