iwmc3200wifi: handle coexistence radio notification

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

diff --git a/drivers/net/wireless/wl12xx/wl1271_init.h b/drivers/net/wireless/wl12xx/wl1271_init.h
index bd8ff0f..6e21cee 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_init.h
+++ b/drivers/net/wireless/wl12xx/wl1271_init.h
@@ -48,19 +48,6 @@ struct wl1271_general_parms {
        u8 settings;
 } __attribute__ ((packed));
 
-enum ref_clk_enum {
-       REF_CLK_19_2_E,
-       REF_CLK_26_E,
-       REF_CLK_38_4_E,
-       REF_CLK_52_E
-};
-
-#define RSSI_AND_PROCESS_COMPENSATION_SIZE 15
-#define NUMBER_OF_SUB_BANDS_5  7
-#define NUMBER_OF_RATE_GROUPS  6
-#define NUMBER_OF_CHANNELS_2_4 14
-#define NUMBER_OF_CHANNELS_5   35
-
 struct wl1271_radio_parms {
        u8 id;
        u8 padding[3];
@@ -69,45 +56,45 @@ struct wl1271_radio_parms {
        /* 2.4GHz */
        u8 rx_trace_loss;
        u8 tx_trace_loss;
-       s8 rx_rssi_and_proc_compens[RSSI_AND_PROCESS_COMPENSATION_SIZE];
+       s8 rx_rssi_and_proc_compens[CONF_RSSI_AND_PROCESS_COMPENSATION_SIZE];
 
        /* 5GHz */
-       u8 rx_trace_loss_5[NUMBER_OF_SUB_BANDS_5];
-       u8 tx_trace_loss_5[NUMBER_OF_SUB_BANDS_5];
-       s8 rx_rssi_and_proc_compens_5[RSSI_AND_PROCESS_COMPENSATION_SIZE];
+       u8 rx_trace_loss_5[CONF_NUMBER_OF_SUB_BANDS_5];
+       u8 tx_trace_loss_5[CONF_NUMBER_OF_SUB_BANDS_5];
+       s8 rx_rssi_and_proc_compens_5[CONF_RSSI_AND_PROCESS_COMPENSATION_SIZE];
 
        /* Dynamic radio parameters */
        /* 2.4GHz */
-       s16 tx_ref_pd_voltage;
+       __le16 tx_ref_pd_voltage;
        s8  tx_ref_power;
        s8  tx_offset_db;
 
-       s8  tx_rate_limits_normal[NUMBER_OF_RATE_GROUPS];
-       s8  tx_rate_limits_degraded[NUMBER_OF_RATE_GROUPS];
+       s8  tx_rate_limits_normal[CONF_NUMBER_OF_RATE_GROUPS];
+       s8  tx_rate_limits_degraded[CONF_NUMBER_OF_RATE_GROUPS];
 
-       s8  tx_channel_limits_11b[NUMBER_OF_CHANNELS_2_4];
-       s8  tx_channel_limits_ofdm[NUMBER_OF_CHANNELS_2_4];
-       s8  tx_pdv_rate_offsets[NUMBER_OF_RATE_GROUPS];
+       s8  tx_channel_limits_11b[CONF_NUMBER_OF_CHANNELS_2_4];
+       s8  tx_channel_limits_ofdm[CONF_NUMBER_OF_CHANNELS_2_4];
+       s8  tx_pdv_rate_offsets[CONF_NUMBER_OF_RATE_GROUPS];
 
-       u8  tx_ibias[NUMBER_OF_RATE_GROUPS];
+       u8  tx_ibias[CONF_NUMBER_OF_RATE_GROUPS];
        u8  rx_fem_insertion_loss;
 
        u8 padding2;
 
        /* 5GHz */
-       s16 tx_ref_pd_voltage_5[NUMBER_OF_SUB_BANDS_5];
-       s8  tx_ref_power_5[NUMBER_OF_SUB_BANDS_5];
-       s8  tx_offset_db_5[NUMBER_OF_SUB_BANDS_5];
+       __le16 tx_ref_pd_voltage_5[CONF_NUMBER_OF_SUB_BANDS_5];
+       s8  tx_ref_power_5[CONF_NUMBER_OF_SUB_BANDS_5];
+       s8  tx_offset_db_5[CONF_NUMBER_OF_SUB_BANDS_5];
 
-       s8  tx_rate_limits_normal_5[NUMBER_OF_RATE_GROUPS];
-       s8  tx_rate_limits_degraded_5[NUMBER_OF_RATE_GROUPS];
+       s8  tx_rate_limits_normal_5[CONF_NUMBER_OF_RATE_GROUPS];
+       s8  tx_rate_limits_degraded_5[CONF_NUMBER_OF_RATE_GROUPS];
 
-       s8  tx_channel_limits_ofdm_5[NUMBER_OF_CHANNELS_5];
-       s8  tx_pdv_rate_offsets_5[NUMBER_OF_RATE_GROUPS];
+       s8  tx_channel_limits_ofdm_5[CONF_NUMBER_OF_CHANNELS_5];
+       s8  tx_pdv_rate_offsets_5[CONF_NUMBER_OF_RATE_GROUPS];
 
        /* FIXME: this is inconsistent with the types for 2.4GHz */
-       s8  tx_ibias_5[NUMBER_OF_RATE_GROUPS];
-       s8  rx_fem_insertion_loss_5[NUMBER_OF_SUB_BANDS_5];
+       s8  tx_ibias_5[CONF_NUMBER_OF_RATE_GROUPS];
+       s8  rx_fem_insertion_loss_5[CONF_NUMBER_OF_SUB_BANDS_5];
 
        u8 padding3[2];
 } __attribute__ ((packed));