diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2002-07-09 11:00:28 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2002-07-09 11:00:28 +0000 |
| commit | c3944c12b2895e27f88009946d490d79fdb8fb73 (patch) | |
| tree | a1a929b052953feb723470e57345a5af6c613115 /sys/dev | |
| parent | 850cce041528fc75041d5d6d84216d91a9da94f1 (diff) | |
move common declarations to if_wivar.h; mickey@ and millert@ ok.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/if_wivar.h | 9 | ||||
| -rw-r--r-- | sys/dev/pci/if_wi_pci.c | 4 | ||||
| -rw-r--r-- | sys/dev/pcmcia/if_wi_pcmcia.c | 8 |
3 files changed, 9 insertions, 12 deletions
diff --git a/sys/dev/ic/if_wivar.h b/sys/dev/ic/if_wivar.h index f9d5ab3d4f7..25062908825 100644 --- a/sys/dev/ic/if_wivar.h +++ b/sys/dev/ic/if_wivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wivar.h,v 1.17 2002/06/22 22:10:38 fgsch Exp $ */ +/* $OpenBSD: if_wivar.h,v 1.18 2002/07/09 11:00:27 fgsch Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -129,4 +129,9 @@ struct wi_softc { #define WI_PRT_FMT "%s" #define WI_PRT_ARG(sc) (sc)->sc_dev.dv_xname -int wi_mgmt_xmit(struct wi_softc *, caddr_t, int); +int wi_attach(struct wi_softc *); +int wi_intr(void *); +void wi_init(struct wi_softc *); +void wi_stop(struct wi_softc *); +void wi_cor_reset(struct wi_softc *); +int wi_mgmt_xmit(struct wi_softc *, caddr_t, int); diff --git a/sys/dev/pci/if_wi_pci.c b/sys/dev/pci/if_wi_pci.c index 53e59222c1a..c55c70aec50 100644 --- a/sys/dev/pci/if_wi_pci.c +++ b/sys/dev/pci/if_wi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_pci.c,v 1.26 2002/04/15 21:19:52 millert Exp $ */ +/* $OpenBSD: if_wi_pci.c,v 1.27 2002/07/09 11:00:27 fgsch Exp $ */ /* * Copyright (c) 2001, 2002 Todd C. Miller <Todd.Miller@courtesan.com> @@ -99,8 +99,6 @@ const struct wi_pci_product *wi_pci_lookup(struct pci_attach_args *pa); int wi_pci_match(struct device *, void *, void *); void wi_pci_attach(struct device *, struct device *, void *); int wi_pci_handle_cis(struct wi_softc *); -int wi_intr(void *); -int wi_attach(struct wi_softc *); struct cfattach wi_pci_ca = { sizeof (struct wi_softc), wi_pci_match, wi_pci_attach diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c index 8ef6965d25e..525661c309e 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.37 2002/07/01 13:31:06 fgsch Exp $ */ +/* $OpenBSD: if_wi_pcmcia.c,v 1.38 2002/07/09 11:00:27 fgsch Exp $ */ /* $NetBSD: if_wi_pcmcia.c,v 1.14 2001/11/26 04:34:56 ichiro Exp $ */ /* @@ -75,12 +75,6 @@ void wi_pcmcia_attach(struct device *, struct device *, void *); 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 *); -void wi_cor_reset(struct wi_softc *); -void wi_init(struct wi_softc *); -void wi_stop(struct wi_softc *); - struct wi_pcmcia_softc { struct wi_softc sc_wi; |