diff options
| -rw-r--r-- | sys/dev/cardbus/if_bcw_cardbus.c | 17 | ||||
| -rw-r--r-- | sys/dev/ic/bcw.c | 18 |
2 files changed, 16 insertions, 19 deletions
diff --git a/sys/dev/cardbus/if_bcw_cardbus.c b/sys/dev/cardbus/if_bcw_cardbus.c index f3e85f85b09..bf650ab976c 100644 --- a/sys/dev/cardbus/if_bcw_cardbus.c +++ b/sys/dev/cardbus/if_bcw_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bcw_cardbus.c,v 1.1 2006/11/22 15:12:50 mglocker Exp $ */ +/* $OpenBSD: if_bcw_cardbus.c,v 1.2 2006/11/22 22:20:34 damien Exp $ */ /* * Copyright (c) 2006 Jon Simola <jsimola@gmail.com> @@ -57,14 +57,13 @@ struct bcw_cardbus_softc { int sc_intrline; }; -int bcw_cardbus_match(struct device *parent, void *match, void *aux); -void bcw_cardbus_attach(struct device *parent, struct device *self, - void *aux); -int bcw_cardbus_detach(struct device *self, int flags); -void bcw_cardbus_power(struct bcw_softc *sc, int); -void bcw_cardbus_setup(struct bcw_cardbus_softc *csc); -int bcw_cardbus_enable(struct bcw_softc *sc); -void bcw_cardbus_disable(struct bcw_softc *sc); +int bcw_cardbus_match(struct device *, void *, void *); +void bcw_cardbus_attach(struct device *, struct device *, void *); +int bcw_cardbus_detach(struct device *, int); +void bcw_cardbus_power(struct bcw_softc *, int); +void bcw_cardbus_setup(struct bcw_cardbus_softc *); +int bcw_cardbus_enable(struct bcw_softc *); +void bcw_cardbus_disable(struct bcw_softc *); struct cfattach bcw_cardbus_ca = { sizeof (struct bcw_cardbus_softc), bcw_cardbus_match, diff --git a/sys/dev/ic/bcw.c b/sys/dev/ic/bcw.c index 4567b0d768c..dd50a7055fb 100644 --- a/sys/dev/ic/bcw.c +++ b/sys/dev/ic/bcw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bcw.c,v 1.4 2006/11/22 15:12:50 mglocker Exp $ */ +/* $OpenBSD: bcw.c,v 1.5 2006/11/22 22:20:34 damien Exp $ */ /* * Copyright (c) 2006 Jon Simola <jsimola@gmail.com> @@ -91,21 +91,19 @@ void bcw_set_filter(struct ifnet *); void bcw_tick(void *); int bcw_ioctl(struct ifnet *, u_long, caddr_t); -int bcw_alloc_rx_ring(struct bcw_softc *sc, struct bcw_rx_ring *ring, - int count); -void bcw_reset_rx_ring(struct bcw_softc *sc, struct bcw_rx_ring *ring); -void bcw_free_rx_ring(struct bcw_softc *sc, struct bcw_rx_ring *ring); -int bcw_alloc_tx_ring(struct bcw_softc *sc, struct bcw_tx_ring *ring, - int count); -void bcw_reset_tx_ring(struct bcw_softc *sc, struct bcw_tx_ring *ring); -void bcw_free_tx_ring(struct bcw_softc *sc, struct bcw_tx_ring *ring); +int bcw_alloc_rx_ring(struct bcw_softc *, struct bcw_rx_ring *, int); +void bcw_reset_rx_ring(struct bcw_softc *, struct bcw_rx_ring *); +void bcw_free_rx_ring(struct bcw_softc *, struct bcw_rx_ring *); +int bcw_alloc_tx_ring(struct bcw_softc *, struct bcw_tx_ring *, int); +void bcw_reset_tx_ring(struct bcw_softc *, struct bcw_tx_ring *); +void bcw_free_tx_ring(struct bcw_softc *, struct bcw_tx_ring *); /* 80211 functions copied from iwi */ int bcw_newstate(struct ieee80211com *, enum ieee80211_state, int); int bcw_media_change(struct ifnet *); void bcw_media_status(struct ifnet *, struct ifmediareq *); /* fashionably new functions */ -int bcw_validatechipaccess(struct bcw_softc *ifp); +int bcw_validatechipaccess(struct bcw_softc *); struct cfdriver bcw_cd = { NULL, "bcw", DV_IFNET |