orinoco: Change set_tkip to use orinoco_private instead of hermes_t

[safe/jmp/linux-2.6] / drivers / net / wireless / p54 / p54.h

diff --git a/drivers/net/wireless/p54/p54.h b/drivers/net/wireless/p54/p54.h
index b585ff6..db3df94 100644 (file)
--- a/drivers/net/wireless/p54/p54.h
+++ b/drivers/net/wireless/p54/p54.h
@@ -14,6 +14,10 @@
  * published by the Free Software Foundation.
  */
 
+#ifdef CONFIG_P54_LEDS
+#include <linux/leds.h>
+#endif /* CONFIG_P54_LEDS */
+
 enum p54_control_frame_types {
        P54_CONTROL_TYPE_SETUP = 0,
        P54_CONTROL_TYPE_SCAN,
@@ -44,6 +48,21 @@ enum p54_control_frame_types {
        P54_CONTROL_TYPE_BT_OPTIONS = 35
 };
 
+/* provide 16 bytes for the transport back-end */
+#define P54_TX_INFO_DATA_SIZE          16
+
+/* stored in ieee80211_tx_info's rate_driver_data */
+struct p54_tx_info {
+       u32 start_addr;
+       u32 end_addr;
+       void *data[P54_TX_INFO_DATA_SIZE / sizeof(void *)];
+};
+
+#define P54_MAX_CTRL_FRAME_LEN         0x1000
+
+#define P54_HDR_FLAG_CONTROL           BIT(15)
+#define P54_HDR_FLAG_CONTROL_OPSET     (BIT(15) + BIT(0))
+
 struct p54_hdr {
        __le16 flags;
        __le16 len;
@@ -54,6 +73,10 @@ struct p54_hdr {
        u8 data[0];
 } __attribute__ ((packed));
 
+#define FREE_AFTER_TX(skb)                                             \
+       ((((struct p54_hdr *) ((struct sk_buff *) skb)->data)->         \
+       flags) == cpu_to_le16(P54_HDR_FLAG_CONTROL_OPSET))
+
 struct p54_edcf_queue_param {
        __le16 aifs;
        __le16 cwmin;
@@ -61,6 +84,21 @@ struct p54_edcf_queue_param {
        __le16 txop;
 } __attribute__ ((packed));
 
+struct p54_rssi_linear_approximation {
+       s16 mul;
+       s16 add;
+       s16 longbow_unkn;
+       s16 longbow_unk2;
+};
+
+struct p54_cal_database {
+       size_t entries;
+       size_t entry_size;
+       size_t offset;
+       size_t len;
+       u8 data[0];
+};
+
 #define EEPROM_READBACK_LEN 0x3fc
 
 #define ISL38XX_DEV_FIRMWARE_ADDR 0x20000
@@ -70,46 +108,98 @@ struct p54_edcf_queue_param {
 #define FW_LM87 0x4c4d3837
 #define FW_LM20 0x4c4d3230
 
+enum fw_state {
+       FW_STATE_OFF,
+       FW_STATE_BOOTING,
+       FW_STATE_READY,
+       FW_STATE_RESET,
+       FW_STATE_RESETTING,
+};
+
+#ifdef CONFIG_P54_LEDS
+
+#define P54_LED_MAX_NAME_LEN 31
+
+struct p54_led_dev {
+       struct ieee80211_hw *hw_dev;
+       struct led_classdev led_dev;
+       char name[P54_LED_MAX_NAME_LEN + 1];
+
+       unsigned int toggled;
+       unsigned int index;
+       unsigned int registered;
+};
+
+#endif /* CONFIG_P54_LEDS */
+
 struct p54_common {
-       u32 rx_start;
-       u32 rx_end;
-       struct sk_buff_head tx_queue;
-       void (*tx)(struct ieee80211_hw *dev, struct sk_buff *skb,
-                  int free_on_tx);
+       struct ieee80211_hw *hw;
+       struct ieee80211_vif *vif;
+       void (*tx)(struct ieee80211_hw *dev, struct sk_buff *skb);
        int (*open)(struct ieee80211_hw *dev);
        void (*stop)(struct ieee80211_hw *dev);
-       int mode;
+       struct sk_buff_head tx_queue;
+       struct mutex conf_mutex;
+
+       /* memory management (as seen by the firmware) */
+       u32 rx_start;
+       u32 rx_end;
        u16 rx_mtu;
        u8 headroom;
        u8 tailroom;
-       struct mutex conf_mutex;
-       u8 mac_addr[ETH_ALEN];
-       u8 bssid[ETH_ALEN];
-       u16 mac_mode;
-       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;
+
+       /* firmware/hardware info */
        unsigned int tx_hdr_len;
        unsigned int fw_var;
        unsigned int fw_interface;
-       unsigned int output_power;
-       u32 tsf_low32;
-       u32 tsf_high32;
+       u8 version;
+
+       /* (e)DCF / QOS state */
+       bool use_short_slot;
        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;
-       struct sk_buff *cached_stats;
-       struct sk_buff *cached_beacon;
+
+       /* Radio data */
+       u16 rxhw;
+       u8 rx_diversity_mask;
+       u8 tx_diversity_mask;
+       unsigned int output_power;
        int noise;
+       /* calibration, output power limit and rssi<->dBm conversation data */
+       struct pda_iq_autocal_entry *iq_autocal;
+       unsigned int iq_autocal_len;
+       struct p54_cal_database *curve_data;
+       struct p54_cal_database *output_limit;
+       struct p54_rssi_linear_approximation rssical_db[IEEE80211_NUM_BANDS];
+
+       /* BBP/MAC state */
+       u8 mac_addr[ETH_ALEN];
+       u8 bssid[ETH_ALEN];
+       u16 wakeup_timer;
+       unsigned int filter_flags;
+       int mode;
+       u32 tsf_low32, tsf_high32;
+       u32 basic_rate_mask;
+       u16 aid;
+       struct sk_buff *cached_beacon;
+
+       /* cryptographic engine information */
+       u8 privacy_caps;
+       u8 rx_keycache_size;
+       unsigned long *used_rxkeys;
+
+       /* LED management */
+#ifdef CONFIG_P54_LEDS
+       struct p54_led_dev leds[4];
+       struct delayed_work led_work;
+#endif /* CONFIG_P54_LEDS */
+       u16 softled_state;              /* bit field of glowing LEDs */
+
+       /* statistics */
+       struct ieee80211_low_level_stats stats;
+       struct delayed_work work;
+
+       /* eeprom handling */
        void *eeprom;
        struct completion eeprom_comp;
 };
@@ -117,8 +207,10 @@ struct p54_common {
 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_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len);
 int p54_read_eeprom(struct ieee80211_hw *dev);
 struct ieee80211_hw *p54_init_common(size_t priv_data_len);
+int p54_register_common(struct ieee80211_hw *dev, struct device *pdev);
 void p54_free_common(struct ieee80211_hw *dev);
 
 #endif /* P54_H */