diff options
author | Jay Sternberg <jay.e.sternberg@intel.com> | 2010-09-14 18:21:20 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-09-28 19:52:35 -0400 |
commit | 1de19eccb3fe634e939cb40f30fdfda93a67fe93 (patch) | |
tree | 915d5117dfe7d338cfeefb653dea23eaceadfaf1 /drivers/net | |
parent | 6e5c2b4e8addfaab8ef54dedaf7b607e1585c35b (diff) |
iwlwifi: define 100 devices
add new structures and defines need to identify 100 devices.
Signed-off-by: Jay Sternberg <jay.e.sternberg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-1000.c | 73 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.h | 2 |
3 files changed, 81 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c index 56ef4ed0db47..19dbef06d52c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-1000.c +++ b/drivers/net/wireless/iwlwifi/iwl-1000.c | |||
@@ -50,14 +50,20 @@ | |||
50 | 50 | ||
51 | /* Highest firmware API version supported */ | 51 | /* Highest firmware API version supported */ |
52 | #define IWL1000_UCODE_API_MAX 3 | 52 | #define IWL1000_UCODE_API_MAX 3 |
53 | #define IWL100_UCODE_API_MAX 5 | ||
53 | 54 | ||
54 | /* Lowest firmware API version supported */ | 55 | /* Lowest firmware API version supported */ |
55 | #define IWL1000_UCODE_API_MIN 1 | 56 | #define IWL1000_UCODE_API_MIN 1 |
57 | #define IWL100_UCODE_API_MIN 5 | ||
56 | 58 | ||
57 | #define IWL1000_FW_PRE "iwlwifi-1000-" | 59 | #define IWL1000_FW_PRE "iwlwifi-1000-" |
58 | #define _IWL1000_MODULE_FIRMWARE(api) IWL1000_FW_PRE #api ".ucode" | 60 | #define _IWL1000_MODULE_FIRMWARE(api) IWL1000_FW_PRE #api ".ucode" |
59 | #define IWL1000_MODULE_FIRMWARE(api) _IWL1000_MODULE_FIRMWARE(api) | 61 | #define IWL1000_MODULE_FIRMWARE(api) _IWL1000_MODULE_FIRMWARE(api) |
60 | 62 | ||
63 | #define IWL100_FW_PRE "iwlwifi-100-" | ||
64 | #define _IWL100_MODULE_FIRMWARE(api) IWL100_FW_PRE #api ".ucode" | ||
65 | #define IWL100_MODULE_FIRMWARE(api) _IWL100_MODULE_FIRMWARE(api) | ||
66 | |||
61 | 67 | ||
62 | /* | 68 | /* |
63 | * For 1000, use advance thermal throttling critical temperature threshold, | 69 | * For 1000, use advance thermal throttling critical temperature threshold, |
@@ -310,4 +316,71 @@ struct iwl_cfg iwl1000_bg_cfg = { | |||
310 | .chain_noise_calib_by_driver = true, | 316 | .chain_noise_calib_by_driver = true, |
311 | }; | 317 | }; |
312 | 318 | ||
319 | struct iwl_cfg iwl100_bgn_cfg = { | ||
320 | .name = "Intel(R) 100 Series 1x1 BGN", | ||
321 | .fw_name_pre = IWL100_FW_PRE, | ||
322 | .ucode_api_max = IWL100_UCODE_API_MAX, | ||
323 | .ucode_api_min = IWL100_UCODE_API_MIN, | ||
324 | .sku = IWL_SKU_G|IWL_SKU_N, | ||
325 | .ops = &iwl1000_ops, | ||
326 | .eeprom_size = OTP_LOW_IMAGE_SIZE, | ||
327 | .eeprom_ver = EEPROM_1000_EEPROM_VERSION, | ||
328 | .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION, | ||
329 | .num_of_queues = IWLAGN_NUM_QUEUES, | ||
330 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, | ||
331 | .mod_params = &iwlagn_mod_params, | ||
332 | .valid_tx_ant = ANT_A, | ||
333 | .valid_rx_ant = ANT_A, | ||
334 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, | ||
335 | .set_l0s = true, | ||
336 | .use_bsm = false, | ||
337 | .max_ll_items = OTP_MAX_LL_ITEMS_1000, | ||
338 | .shadow_ram_support = false, | ||
339 | .ht_greenfield_support = true, | ||
340 | .led_compensation = 51, | ||
341 | .use_rts_for_aggregation = true, /* use rts/cts protection */ | ||
342 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | ||
343 | .support_ct_kill_exit = true, | ||
344 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF, | ||
345 | .chain_noise_scale = 1000, | ||
346 | .monitor_recover_period = IWL_DEF_MONITORING_PERIOD, | ||
347 | .max_event_log_size = 128, | ||
348 | .ucode_tracing = true, | ||
349 | .sensitivity_calib_by_driver = true, | ||
350 | .chain_noise_calib_by_driver = true, | ||
351 | }; | ||
352 | |||
353 | struct iwl_cfg iwl100_bg_cfg = { | ||
354 | .name = "Intel(R) 100 Series 1x1 BG", | ||
355 | .fw_name_pre = IWL100_FW_PRE, | ||
356 | .ucode_api_max = IWL100_UCODE_API_MAX, | ||
357 | .ucode_api_min = IWL100_UCODE_API_MIN, | ||
358 | .sku = IWL_SKU_G, | ||
359 | .ops = &iwl1000_ops, | ||
360 | .eeprom_size = OTP_LOW_IMAGE_SIZE, | ||
361 | .eeprom_ver = EEPROM_1000_EEPROM_VERSION, | ||
362 | .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION, | ||
363 | .num_of_queues = IWLAGN_NUM_QUEUES, | ||
364 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, | ||
365 | .mod_params = &iwlagn_mod_params, | ||
366 | .valid_tx_ant = ANT_A, | ||
367 | .valid_rx_ant = ANT_A, | ||
368 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, | ||
369 | .set_l0s = true, | ||
370 | .use_bsm = false, | ||
371 | .max_ll_items = OTP_MAX_LL_ITEMS_1000, | ||
372 | .shadow_ram_support = false, | ||
373 | .led_compensation = 51, | ||
374 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | ||
375 | .support_ct_kill_exit = true, | ||
376 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF, | ||
377 | .chain_noise_scale = 1000, | ||
378 | .monitor_recover_period = IWL_DEF_MONITORING_PERIOD, | ||
379 | .max_event_log_size = 128, | ||
380 | .ucode_tracing = true, | ||
381 | .sensitivity_calib_by_driver = true, | ||
382 | .chain_noise_calib_by_driver = true, | ||
383 | }; | ||
384 | |||
313 | MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX)); | 385 | MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX)); |
386 | MODULE_FIRMWARE(IWL100_MODULE_FIRMWARE(IWL100_UCODE_API_MAX)); | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 646864a26eaf..005b07bea1e0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -4788,6 +4788,12 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { | |||
4788 | {IWL_PCI_DEVICE(0x0083, 0x1326, iwl1000_bg_cfg)}, | 4788 | {IWL_PCI_DEVICE(0x0083, 0x1326, iwl1000_bg_cfg)}, |
4789 | {IWL_PCI_DEVICE(0x0084, 0x1216, iwl1000_bg_cfg)}, | 4789 | {IWL_PCI_DEVICE(0x0084, 0x1216, iwl1000_bg_cfg)}, |
4790 | {IWL_PCI_DEVICE(0x0084, 0x1316, iwl1000_bg_cfg)}, | 4790 | {IWL_PCI_DEVICE(0x0084, 0x1316, iwl1000_bg_cfg)}, |
4791 | |||
4792 | {IWL_PCI_DEVICE(0x08AE, 0x1005, iwl100_bgn_cfg)}, | ||
4793 | {IWL_PCI_DEVICE(0x08AF, 0x1015, iwl100_bgn_cfg)}, | ||
4794 | {IWL_PCI_DEVICE(0x08AE, 0x1025, iwl100_bgn_cfg)}, | ||
4795 | {IWL_PCI_DEVICE(0x08AE, 0x1007, iwl100_bg_cfg)}, | ||
4796 | {IWL_PCI_DEVICE(0x08AE, 0x1017, iwl100_bg_cfg)}, | ||
4791 | #endif /* CONFIG_IWL5000 */ | 4797 | #endif /* CONFIG_IWL5000 */ |
4792 | 4798 | ||
4793 | {0} | 4799 | {0} |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h index a372184ac210..d5dc824ebbfb 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.h +++ b/drivers/net/wireless/iwlwifi/iwl-agn.h | |||
@@ -92,6 +92,8 @@ extern struct iwl_cfg iwl6050_2abg_cfg; | |||
92 | extern struct iwl_cfg iwl6050g2_bgn_cfg; | 92 | extern struct iwl_cfg iwl6050g2_bgn_cfg; |
93 | extern struct iwl_cfg iwl1000_bgn_cfg; | 93 | extern struct iwl_cfg iwl1000_bgn_cfg; |
94 | extern struct iwl_cfg iwl1000_bg_cfg; | 94 | extern struct iwl_cfg iwl1000_bg_cfg; |
95 | extern struct iwl_cfg iwl100_bgn_cfg; | ||
96 | extern struct iwl_cfg iwl100_bg_cfg; | ||
95 | 97 | ||
96 | extern struct iwl_mod_params iwlagn_mod_params; | 98 | extern struct iwl_mod_params iwlagn_mod_params; |
97 | extern struct iwl_hcmd_ops iwlagn_hcmd; | 99 | extern struct iwl_hcmd_ops iwlagn_hcmd; |