p54spi: p54spi driver

[deliverable/linux.git] / drivers / net / wireless / p54 / p54.h

diff --git a/drivers/net/wireless/p54/p54.h b/drivers/net/wireless/p54/p54.h
index 23b80ef4d0154b01951d94c121e9a7ade1407964..64492feca9b2ca64c0f8710571aae5b3a9ed08b0 100644 (file)
--- a/drivers/net/wireless/p54/p54.h
+++ b/drivers/net/wireless/p54/p54.h
@@ -44,6 +44,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 +69,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 +80,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,13 +104,20 @@ 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,
+};
+
 struct p54_common {
        struct ieee80211_hw *hw;
        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);
+       void (*tx)(struct ieee80211_hw *dev, struct sk_buff *skb);
        int (*open)(struct ieee80211_hw *dev);
        void (*stop)(struct ieee80211_hw *dev);
        int mode;
@@ -86,11 +127,13 @@ struct p54_common {
        struct mutex conf_mutex;
        u8 mac_addr[ETH_ALEN];
        u8 bssid[ETH_ALEN];
+       u8 rx_diversity_mask;
+       u8 tx_diversity_mask;
        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;
+       struct p54_cal_database *output_limit;
+       struct p54_cal_database *curve_data;
+       struct p54_rssi_linear_approximation rssical_db[IEEE80211_NUM_BANDS];
        unsigned int filter_flags;
        bool use_short_slot;
        u16 rxhw;
@@ -119,6 +162,7 @@ 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);
 void p54_free_common(struct ieee80211_hw *dev);