diff options
| -rw-r--r-- | sys/dev/usb/if_ral.c | 45 | ||||
| -rw-r--r-- | sys/dev/usb/if_rum.c | 48 | ||||
| -rw-r--r-- | sys/dev/usb/if_uath.c | 40 | ||||
| -rw-r--r-- | sys/dev/usb/ueagle.c | 52 |
4 files changed, 80 insertions, 105 deletions
diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c index 9dd4ca16619..c47d2b81bf2 100644 --- a/sys/dev/usb/if_ral.c +++ b/sys/dev/usb/if_ral.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ral.c,v 1.93 2007/06/05 08:43:55 mbalmer Exp $ */ +/* $OpenBSD: if_ral.c,v 1.94 2007/06/09 08:52:10 damien Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -116,40 +116,34 @@ void ural_free_rx_list(struct ural_softc *); int ural_media_change(struct ifnet *); void ural_next_scan(void *); void ural_task(void *); -int ural_newstate(struct ieee80211com *, - enum ieee80211_state, int); -void ural_txeof(usbd_xfer_handle, usbd_private_handle, - usbd_status); -void ural_rxeof(usbd_xfer_handle, usbd_private_handle, - usbd_status); +int ural_newstate(struct ieee80211com *, enum ieee80211_state, + int); +void ural_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status); +void ural_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status); #if NBPFILTER > 0 uint8_t ural_rxrate(const struct ural_rx_desc *); #endif int ural_ack_rate(struct ieee80211com *, int); -uint16_t ural_txtime(int, int, uint32_t); +uint16_t ural_txtime(int, int, uint32_t); uint8_t ural_plcp_signal(int); -void ural_setup_tx_desc(struct ural_softc *, - struct ural_tx_desc *, uint32_t, int, int); +void ural_setup_tx_desc(struct ural_softc *, struct ural_tx_desc *, + uint32_t, int, int); int ural_tx_bcn(struct ural_softc *, struct mbuf *, - struct ieee80211_node *); + struct ieee80211_node *); int ural_tx_data(struct ural_softc *, struct mbuf *, - struct ieee80211_node *); + struct ieee80211_node *); void ural_start(struct ifnet *); void ural_watchdog(struct ifnet *); int ural_ioctl(struct ifnet *, u_long, caddr_t); -void ural_eeprom_read(struct ural_softc *, uint16_t, void *, - int); -uint16_t ural_read(struct ural_softc *, uint16_t); -void ural_read_multi(struct ural_softc *, uint16_t, void *, - int); +void ural_eeprom_read(struct ural_softc *, uint16_t, void *, int); +uint16_t ural_read(struct ural_softc *, uint16_t); +void ural_read_multi(struct ural_softc *, uint16_t, void *, int); void ural_write(struct ural_softc *, uint16_t, uint16_t); -void ural_write_multi(struct ural_softc *, uint16_t, void *, - int); +void ural_write_multi(struct ural_softc *, uint16_t, void *, int); void ural_bbp_write(struct ural_softc *, uint8_t, uint8_t); uint8_t ural_bbp_read(struct ural_softc *, uint8_t); void ural_rf_write(struct ural_softc *, uint8_t, uint32_t); -void ural_set_chan(struct ural_softc *, - struct ieee80211_channel *); +void ural_set_chan(struct ural_softc *, struct ieee80211_channel *); void ural_disable_rf_tune(struct ural_softc *); void ural_enable_tsf_sync(struct ural_softc *); void ural_update_slot(struct ural_softc *); @@ -165,13 +159,12 @@ void ural_set_txantenna(struct ural_softc *, int); void ural_set_rxantenna(struct ural_softc *, int); int ural_init(struct ifnet *); void ural_stop(struct ifnet *, int); -void ural_newassoc(struct ieee80211com *, - struct ieee80211_node *, int); -void ural_amrr_start(struct ural_softc *, - struct ieee80211_node *); +void ural_newassoc(struct ieee80211com *, struct ieee80211_node *, + int); +void ural_amrr_start(struct ural_softc *, struct ieee80211_node *); void ural_amrr_timeout(void *); void ural_amrr_update(usbd_xfer_handle, usbd_private_handle, - usbd_status status); + usbd_status status); static const struct { uint16_t reg; diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c index c7648134309..bc3a72c8bee 100644 --- a/sys/dev/usb/if_rum.c +++ b/sys/dev/usb/if_rum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rum.c,v 1.58 2007/06/05 08:43:55 mbalmer Exp $ */ +/* $OpenBSD: if_rum.c,v 1.59 2007/06/09 08:52:10 damien Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr> @@ -134,34 +134,27 @@ void rum_free_rx_list(struct rum_softc *); int rum_media_change(struct ifnet *); void rum_next_scan(void *); void rum_task(void *); -int rum_newstate(struct ieee80211com *, - enum ieee80211_state, int); -void rum_txeof(usbd_xfer_handle, usbd_private_handle, - usbd_status); -void rum_rxeof(usbd_xfer_handle, usbd_private_handle, - usbd_status); +int rum_newstate(struct ieee80211com *, enum ieee80211_state, int); +void rum_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status); +void rum_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status); #if NBPFILTER > 0 uint8_t rum_rxrate(const struct rum_rx_desc *); #endif int rum_ack_rate(struct ieee80211com *, int); -uint16_t rum_txtime(int, int, uint32_t); +uint16_t rum_txtime(int, int, uint32_t); uint8_t rum_plcp_signal(int); -void rum_setup_tx_desc(struct rum_softc *, - struct rum_tx_desc *, uint32_t, uint16_t, int, - int); +void rum_setup_tx_desc(struct rum_softc *, struct rum_tx_desc *, + uint32_t, uint16_t, int, int); int rum_tx_data(struct rum_softc *, struct mbuf *, - struct ieee80211_node *); + struct ieee80211_node *); void rum_start(struct ifnet *); void rum_watchdog(struct ifnet *); int rum_ioctl(struct ifnet *, u_long, caddr_t); -void rum_eeprom_read(struct rum_softc *, uint16_t, void *, - int); -uint32_t rum_read(struct rum_softc *, uint16_t); -void rum_read_multi(struct rum_softc *, uint16_t, void *, - int); +void rum_eeprom_read(struct rum_softc *, uint16_t, void *, int); +uint32_t rum_read(struct rum_softc *, uint16_t); +void rum_read_multi(struct rum_softc *, uint16_t, void *, int); void rum_write(struct rum_softc *, uint16_t, uint32_t); -void rum_write_multi(struct rum_softc *, uint16_t, void *, - size_t); +void rum_write_multi(struct rum_softc *, uint16_t, void *, size_t); void rum_bbp_write(struct rum_softc *, uint8_t, uint8_t); uint8_t rum_bbp_read(struct rum_softc *, uint8_t); void rum_rf_write(struct rum_softc *, uint8_t, uint32_t); @@ -170,9 +163,8 @@ void rum_enable_mrr(struct rum_softc *); void rum_set_txpreamble(struct rum_softc *); void rum_set_basicrates(struct rum_softc *); void rum_select_band(struct rum_softc *, - struct ieee80211_channel *); -void rum_set_chan(struct rum_softc *, - struct ieee80211_channel *); + struct ieee80211_channel *); +void rum_set_chan(struct rum_softc *, struct ieee80211_channel *); void rum_enable_tsf_sync(struct rum_softc *); void rum_update_slot(struct rum_softc *); void rum_set_bssid(struct rum_softc *, const uint8_t *); @@ -183,16 +175,14 @@ void rum_read_eeprom(struct rum_softc *); int rum_bbp_init(struct rum_softc *); int rum_init(struct ifnet *); void rum_stop(struct ifnet *, int); -int rum_load_microcode(struct rum_softc *, const u_char *, - size_t); +int rum_load_microcode(struct rum_softc *, const u_char *, size_t); int rum_prepare_beacon(struct rum_softc *); -void rum_newassoc(struct ieee80211com *, - struct ieee80211_node *, int); -void rum_amrr_start(struct rum_softc *, - struct ieee80211_node *); +void rum_newassoc(struct ieee80211com *, struct ieee80211_node *, + int); +void rum_amrr_start(struct rum_softc *, struct ieee80211_node *); void rum_amrr_timeout(void *); void rum_amrr_update(usbd_xfer_handle, usbd_private_handle, - usbd_status status); + usbd_status status); static const struct { uint32_t reg; diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c index 1e38e78d67e..3304c5f8e5a 100644 --- a/sys/dev/usb/if_uath.c +++ b/sys/dev/usb/if_uath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_uath.c,v 1.20 2007/06/05 08:43:55 mbalmer Exp $ */ +/* $OpenBSD: if_uath.c,v 1.21 2007/06/09 08:52:10 damien Exp $ */ /*- * Copyright (c) 2006 @@ -147,31 +147,25 @@ int uath_media_change(struct ifnet *); void uath_stat(void *); void uath_next_scan(void *); void uath_task(void *); -int uath_newstate(struct ieee80211com *, enum ieee80211_state, - int); +int uath_newstate(struct ieee80211com *, enum ieee80211_state, int); #ifdef UATH_DEBUG void uath_dump_cmd(const uint8_t *, int, char); #endif -int uath_cmd(struct uath_softc *, uint32_t, const void *, int, - void *, int); -int uath_cmd_write(struct uath_softc *, uint32_t, const void *, - int, int); -int uath_cmd_read(struct uath_softc *, uint32_t, const void *, - int, void *, int); +int uath_cmd(struct uath_softc *, uint32_t, const void *, int, void *, + int); +int uath_cmd_write(struct uath_softc *, uint32_t, const void *, int, int); +int uath_cmd_read(struct uath_softc *, uint32_t, const void *, int, void *, + int); int uath_write_reg(struct uath_softc *, uint32_t, uint32_t); -int uath_write_multi(struct uath_softc *, uint32_t, const void *, - int); +int uath_write_multi(struct uath_softc *, uint32_t, const void *, int); int uath_read_reg(struct uath_softc *, uint32_t, uint32_t *); int uath_read_eeprom(struct uath_softc *, uint32_t, void *); -void uath_cmd_rxeof(usbd_xfer_handle, usbd_private_handle, - usbd_status); -void uath_data_rxeof(usbd_xfer_handle, usbd_private_handle, - usbd_status); -void uath_data_txeof(usbd_xfer_handle, usbd_private_handle, - usbd_status); +void uath_cmd_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status); +void uath_data_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status); +void uath_data_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status); int uath_tx_null(struct uath_softc *); int uath_tx_data(struct uath_softc *, struct mbuf *, - struct ieee80211_node *); + struct ieee80211_node *); void uath_start(struct ifnet *); void uath_watchdog(struct ifnet *); int uath_ioctl(struct ifnet *, u_long, caddr_t); @@ -180,15 +174,13 @@ int uath_reset(struct uath_softc *); int uath_reset_tx_queues(struct uath_softc *); int uath_wme_init(struct uath_softc *); int uath_set_chan(struct uath_softc *, struct ieee80211_channel *); -int uath_set_key(struct uath_softc *, - const struct ieee80211_wepkey *, int); +int uath_set_key(struct uath_softc *, const struct ieee80211_wepkey *, + int); int uath_set_keys(struct uath_softc *); -int uath_set_rates(struct uath_softc *, - const struct ieee80211_rateset *); +int uath_set_rates(struct uath_softc *, const struct ieee80211_rateset *); int uath_set_rxfilter(struct uath_softc *, uint32_t, uint32_t); int uath_set_led(struct uath_softc *, int, int); -int uath_switch_channel(struct uath_softc *, - struct ieee80211_channel *); +int uath_switch_channel(struct uath_softc *, struct ieee80211_channel *); int uath_init(struct ifnet *); void uath_stop(struct ifnet *, int); int uath_loadfirmware(struct uath_softc *, const u_char *, int); diff --git a/sys/dev/usb/ueagle.c b/sys/dev/usb/ueagle.c index bd0014966e5..e7eb097c896 100644 --- a/sys/dev/usb/ueagle.c +++ b/sys/dev/usb/ueagle.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ueagle.c,v 1.15 2007/06/05 08:43:55 mbalmer Exp $ */ +/* $OpenBSD: ueagle.c,v 1.16 2007/06/09 08:52:10 damien Exp $ */ /*- * Copyright (c) 2003-2006 @@ -89,41 +89,41 @@ static const struct ueagle_type { #define ueagle_lookup(v, p) \ ((struct ueagle_type *)usb_lookup(ueagle_devs, v, p)) -void ueagle_attachhook(void *); -int ueagle_getesi(struct ueagle_softc *, uint8_t *); -void ueagle_loadpage(void *); -void ueagle_request(struct ueagle_softc *, uint16_t, uint16_t, +void ueagle_attachhook(void *); +int ueagle_getesi(struct ueagle_softc *, uint8_t *); +void ueagle_loadpage(void *); +void ueagle_request(struct ueagle_softc *, uint16_t, uint16_t, void *, int); #ifdef USB_DEBUG -void ueagle_dump_cmv(struct ueagle_softc *, struct ueagle_cmv *); +void ueagle_dump_cmv(struct ueagle_softc *, struct ueagle_cmv *); #endif -int ueagle_cr(struct ueagle_softc *, uint32_t, uint16_t, +int ueagle_cr(struct ueagle_softc *, uint32_t, uint16_t, uint32_t *); -int ueagle_cw(struct ueagle_softc *, uint32_t, uint16_t, uint32_t); -int ueagle_stat(struct ueagle_softc *); -void ueagle_stat_thread(void *); -int ueagle_boot(struct ueagle_softc *); -void ueagle_swap_intr(struct ueagle_softc *, struct ueagle_swap *); -void ueagle_cmv_intr(struct ueagle_softc *, struct ueagle_cmv *); -void ueagle_intr(usbd_xfer_handle, usbd_private_handle, +int ueagle_cw(struct ueagle_softc *, uint32_t, uint16_t, uint32_t); +int ueagle_stat(struct ueagle_softc *); +void ueagle_stat_thread(void *); +int ueagle_boot(struct ueagle_softc *); +void ueagle_swap_intr(struct ueagle_softc *, struct ueagle_swap *); +void ueagle_cmv_intr(struct ueagle_softc *, struct ueagle_cmv *); +void ueagle_intr(usbd_xfer_handle, usbd_private_handle, usbd_status); uint32_t ueagle_crc_update(uint32_t, uint8_t *, int); -void ueagle_push_cell(struct ueagle_softc *, uint8_t *); -void ueagle_rxeof(usbd_xfer_handle, usbd_private_handle, +void ueagle_push_cell(struct ueagle_softc *, uint8_t *); +void ueagle_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status); -void ueagle_txeof(usbd_xfer_handle, usbd_private_handle, +void ueagle_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status); -int ueagle_encap(struct ueagle_softc *, struct mbuf *); -void ueagle_start(struct ifnet *); -int ueagle_open_vcc(struct ueagle_softc *, +int ueagle_encap(struct ueagle_softc *, struct mbuf *); +void ueagle_start(struct ifnet *); +int ueagle_open_vcc(struct ueagle_softc *, struct atm_pseudoioctl *); -int ueagle_close_vcc(struct ueagle_softc *, +int ueagle_close_vcc(struct ueagle_softc *, struct atm_pseudoioctl *); -int ueagle_ioctl(struct ifnet *, u_long, caddr_t); -int ueagle_open_pipes(struct ueagle_softc *); -void ueagle_close_pipes(struct ueagle_softc *); -int ueagle_init(struct ifnet *); -void ueagle_stop(struct ifnet *, int); +int ueagle_ioctl(struct ifnet *, u_long, caddr_t); +int ueagle_open_pipes(struct ueagle_softc *); +void ueagle_close_pipes(struct ueagle_softc *); +int ueagle_init(struct ifnet *); +void ueagle_stop(struct ifnet *, int); USB_DECLARE_DRIVER(ueagle); |