[src/trunk]: src/sys/dev/pcmcia PR/30995: Wada Keiji: pcmcia interface can't ...

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

details:   https://anonhg.NetBSD.org/src/rev/b57380a16f60
branches:  trunk
changeset: 583631:b57380a16f60
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Aug 15 18:58:24 2005 +0000

description:
PR/30995: Wada Keiji: pcmcia interface can't use ne2000 compatible card
Call pcmcia_socket_settype sooner. I removed the later call, so the submitter
should test the final code before I close the PR.

diffstat:

 sys/dev/pcmcia/pcmcia.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 088c6c8c372e -r b57380a16f60 sys/dev/pcmcia/pcmcia.c
--- a/sys/dev/pcmcia/pcmcia.c   Mon Aug 15 18:51:33 2005 +0000
+++ b/sys/dev/pcmcia/pcmcia.c   Mon Aug 15 18:58:24 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcmcia.c,v 1.73 2005/02/27 00:27:43 perry Exp $        */
+/*     $NetBSD: pcmcia.c,v 1.74 2005/08/15 18:58:24 christos Exp $     */
 
 /*
  * Copyright (c) 2004 Charles M. Hannum.  All rights reserved.
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.73 2005/02/27 00:27:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.74 2005/08/15 18:58:24 christos Exp $");
 
 #include "opt_pcmciaverbose.h"
 
@@ -516,6 +516,7 @@
         * necessary.
         */
        pcmcia_socket_enable(&sc->dev);
+       pcmcia_socket_settype(&sc->dev, pf->cfe->iftype);
 
        if (pf->pf_flags & PFF_ENABLED) {
                /*
@@ -619,8 +620,6 @@
        }
 #endif
 
-       pcmcia_socket_settype(&sc->dev, pf->cfe->iftype);
-
 #ifdef IT8368E_LEGACY_MODE
        /* return to I/O mode */
        it8368_mode(pf, IT8368_IO_MODE, IT8368_WIDTH_16);