p54: refactoring

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / p54 / p54.h

diff --git a/drivers/net/wireless/p54/p54.h b/drivers/net/wireless/p54/p54.h
index 1d0704fe146fb72ed0691271a7bd8491096481b2..d2dbb9e15d97bcd607691ca51c180f5108fd500c 100644 (file)
--- a/drivers/net/wireless/p54/p54.h
+++ b/drivers/net/wireless/p54/p54.h
@@ -14,17 +14,17 @@
  * published by the Free Software Foundation.
  */
 
-enum control_frame_types {
-       P54_CONTROL_TYPE_FILTER_SET = 0,
-       P54_CONTROL_TYPE_CHANNEL_CHANGE,
-       P54_CONTROL_TYPE_FREQDONE,
+enum p54_control_frame_types {
+       P54_CONTROL_TYPE_SETUP = 0,
+       P54_CONTROL_TYPE_SCAN,
+       P54_CONTROL_TYPE_TRAP,
        P54_CONTROL_TYPE_DCFINIT,
-       P54_CONTROL_TYPE_ENCRYPTION,
+       P54_CONTROL_TYPE_RX_KEYCACHE,
        P54_CONTROL_TYPE_TIM,
-       P54_CONTROL_TYPE_POWERMGT,
-       P54_CONTROL_TYPE_FREEQUEUE,
+       P54_CONTROL_TYPE_PSM,
+       P54_CONTROL_TYPE_TXCANCEL,
        P54_CONTROL_TYPE_TXDONE,
-       P54_CONTROL_TYPE_PING,
+       P54_CONTROL_TYPE_BURST,
        P54_CONTROL_TYPE_STAT_READBACK,
        P54_CONTROL_TYPE_BBP,
        P54_CONTROL_TYPE_EEPROM_READBACK,
@@ -37,18 +37,30 @@ enum control_frame_types {
        P54_CONTROL_TYPE_XBOW_SYNTH_CFG,
        P54_CONTROL_TYPE_CCE_QUIET,
        P54_CONTROL_TYPE_PSM_STA_UNLOCK,
+       P54_CONTROL_TYPE_PCS,
+       P54_CONTROL_TYPE_BT_BALANCER = 28,
+       P54_CONTROL_TYPE_GROUP_ADDRESS_TABLE = 30,
+       P54_CONTROL_TYPE_ARPTABLE = 31,
+       P54_CONTROL_TYPE_BT_OPTIONS = 35
 };
 
-struct p54_control_hdr {
-       __le16 magic1;
+struct p54_hdr {
+       __le16 flags;
        __le16 len;
        __le32 req_id;
-       __le16 type;    /* enum control_frame_types */
-       u8 retry1;
-       u8 retry2;
+       __le16 type;    /* enum p54_control_frame_types */
+       u8 rts_tries;
+       u8 tries;
        u8 data[0];
 } __attribute__ ((packed));
 
+struct p54_edcf_queue_param {
+       __le16 aifs;
+       __le16 cwmin;
+       __le16 cwmax;
+       __le16 txop;
+} __attribute__ ((packed));
+
 #define EEPROM_READBACK_LEN 0x3fc
 
 #define ISL38XX_DEV_FIRMWARE_ADDR 0x20000
@@ -62,46 +74,51 @@ struct p54_common {
        u32 rx_start;
        u32 rx_end;
        struct sk_buff_head tx_queue;
-       void (*tx)(struct ieee80211_hw *dev, struct p54_control_hdr *data,
-                  size_t len, int free_on_tx);
+       void (*tx)(struct ieee80211_hw *dev, struct sk_buff *skb,
+                  int free_on_tx);
        int (*open)(struct ieee80211_hw *dev);
        void (*stop)(struct ieee80211_hw *dev);
        int mode;
-       u16 seqno;
        u16 rx_mtu;
        u8 headroom;
        u8 tailroom;
        struct mutex conf_mutex;
        u8 mac_addr[ETH_ALEN];
        u8 bssid[ETH_ALEN];
-       __le16 filter_type;
        struct pda_iq_autocal_entry *iq_autocal;
        unsigned int iq_autocal_len;
        struct pda_channel_output_limit *output_limit;
        unsigned int output_limit_len;
        struct pda_pa_curve_data *curve_data;
        unsigned int filter_flags;
+       bool use_short_slot;
        u16 rxhw;
        u8 version;
-       u8 rx_antenna;
        unsigned int tx_hdr_len;
-       void *cached_vdcf;
        unsigned int fw_var;
        unsigned int fw_interface;
        unsigned int output_power;
        u32 tsf_low32;
        u32 tsf_high32;
+       u64 basic_rate_mask;
+       u16 wakeup_timer;
+       u16 aid;
        struct ieee80211_tx_queue_stats tx_stats[8];
+       struct p54_edcf_queue_param qos_params[8];
        struct ieee80211_low_level_stats stats;
        struct timer_list stats_timer;
        struct completion stats_comp;
-       void *cached_stats;
+       struct sk_buff *cached_stats;
+       struct sk_buff *cached_beacon;
        int noise;
        void *eeprom;
        struct completion eeprom_comp;
+       u8 privacy_caps;
+       u8 rx_keycache_size;
 };
 
 int p54_rx(struct ieee80211_hw *dev, struct sk_buff *skb);
+void p54_free_skb(struct ieee80211_hw *dev, struct sk_buff *skb);
 int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw);
 int p54_read_eeprom(struct ieee80211_hw *dev);
 struct ieee80211_hw *p54_init_common(size_t priv_data_len);