diff options
Diffstat (limited to 'sys/dev/usb/if_ralvar.h')
| -rw-r--r-- | sys/dev/usb/if_ralvar.h | 85 |
1 files changed, 39 insertions, 46 deletions
diff --git a/sys/dev/usb/if_ralvar.h b/sys/dev/usb/if_ralvar.h index ae72dd050dd..28df058f44f 100644 --- a/sys/dev/usb/if_ralvar.h +++ b/sys/dev/usb/if_ralvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ralvar.h,v 1.5 2006/03/21 11:19:22 pedro Exp $ */ +/* $OpenBSD: if_ralvar.h,v 1.6 2006/06/17 19:07:19 damien Exp $ */ /*- * Copyright (c) 2005 @@ -69,79 +69,72 @@ struct ural_rx_data { struct mbuf *m; }; -struct ural_amrr { - int txcnt; - int retrycnt; - int success; - int success_threshold; - int recovery; -}; - struct ural_softc { - USBBASEDEVICE sc_dev; - struct ieee80211com sc_ic; - int (*sc_newstate)(struct ieee80211com *, - enum ieee80211_state, int); + USBBASEDEVICE sc_dev; + struct ieee80211com sc_ic; + int (*sc_newstate)(struct ieee80211com *, + enum ieee80211_state, int); - usbd_device_handle sc_udev; - usbd_interface_handle sc_iface; + usbd_device_handle sc_udev; + usbd_interface_handle sc_iface; - int sc_rx_no; - int sc_tx_no; + int sc_rx_no; + int sc_tx_no; - uint32_t asic_rev; - uint16_t macbbp_rev; - uint8_t rf_rev; + uint32_t asic_rev; + uint16_t macbbp_rev; + uint8_t rf_rev; - usbd_xfer_handle amrr_xfer; + usbd_xfer_handle amrr_xfer; - usbd_pipe_handle sc_rx_pipeh; - usbd_pipe_handle sc_tx_pipeh; + usbd_pipe_handle sc_rx_pipeh; + usbd_pipe_handle sc_tx_pipeh; - enum ieee80211_state sc_state; - struct usb_task sc_task; + enum ieee80211_state sc_state; + struct usb_task sc_task; - struct ural_amrr amrr; + struct ieee80211_amrr amrr; + struct ieee80211_amrr_node amn; - struct ural_rx_data rx_data[RAL_RX_LIST_COUNT]; - struct ural_tx_data tx_data[RAL_TX_LIST_COUNT]; - int tx_queued; + struct ural_rx_data rx_data[RAL_RX_LIST_COUNT]; + struct ural_tx_data tx_data[RAL_TX_LIST_COUNT]; + int tx_queued; - struct timeout scan_ch; - struct timeout amrr_ch; + struct timeout scan_ch; + struct timeout amrr_ch; - int sc_tx_timer; + int sc_tx_timer; - uint16_t sta[11]; - uint32_t rf_regs[4]; - uint8_t txpow[14]; + uint16_t sta[11]; + uint32_t rf_regs[4]; + uint8_t txpow[14]; struct { uint8_t val; uint8_t reg; - } __packed bbp_prom[16]; + } __packed bbp_prom[16]; - int led_mode; - int hw_radio; - int rx_ant; - int tx_ant; - int nb_ant; + int led_mode; + int hw_radio; + int rx_ant; + int tx_ant; + int nb_ant; #if NBPFILTER > 0 - caddr_t sc_drvbpf; + caddr_t sc_drvbpf; union { struct ural_rx_radiotap_header th; uint8_t pad[64]; - } sc_rxtapu; + } sc_rxtapu; #define sc_rxtap sc_rxtapu.th - int sc_rxtap_len; + int sc_rxtap_len; union { struct ural_tx_radiotap_header th; uint8_t pad[64]; - } sc_txtapu; + } sc_txtapu; #define sc_txtap sc_txtapu.th - int sc_txtap_len; + int sc_txtap_len; #endif }; |