diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-04-06 21:58:13 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-04-06 21:58:13 +0000 |
| commit | dcdb02de2463143b14b8f74d6c53b536a87e1219 (patch) | |
| tree | 22f775e5b15562d147631ab6970524c9306514d1 /sys/dev/pcmcia | |
| parent | 1ffd2dd0212e07660e093e5bb0ea41c1d79ba481 (diff) | |
For PLX-based bridge cards, move printing of pcmcia card CIS strings
out of generic wi_attach() and into wi_pci_attach(). This means
we can't print the CIS info for embedded cards like the NCP130 but
since those don't have a "real" pcmcia card in them this is really
not a problem. Also check to see that there is actually a pcmcia
present and give and error if not. CIS magic number taken from the
Linux orinoco driver; there may be a better way to do this.
Diffstat (limited to 'sys/dev/pcmcia')
| -rw-r--r-- | sys/dev/pcmcia/if_wi_pcmcia.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c index eb371023df4..bd12a0e9d82 100644 --- a/sys/dev/pcmcia/if_wi_pcmcia.c +++ b/sys/dev/pcmcia/if_wi_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_pcmcia.c,v 1.25 2002/04/06 20:31:56 millert Exp $ */ +/* $OpenBSD: if_wi_pcmcia.c,v 1.26 2002/04/06 21:58:12 millert Exp $ */ /* $NetBSD: if_wi_pcmcia.c,v 1.14 2001/11/26 04:34:56 ichiro Exp $ */ /* @@ -76,7 +76,7 @@ int wi_pcmcia_detach(struct device *, int); int wi_pcmcia_activate(struct device *, enum devact); int wi_intr(void *); -int wi_attach(struct wi_softc *, int); +int wi_attach(struct wi_softc *); void wi_init(struct wi_softc *); void wi_stop(struct wi_softc *); @@ -358,7 +358,7 @@ wi_pcmcia_attach(parent, self, aux) goto bad; } - wi_attach(sc, 0); + wi_attach(sc); return; bad: |