1 files changed, 17 insertions, 41 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
index 7827566dcc8b..bd0a042ca77f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
@@ -63,7 +63,7 @@
 #ifndef __iwl_eeprom_h__
 #define __iwl_eeprom_h__
 
-struct iwl4965_priv;
+struct iwl_priv;
 
 /*
  * EEPROM access time values:
@@ -137,6 +137,8 @@ struct iwl4965_eeprom_channel {
  * Look for this in calib_version member of struct iwl4965_eeprom. */
 #define EEPROM_TX_POWER_VERSION_NEW    (5)
 
+/* 2.4 GHz */
+extern const u8 iwl_eeprom_band_1[14];
 
 /*
  * 4965 factory calibration data for one txpower level, on one channel,
@@ -228,49 +230,31 @@ struct iwl4965_eeprom_calib_info {
  */
 struct iwl4965_eeprom {
         u8 reserved0[16];
-#define EEPROM_DEVICE_ID                    (2*0x08)    /* 2 bytes */
         u16 device_id;          /* abs.ofs: 16 */
         u8 reserved1[2];
-#define EEPROM_PMC                          (2*0x0A)    /* 2 bytes */
         u16 pmc;                /* abs.ofs: 20 */
         u8 reserved2[20];
-#define EEPROM_MAC_ADDRESS                  (2*0x15)    /* 6  bytes */
         u8 mac_address[6];      /* abs.ofs: 42 */
         u8 reserved3[58];
-#define EEPROM_BOARD_REVISION               (2*0x35)    /* 2  bytes */
         u16 board_revision;     /* abs.ofs: 106 */
         u8 reserved4[11];
-#define EEPROM_BOARD_PBA_NUMBER             (2*0x3B+1)  /* 9  bytes */
         u8 board_pba_number[9]; /* abs.ofs: 119 */
         u8 reserved5[8];
-#define EEPROM_VERSION                      (2*0x44)    /* 2  bytes */
         u16 version;            /* abs.ofs: 136 */
-#define EEPROM_SKU_CAP                      (2*0x45)    /* 1  bytes */
         u8 sku_cap;             /* abs.ofs: 138 */
-#define EEPROM_LEDS_MODE                    (2*0x45+1)  /* 1  bytes */
         u8 leds_mode;           /* abs.ofs: 139 */
-#define EEPROM_OEM_MODE                     (2*0x46)    /* 2  bytes */
         u16 oem_mode;
-#define EEPROM_WOWLAN_MODE                  (2*0x47)    /* 2  bytes */
         u16 wowlan_mode;        /* abs.ofs: 142 */
-#define EEPROM_LEDS_TIME_INTERVAL           (2*0x48)    /* 2  bytes */
         u16 leds_time_interval; /* abs.ofs: 144 */
-#define EEPROM_LEDS_OFF_TIME                (2*0x49)    /* 1  bytes */
         u8 leds_off_time;       /* abs.ofs: 146 */
-#define EEPROM_LEDS_ON_TIME                 (2*0x49+1)  /* 1  bytes */
         u8 leds_on_time;        /* abs.ofs: 147 */
-#define EEPROM_ALMGOR_M_VERSION             (2*0x4A)    /* 1  bytes */
         u8 almgor_m_version;    /* abs.ofs: 148 */
-#define EEPROM_ANTENNA_SWITCH_TYPE          (2*0x4A+1)  /* 1  bytes */
         u8 antenna_switch_type; /* abs.ofs: 149 */
         u8 reserved6[8];
-#define EEPROM_4965_BOARD_REVISION          (2*0x4F)    /* 2 bytes */
         u16 board_revision_4965;        /* abs.ofs: 158 */
         u8 reserved7[13];
-#define EEPROM_4965_BOARD_PBA               (2*0x56+1)  /* 9 bytes */
         u8 board_pba_number_4965[9];    /* abs.ofs: 173 */
         u8 reserved8[10];
-#define EEPROM_REGULATORY_SKU_ID            (2*0x60)    /* 4  bytes */
         u8 sku_id[4];           /* abs.ofs: 192 */
 
 /*
@@ -285,9 +269,7 @@ struct iwl4965_eeprom {
  *
  * 2.4 GHz channels 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
  */
-#define EEPROM_REGULATORY_BAND_1            (2*0x62)    /* 2  bytes */
         u16 band_1_count;       /* abs.ofs: 196 */
-#define EEPROM_REGULATORY_BAND_1_CHANNELS   (2*0x63)    /* 28 bytes */
         struct iwl4965_eeprom_channel band_1_channels[14]; /* abs.ofs: 196 */
 
 /*
@@ -295,36 +277,28 @@ struct iwl4965_eeprom {
  * 5.0 GHz channels 7, 8, 11, 12, 16
  * (4915-5080MHz) (none of these is ever supported)
  */
-#define EEPROM_REGULATORY_BAND_2            (2*0x71)    /* 2  bytes */
         u16 band_2_count;       /* abs.ofs: 226 */
-#define EEPROM_REGULATORY_BAND_2_CHANNELS   (2*0x72)    /* 26 bytes */
         struct iwl4965_eeprom_channel band_2_channels[13]; /* abs.ofs: 228 */
 
 /*
  * 5.2 GHz channels 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64
  * (5170-5320MHz)
  */
-#define EEPROM_REGULATORY_BAND_3            (2*0x7F)    /* 2  bytes */
         u16 band_3_count;       /* abs.ofs: 254 */
-#define EEPROM_REGULATORY_BAND_3_CHANNELS   (2*0x80)    /* 24 bytes */
         struct iwl4965_eeprom_channel band_3_channels[12]; /* abs.ofs: 256 */
 
 /*
  * 5.5 GHz channels 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140
  * (5500-5700MHz)
  */
-#define EEPROM_REGULATORY_BAND_4            (2*0x8C)    /* 2  bytes */
         u16 band_4_count;       /* abs.ofs: 280 */
-#define EEPROM_REGULATORY_BAND_4_CHANNELS   (2*0x8D)    /* 22 bytes */
         struct iwl4965_eeprom_channel band_4_channels[11]; /* abs.ofs: 282 */
 
 /*
  * 5.7 GHz channels 145, 149, 153, 157, 161, 165
  * (5725-5825MHz)
  */
-#define EEPROM_REGULATORY_BAND_5            (2*0x98)    /* 2  bytes */
         u16 band_5_count;       /* abs.ofs: 304 */
-#define EEPROM_REGULATORY_BAND_5_CHANNELS   (2*0x99)    /* 12 bytes */
         struct iwl4965_eeprom_channel band_5_channels[6]; /* abs.ofs: 306 */
 
         u8 reserved10[2];
@@ -345,7 +319,6 @@ struct iwl4965_eeprom {
  *
  * NOTE:  4965 does not support FAT channels on 2.4 GHz.
  */
-#define EEPROM_REGULATORY_BAND_24_FAT_CHANNELS (2*0xA0) /* 14 bytes */
         struct iwl4965_eeprom_channel band_24_channels[7]; /* abs.ofs: 320 */
         u8 reserved11[2];
 
@@ -353,7 +326,6 @@ struct iwl4965_eeprom {
  * 5.2 GHz FAT channels 36 (40), 44 (48), 52 (56), 60 (64),
  * 100 (104), 108 (112), 116 (120), 124 (128), 132 (136), 149 (153), 157 (161)
  */
-#define EEPROM_REGULATORY_BAND_52_FAT_CHANNELS (2*0xA8) /* 22 bytes */
         struct iwl4965_eeprom_channel band_52_channels[11]; /* abs.ofs: 336 */
         u8 reserved12[6];
 
@@ -362,7 +334,6 @@ struct iwl4965_eeprom {
  * Driver does not work with txpower calibration version < 5.
  * This value is simply a 16-bit number, no major/minor versions here.
  */
-#define EEPROM_CALIB_VERSION_OFFSET            (2*0xB6) /* 2 bytes */
         u16 calib_version;      /* abs.ofs: 364 */
         u8 reserved13[2];
         u8 reserved14[96];      /* abs.ofs: 368 */
@@ -370,7 +341,6 @@ struct iwl4965_eeprom {
 /*
  * 4965 Txpower calibration data.
  */
-#define EEPROM_IWL_CALIB_TXPOWER_OFFSET        (2*0xE8) /* 48  bytes */
         struct iwl4965_eeprom_calib_info calib_info;    /* abs.ofs: 464 */
 
         u8 reserved16[140];     /* fill out to full 1024 byte block */
@@ -383,17 +353,23 @@ struct iwl4965_eeprom {
 /* End of EEPROM */
 
 struct iwl_eeprom_ops {
-        int (*verify_signature) (struct iwl4965_priv *priv);
-        int (*acquire_semaphore) (struct iwl4965_priv *priv);
-        void (*release_semaphore) (struct iwl4965_priv *priv);
+        int (*verify_signature) (struct iwl_priv *priv);
+        int (*acquire_semaphore) (struct iwl_priv *priv);
+        void (*release_semaphore) (struct iwl_priv *priv);
 };
 
 
-void iwl_eeprom_get_mac(const struct iwl4965_priv *priv, u8 *mac);
-int iwl_eeprom_init(struct iwl4965_priv *priv);
+void iwl_eeprom_get_mac(const struct iwl_priv *priv, u8 *mac);
+int iwl_eeprom_init(struct iwl_priv *priv);
 
-int iwlcore_eeprom_verify_signature(struct iwl4965_priv *priv);
-int iwlcore_eeprom_acquire_semaphore(struct iwl4965_priv *priv);
-void iwlcore_eeprom_release_semaphore(struct iwl4965_priv *priv);
+int iwlcore_eeprom_verify_signature(struct iwl_priv *priv);
+int iwlcore_eeprom_acquire_semaphore(struct iwl_priv *priv);
+void iwlcore_eeprom_release_semaphore(struct iwl_priv *priv);
+
+int iwl_init_channel_map(struct iwl_priv *priv);
+void iwl_free_channel_map(struct iwl_priv *priv);
+const struct iwl_channel_info *iwl_get_channel_info(
+                const struct iwl_priv *priv,
+                enum ieee80211_band band, u16 channel);
 
 #endif  /* __iwl_eeprom_h__ */