diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-04-30 11:55:16 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-04-30 11:55:16 -0400 |
commit | b4ed221daba1b129c3efff8a7352d9791d034330 (patch) | |
tree | d99797404476927d973b7fbbeef5a2edb0be89f2 /drivers/net | |
parent | d2690c0db7146b12e4fc2d572053c823e512758a (diff) |
iwlagn: new 105 series device
Correction for new 105 series devices
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-2000.c | 58 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 30 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.h | 8 |
3 files changed, 48 insertions, 48 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c index e76e02c2892..f90d6afc58c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-2000.c +++ b/drivers/net/wireless/iwlwifi/iwl-2000.c | |||
@@ -51,12 +51,12 @@ | |||
51 | /* Highest firmware API version supported */ | 51 | /* Highest firmware API version supported */ |
52 | #define IWL2030_UCODE_API_MAX 5 | 52 | #define IWL2030_UCODE_API_MAX 5 |
53 | #define IWL2000_UCODE_API_MAX 5 | 53 | #define IWL2000_UCODE_API_MAX 5 |
54 | #define IWL200_UCODE_API_MAX 5 | 54 | #define IWL105_UCODE_API_MAX 5 |
55 | 55 | ||
56 | /* Lowest firmware API version supported */ | 56 | /* Lowest firmware API version supported */ |
57 | #define IWL2030_UCODE_API_MIN 5 | 57 | #define IWL2030_UCODE_API_MIN 5 |
58 | #define IWL2000_UCODE_API_MIN 5 | 58 | #define IWL2000_UCODE_API_MIN 5 |
59 | #define IWL200_UCODE_API_MIN 5 | 59 | #define IWL105_UCODE_API_MIN 5 |
60 | 60 | ||
61 | #define IWL2030_FW_PRE "iwlwifi-2030-" | 61 | #define IWL2030_FW_PRE "iwlwifi-2030-" |
62 | #define IWL2030_MODULE_FIRMWARE(api) IWL2030_FW_PRE #api ".ucode" | 62 | #define IWL2030_MODULE_FIRMWARE(api) IWL2030_FW_PRE #api ".ucode" |
@@ -64,8 +64,8 @@ | |||
64 | #define IWL2000_FW_PRE "iwlwifi-2000-" | 64 | #define IWL2000_FW_PRE "iwlwifi-2000-" |
65 | #define IWL2000_MODULE_FIRMWARE(api) IWL2000_FW_PRE #api ".ucode" | 65 | #define IWL2000_MODULE_FIRMWARE(api) IWL2000_FW_PRE #api ".ucode" |
66 | 66 | ||
67 | #define IWL200_FW_PRE "iwlwifi-200-" | 67 | #define IWL105_FW_PRE "iwlwifi-105-" |
68 | #define IWL200_MODULE_FIRMWARE(api) IWL200_FW_PRE #api ".ucode" | 68 | #define IWL105_MODULE_FIRMWARE(api) IWL105_FW_PRE #api ".ucode" |
69 | 69 | ||
70 | static void iwl2000_set_ct_threshold(struct iwl_priv *priv) | 70 | static void iwl2000_set_ct_threshold(struct iwl_priv *priv) |
71 | { | 71 | { |
@@ -312,13 +312,13 @@ static const struct iwl_ops iwl2030_ops = { | |||
312 | .utils = &iwlagn_hcmd_utils, | 312 | .utils = &iwlagn_hcmd_utils, |
313 | }; | 313 | }; |
314 | 314 | ||
315 | static const struct iwl_ops iwl200_ops = { | 315 | static const struct iwl_ops iwl105_ops = { |
316 | .lib = &iwl2000_lib, | 316 | .lib = &iwl2000_lib, |
317 | .hcmd = &iwlagn_hcmd, | 317 | .hcmd = &iwlagn_hcmd, |
318 | .utils = &iwlagn_hcmd_utils, | 318 | .utils = &iwlagn_hcmd_utils, |
319 | }; | 319 | }; |
320 | 320 | ||
321 | static const struct iwl_ops iwl230_ops = { | 321 | static const struct iwl_ops iwl135_ops = { |
322 | .lib = &iwl2000_lib, | 322 | .lib = &iwl2000_lib, |
323 | .hcmd = &iwlagn_bt_hcmd, | 323 | .hcmd = &iwlagn_bt_hcmd, |
324 | .utils = &iwlagn_hcmd_utils, | 324 | .utils = &iwlagn_hcmd_utils, |
@@ -429,13 +429,13 @@ struct iwl_cfg iwl2030_2bg_cfg = { | |||
429 | IWL_DEVICE_2030, | 429 | IWL_DEVICE_2030, |
430 | }; | 430 | }; |
431 | 431 | ||
432 | #define IWL_DEVICE_200 \ | 432 | #define IWL_DEVICE_105 \ |
433 | .fw_name_pre = IWL200_FW_PRE, \ | 433 | .fw_name_pre = IWL105_FW_PRE, \ |
434 | .ucode_api_max = IWL200_UCODE_API_MAX, \ | 434 | .ucode_api_max = IWL105_UCODE_API_MAX, \ |
435 | .ucode_api_min = IWL200_UCODE_API_MIN, \ | 435 | .ucode_api_min = IWL105_UCODE_API_MIN, \ |
436 | .eeprom_ver = EEPROM_2000_EEPROM_VERSION, \ | 436 | .eeprom_ver = EEPROM_2000_EEPROM_VERSION, \ |
437 | .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION, \ | 437 | .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION, \ |
438 | .ops = &iwl200_ops, \ | 438 | .ops = &iwl105_ops, \ |
439 | .mod_params = &iwlagn_mod_params, \ | 439 | .mod_params = &iwlagn_mod_params, \ |
440 | .base_params = &iwl2000_base_params, \ | 440 | .base_params = &iwl2000_base_params, \ |
441 | .need_dc_calib = true, \ | 441 | .need_dc_calib = true, \ |
@@ -444,24 +444,24 @@ struct iwl_cfg iwl2030_2bg_cfg = { | |||
444 | .adv_pm = true, \ | 444 | .adv_pm = true, \ |
445 | .rx_with_siso_diversity = true \ | 445 | .rx_with_siso_diversity = true \ |
446 | 446 | ||
447 | struct iwl_cfg iwl200_bg_cfg = { | 447 | struct iwl_cfg iwl105_bg_cfg = { |
448 | .name = "200 Series 1x1 BG", | 448 | .name = "105 Series 1x1 BG", |
449 | IWL_DEVICE_200, | 449 | IWL_DEVICE_105, |
450 | }; | 450 | }; |
451 | 451 | ||
452 | struct iwl_cfg iwl200_bgn_cfg = { | 452 | struct iwl_cfg iwl105_bgn_cfg = { |
453 | .name = "200 Series 1x1 BGN", | 453 | .name = "105 Series 1x1 BGN", |
454 | IWL_DEVICE_200, | 454 | IWL_DEVICE_105, |
455 | .ht_params = &iwl2000_ht_params, | 455 | .ht_params = &iwl2000_ht_params, |
456 | }; | 456 | }; |
457 | 457 | ||
458 | #define IWL_DEVICE_230 \ | 458 | #define IWL_DEVICE_135 \ |
459 | .fw_name_pre = IWL200_FW_PRE, \ | 459 | .fw_name_pre = IWL105_FW_PRE, \ |
460 | .ucode_api_max = IWL200_UCODE_API_MAX, \ | 460 | .ucode_api_max = IWL105_UCODE_API_MAX, \ |
461 | .ucode_api_min = IWL200_UCODE_API_MIN, \ | 461 | .ucode_api_min = IWL105_UCODE_API_MIN, \ |
462 | .eeprom_ver = EEPROM_2000_EEPROM_VERSION, \ | 462 | .eeprom_ver = EEPROM_2000_EEPROM_VERSION, \ |
463 | .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION, \ | 463 | .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION, \ |
464 | .ops = &iwl230_ops, \ | 464 | .ops = &iwl135_ops, \ |
465 | .mod_params = &iwlagn_mod_params, \ | 465 | .mod_params = &iwlagn_mod_params, \ |
466 | .base_params = &iwl2030_base_params, \ | 466 | .base_params = &iwl2030_base_params, \ |
467 | .bt_params = &iwl2030_bt_params, \ | 467 | .bt_params = &iwl2030_bt_params, \ |
@@ -471,17 +471,17 @@ struct iwl_cfg iwl200_bgn_cfg = { | |||
471 | .adv_pm = true, \ | 471 | .adv_pm = true, \ |
472 | .rx_with_siso_diversity = true \ | 472 | .rx_with_siso_diversity = true \ |
473 | 473 | ||
474 | struct iwl_cfg iwl230_bg_cfg = { | 474 | struct iwl_cfg iwl135_bg_cfg = { |
475 | .name = "200 Series 1x1 BG/BT", | 475 | .name = "105 Series 1x1 BG/BT", |
476 | IWL_DEVICE_230, | 476 | IWL_DEVICE_135, |
477 | }; | 477 | }; |
478 | 478 | ||
479 | struct iwl_cfg iwl230_bgn_cfg = { | 479 | struct iwl_cfg iwl135_bgn_cfg = { |
480 | .name = "200 Series 1x1 BGN/BT", | 480 | .name = "105 Series 1x1 BGN/BT", |
481 | IWL_DEVICE_230, | 481 | IWL_DEVICE_135, |
482 | .ht_params = &iwl2000_ht_params, | 482 | .ht_params = &iwl2000_ht_params, |
483 | }; | 483 | }; |
484 | 484 | ||
485 | MODULE_FIRMWARE(IWL2000_MODULE_FIRMWARE(IWL2000_UCODE_API_MAX)); | 485 | MODULE_FIRMWARE(IWL2000_MODULE_FIRMWARE(IWL2000_UCODE_API_MAX)); |
486 | MODULE_FIRMWARE(IWL2030_MODULE_FIRMWARE(IWL2030_UCODE_API_MAX)); | 486 | MODULE_FIRMWARE(IWL2030_MODULE_FIRMWARE(IWL2030_UCODE_API_MAX)); |
487 | MODULE_FIRMWARE(IWL200_MODULE_FIRMWARE(IWL200_UCODE_API_MAX)); | 487 | MODULE_FIRMWARE(IWL105_MODULE_FIRMWARE(IWL105_UCODE_API_MAX)); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 395d1ade39d..8232245b7b6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -4129,21 +4129,21 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { | |||
4129 | {IWL_PCI_DEVICE(0x088F, 0x4266, iwl6035_2bg_cfg)}, | 4129 | {IWL_PCI_DEVICE(0x088F, 0x4266, iwl6035_2bg_cfg)}, |
4130 | {IWL_PCI_DEVICE(0x088E, 0x4466, iwl6035_2bg_cfg)}, | 4130 | {IWL_PCI_DEVICE(0x088E, 0x4466, iwl6035_2bg_cfg)}, |
4131 | 4131 | ||
4132 | /* 200 Series */ | 4132 | /* 105 Series */ |
4133 | {IWL_PCI_DEVICE(0x0894, 0x0022, iwl200_bgn_cfg)}, | 4133 | {IWL_PCI_DEVICE(0x0894, 0x0022, iwl105_bgn_cfg)}, |
4134 | {IWL_PCI_DEVICE(0x0895, 0x0222, iwl200_bgn_cfg)}, | 4134 | {IWL_PCI_DEVICE(0x0895, 0x0222, iwl105_bgn_cfg)}, |
4135 | {IWL_PCI_DEVICE(0x0894, 0x0422, iwl200_bgn_cfg)}, | 4135 | {IWL_PCI_DEVICE(0x0894, 0x0422, iwl105_bgn_cfg)}, |
4136 | {IWL_PCI_DEVICE(0x0894, 0x0026, iwl200_bg_cfg)}, | 4136 | {IWL_PCI_DEVICE(0x0894, 0x0026, iwl105_bg_cfg)}, |
4137 | {IWL_PCI_DEVICE(0x0895, 0x0226, iwl200_bg_cfg)}, | 4137 | {IWL_PCI_DEVICE(0x0895, 0x0226, iwl105_bg_cfg)}, |
4138 | {IWL_PCI_DEVICE(0x0894, 0x0426, iwl200_bg_cfg)}, | 4138 | {IWL_PCI_DEVICE(0x0894, 0x0426, iwl105_bg_cfg)}, |
4139 | 4139 | ||
4140 | /* 230 Series */ | 4140 | /* 135 Series */ |
4141 | {IWL_PCI_DEVICE(0x0892, 0x0062, iwl230_bgn_cfg)}, | 4141 | {IWL_PCI_DEVICE(0x0892, 0x0062, iwl135_bgn_cfg)}, |
4142 | {IWL_PCI_DEVICE(0x0893, 0x0262, iwl230_bgn_cfg)}, | 4142 | {IWL_PCI_DEVICE(0x0893, 0x0262, iwl135_bgn_cfg)}, |
4143 | {IWL_PCI_DEVICE(0x0892, 0x0462, iwl230_bgn_cfg)}, | 4143 | {IWL_PCI_DEVICE(0x0892, 0x0462, iwl135_bgn_cfg)}, |
4144 | {IWL_PCI_DEVICE(0x0892, 0x0066, iwl230_bg_cfg)}, | 4144 | {IWL_PCI_DEVICE(0x0892, 0x0066, iwl135_bg_cfg)}, |
4145 | {IWL_PCI_DEVICE(0x0893, 0x0266, iwl230_bg_cfg)}, | 4145 | {IWL_PCI_DEVICE(0x0893, 0x0266, iwl135_bg_cfg)}, |
4146 | {IWL_PCI_DEVICE(0x0892, 0x0466, iwl230_bg_cfg)}, | 4146 | {IWL_PCI_DEVICE(0x0892, 0x0466, iwl135_bg_cfg)}, |
4147 | 4147 | ||
4148 | {0} | 4148 | {0} |
4149 | }; | 4149 | }; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h index 7d8e16ec608..9d644d413b4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.h +++ b/drivers/net/wireless/iwlwifi/iwl-agn.h | |||
@@ -102,10 +102,10 @@ extern struct iwl_cfg iwl2030_2bg_cfg; | |||
102 | extern struct iwl_cfg iwl6035_2agn_cfg; | 102 | extern struct iwl_cfg iwl6035_2agn_cfg; |
103 | extern struct iwl_cfg iwl6035_2abg_cfg; | 103 | extern struct iwl_cfg iwl6035_2abg_cfg; |
104 | extern struct iwl_cfg iwl6035_2bg_cfg; | 104 | extern struct iwl_cfg iwl6035_2bg_cfg; |
105 | extern struct iwl_cfg iwl200_bg_cfg; | 105 | extern struct iwl_cfg iwl105_bg_cfg; |
106 | extern struct iwl_cfg iwl200_bgn_cfg; | 106 | extern struct iwl_cfg iwl105_bgn_cfg; |
107 | extern struct iwl_cfg iwl230_bg_cfg; | 107 | extern struct iwl_cfg iwl135_bg_cfg; |
108 | extern struct iwl_cfg iwl230_bgn_cfg; | 108 | extern struct iwl_cfg iwl135_bgn_cfg; |
109 | 109 | ||
110 | extern struct iwl_mod_params iwlagn_mod_params; | 110 | extern struct iwl_mod_params iwlagn_mod_params; |
111 | extern struct iwl_hcmd_ops iwlagn_hcmd; | 111 | extern struct iwl_hcmd_ops iwlagn_hcmd; |