]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - drivers/net/wireless/p54/p54.h
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[linux-2.6.git] / drivers / net / wireless / p54 / p54.h
index 64492feca9b2ca64c0f8710571aae5b3a9ed08b0..43a3b2ead81adf886fff780c600cce62de6fe5d2 100644 (file)
@@ -1,6 +1,3 @@
-#ifndef P54_H
-#define P54_H
-
 /*
  * Shared defines for all mac80211 Prism54 code
  *
  * published by the Free Software Foundation.
  */
 
-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_RX_KEYCACHE,
-       P54_CONTROL_TYPE_TIM,
-       P54_CONTROL_TYPE_PSM,
-       P54_CONTROL_TYPE_TXCANCEL,
-       P54_CONTROL_TYPE_TXDONE,
-       P54_CONTROL_TYPE_BURST,
-       P54_CONTROL_TYPE_STAT_READBACK,
-       P54_CONTROL_TYPE_BBP,
-       P54_CONTROL_TYPE_EEPROM_READBACK,
-       P54_CONTROL_TYPE_LED,
-       P54_CONTROL_TYPE_GPIO,
-       P54_CONTROL_TYPE_TIMER,
-       P54_CONTROL_TYPE_MODULATION,
-       P54_CONTROL_TYPE_SYNTH_CONFIG,
-       P54_CONTROL_TYPE_DETECTOR_VALUE,
-       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
-};
+#ifndef P54_H
+#define P54_H
+
+#ifdef CONFIG_P54_LEDS
+#include <linux/leds.h>
+#endif /* CONFIG_P54_LEDS */
+
+#define ISL38XX_DEV_FIRMWARE_ADDR 0x20000
+
+#define BR_CODE_MIN                    0x80000000
+#define BR_CODE_COMPONENT_ID           0x80000001
+#define BR_CODE_COMPONENT_VERSION      0x80000002
+#define BR_CODE_DEPENDENT_IF           0x80000003
+#define BR_CODE_EXPOSED_IF             0x80000004
+#define BR_CODE_DESCR                  0x80000101
+#define BR_CODE_MAX                    0x8FFFFFFF
+#define BR_CODE_END_OF_BRA             0xFF0000FF
+#define LEGACY_BR_CODE_END_OF_BRA      0xFFFFFFFF
+
+struct bootrec {
+       __le32 code;
+       __le32 len;
+       u32 data[10];
+} __packed;
+
+/* Interface role definitions */
+#define BR_INTERFACE_ROLE_SERVER       0x0000
+#define BR_INTERFACE_ROLE_CLIENT       0x8000
+
+#define BR_DESC_PRIV_CAP_WEP           BIT(0)
+#define BR_DESC_PRIV_CAP_TKIP          BIT(1)
+#define BR_DESC_PRIV_CAP_MICHAEL       BIT(2)
+#define BR_DESC_PRIV_CAP_CCX_CP                BIT(3)
+#define BR_DESC_PRIV_CAP_CCX_MIC       BIT(4)
+#define BR_DESC_PRIV_CAP_AESCCMP       BIT(5)
+
+struct bootrec_desc {
+       __le16 modes;
+       __le16 flags;
+       __le32 rx_start;
+       __le32 rx_end;
+       u8 headroom;
+       u8 tailroom;
+       u8 tx_queues;
+       u8 tx_depth;
+       u8 privacy_caps;
+       u8 rx_keycache_size;
+       u8 time_size;
+       u8 padding;
+       u8 rates[16];
+       u8 padding2[4];
+       __le16 rx_mtu;
+} __packed;
+
+#define FW_FMAC 0x464d4143
+#define FW_LM86 0x4c4d3836
+#define FW_LM87 0x4c4d3837
+#define FW_LM20 0x4c4d3230
+
+struct bootrec_comp_id {
+       __le32 fw_variant;
+} __packed;
+
+struct bootrec_comp_ver {
+       char fw_version[24];
+} __packed;
+
+struct bootrec_end {
+       __le16 crc;
+       u8 padding[2];
+       u8 md5[16];
+} __packed;
 
 /* provide 16 bytes for the transport back-end */
 #define P54_TX_INFO_DATA_SIZE          16
@@ -51,34 +91,30 @@ enum p54_control_frame_types {
 struct p54_tx_info {
        u32 start_addr;
        u32 end_addr;
-       void *data[P54_TX_INFO_DATA_SIZE / sizeof(void *)];
+       union {
+               void *data[P54_TX_INFO_DATA_SIZE / sizeof(void *)];
+               struct {
+                       u32 extra_len;
+               };
+       };
 };
 
 #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;
-       __le32 req_id;
-       __le16 type;    /* enum p54_control_frame_types */
-       u8 rts_tries;
-       u8 tries;
-       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))
+#define P54_SET_QUEUE(queue, ai_fs, cw_min, cw_max, _txop)     \
+do {                                                           \
+       queue.aifs = cpu_to_le16(ai_fs);                        \
+       queue.cwmin = cpu_to_le16(cw_min);                      \
+       queue.cwmax = cpu_to_le16(cw_max);                      \
+       queue.txop = cpu_to_le16(_txop);                        \
+} while (0)
 
 struct p54_edcf_queue_param {
        __le16 aifs;
        __le16 cwmin;
        __le16 cwmax;
        __le16 txop;
-} __attribute__ ((packed));
+} __packed;
 
 struct p54_rssi_linear_approximation {
        s16 mul;
@@ -97,13 +133,6 @@ struct p54_cal_database {
 
 #define EEPROM_READBACK_LEN 0x3fc
 
-#define ISL38XX_DEV_FIRMWARE_ADDR 0x20000
-
-#define FW_FMAC 0x464d4143
-#define FW_LM86 0x4c4d3836
-#define FW_LM87 0x4c4d3837
-#define FW_LM20 0x4c4d3230
-
 enum fw_state {
        FW_STATE_OFF,
        FW_STATE_BOOTING,
@@ -112,59 +141,117 @@ enum fw_state {
        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_tx_queue_stats {
+       unsigned int len;
+       unsigned int limit;
+       unsigned int count;
+};
+
 struct p54_common {
        struct ieee80211_hw *hw;
-       u32 rx_start;
-       u32 rx_end;
-       struct sk_buff_head tx_queue;
+       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_pending;
+       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];
+
+       /* firmware/hardware info */
+       unsigned int tx_hdr_len;
+       unsigned int fw_var;
+       unsigned int fw_interface;
+       u8 version;
+
+       /* (e)DCF / QOS state */
+       bool use_short_slot;
+       spinlock_t tx_stats_lock;
+       struct p54_tx_queue_stats tx_stats[8];
+       struct p54_edcf_queue_param qos_params[8];
+
+       /* 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 *output_limit;
        struct p54_cal_database *curve_data;
+       struct p54_cal_database *output_limit;
        struct p54_rssi_linear_approximation rssical_db[IEEE80211_NUM_BANDS];
-       unsigned int filter_flags;
-       bool use_short_slot;
-       u16 rxhw;
-       u8 version;
-       unsigned int tx_hdr_len;
-       unsigned int fw_var;
-       unsigned int fw_interface;
-       unsigned int output_power;
-       u32 tsf_low32;
-       u32 tsf_high32;
-       u64 basic_rate_mask;
+       struct ieee80211_supported_band *band_table[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 ieee80211_tx_queue_stats tx_stats[8];
-       struct p54_edcf_queue_param qos_params[8];
+       bool powersave_override;
+       __le32 beacon_req_id;
+       struct completion beacon_comp;
+
+       /* 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;
-       struct sk_buff *cached_beacon;
-       int noise;
+
+       /* eeprom handling */
        void *eeprom;
        struct completion eeprom_comp;
-       u8 privacy_caps;
-       u8 rx_keycache_size;
+       struct mutex eeprom_mutex;
 };
 
+/* interfaces for the drivers */
 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);
 
+void p54_unregister_common(struct ieee80211_hw *dev);
+
 #endif /* P54_H */