mirror of
https://github.com/torvalds/linux.git
synced 2024-12-24 11:51:27 +00:00
iwlwifi: move status definitions from iwl-shared
The code has been changed, move the definitions to the proper file being used by the code. Signed-off-by: Don Fry <donald.h.fry@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
This commit is contained in:
parent
f8c6c6b56f
commit
01d651d4b7
@ -82,6 +82,24 @@ extern struct iwl_lib_ops iwl6030_lib;
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*****************************************************
|
||||||
|
* DRIVER STATUS FUNCTIONS
|
||||||
|
******************************************************/
|
||||||
|
#define STATUS_RF_KILL_HW 0
|
||||||
|
#define STATUS_CT_KILL 1
|
||||||
|
#define STATUS_ALIVE 2
|
||||||
|
#define STATUS_READY 3
|
||||||
|
#define STATUS_GEO_CONFIGURED 4
|
||||||
|
#define STATUS_EXIT_PENDING 5
|
||||||
|
#define STATUS_STATISTICS 6
|
||||||
|
#define STATUS_SCANNING 7
|
||||||
|
#define STATUS_SCAN_ABORTING 8
|
||||||
|
#define STATUS_SCAN_HW 9
|
||||||
|
#define STATUS_FW_ERROR 10
|
||||||
|
#define STATUS_CHANNEL_SWITCH_PENDING 11
|
||||||
|
#define STATUS_SCAN_COMPLETE 12
|
||||||
|
#define STATUS_POWER_PMI 13
|
||||||
|
|
||||||
struct iwl_ucode_capabilities;
|
struct iwl_ucode_capabilities;
|
||||||
|
|
||||||
extern struct ieee80211_ops iwlagn_hw_ops;
|
extern struct ieee80211_ops iwlagn_hw_ops;
|
||||||
|
@ -185,28 +185,4 @@ const char *get_cmd_string(u8 cmd);
|
|||||||
|
|
||||||
#define IWL_CMD(x) case x: return #x
|
#define IWL_CMD(x) case x: return #x
|
||||||
|
|
||||||
/*****************************************************
|
|
||||||
* DRIVER STATUS FUNCTIONS
|
|
||||||
******************************************************/
|
|
||||||
#define STATUS_HCMD_ACTIVE 0 /* host command in progress */
|
|
||||||
/* 1 is unused (used to be STATUS_HCMD_SYNC_ACTIVE) */
|
|
||||||
#define STATUS_INT_ENABLED 2
|
|
||||||
#define STATUS_RF_KILL_HW 3
|
|
||||||
#define STATUS_CT_KILL 4
|
|
||||||
#define STATUS_INIT 5
|
|
||||||
#define STATUS_ALIVE 6
|
|
||||||
#define STATUS_READY 7
|
|
||||||
#define STATUS_TEMPERATURE 8
|
|
||||||
#define STATUS_GEO_CONFIGURED 9
|
|
||||||
#define STATUS_EXIT_PENDING 10
|
|
||||||
#define STATUS_STATISTICS 12
|
|
||||||
#define STATUS_SCANNING 13
|
|
||||||
#define STATUS_SCAN_ABORTING 14
|
|
||||||
#define STATUS_SCAN_HW 15
|
|
||||||
#define STATUS_POWER_PMI 16
|
|
||||||
#define STATUS_FW_ERROR 17
|
|
||||||
#define STATUS_DEVICE_ENABLED 18
|
|
||||||
#define STATUS_CHANNEL_SWITCH_PENDING 19
|
|
||||||
#define STATUS_SCAN_COMPLETE 20
|
|
||||||
|
|
||||||
#endif /* #__iwl_shared_h__ */
|
#endif /* #__iwl_shared_h__ */
|
||||||
|
@ -278,6 +278,14 @@ struct iwl_trans_pcie {
|
|||||||
unsigned long wd_timeout;
|
unsigned long wd_timeout;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/*****************************************************
|
||||||
|
* DRIVER STATUS FUNCTIONS
|
||||||
|
******************************************************/
|
||||||
|
#define STATUS_HCMD_ACTIVE 0
|
||||||
|
#define STATUS_DEVICE_ENABLED 1
|
||||||
|
#define STATUS_TPOWER_PMI 2
|
||||||
|
#define STATUS_INT_ENABLED 3
|
||||||
|
|
||||||
#define IWL_TRANS_GET_PCIE_TRANS(_iwl_trans) \
|
#define IWL_TRANS_GET_PCIE_TRANS(_iwl_trans) \
|
||||||
((struct iwl_trans_pcie *) ((_iwl_trans)->trans_specific))
|
((struct iwl_trans_pcie *) ((_iwl_trans)->trans_specific))
|
||||||
|
|
||||||
|
@ -150,7 +150,7 @@ void iwl_rx_queue_update_write_ptr(struct iwl_trans *trans,
|
|||||||
IWL_TRANS_GET_PCIE_TRANS(trans);
|
IWL_TRANS_GET_PCIE_TRANS(trans);
|
||||||
|
|
||||||
/* If power-saving is in use, make sure device is awake */
|
/* If power-saving is in use, make sure device is awake */
|
||||||
if (test_bit(STATUS_POWER_PMI, &trans_pcie->status)) {
|
if (test_bit(STATUS_TPOWER_PMI, &trans_pcie->status)) {
|
||||||
reg = iwl_read32(trans, CSR_UCODE_DRV_GP1);
|
reg = iwl_read32(trans, CSR_UCODE_DRV_GP1);
|
||||||
|
|
||||||
if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {
|
if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {
|
||||||
|
@ -107,7 +107,7 @@ void iwl_txq_update_write_ptr(struct iwl_trans *trans, struct iwl_tx_queue *txq)
|
|||||||
struct iwl_trans_pcie *trans_pcie =
|
struct iwl_trans_pcie *trans_pcie =
|
||||||
IWL_TRANS_GET_PCIE_TRANS(trans);
|
IWL_TRANS_GET_PCIE_TRANS(trans);
|
||||||
/* if we're trying to save power */
|
/* if we're trying to save power */
|
||||||
if (test_bit(STATUS_POWER_PMI, &trans_pcie->status)) {
|
if (test_bit(STATUS_TPOWER_PMI, &trans_pcie->status)) {
|
||||||
/* wake up nic if it's powered down ...
|
/* wake up nic if it's powered down ...
|
||||||
* uCode will wake up, and interrupt us again, so next
|
* uCode will wake up, and interrupt us again, so next
|
||||||
* time we'll skip this part. */
|
* time we'll skip this part. */
|
||||||
|
@ -1253,7 +1253,7 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
|
|||||||
clear_bit(STATUS_HCMD_ACTIVE, &trans_pcie->status);
|
clear_bit(STATUS_HCMD_ACTIVE, &trans_pcie->status);
|
||||||
clear_bit(STATUS_INT_ENABLED, &trans_pcie->status);
|
clear_bit(STATUS_INT_ENABLED, &trans_pcie->status);
|
||||||
clear_bit(STATUS_DEVICE_ENABLED, &trans_pcie->status);
|
clear_bit(STATUS_DEVICE_ENABLED, &trans_pcie->status);
|
||||||
clear_bit(STATUS_POWER_PMI, &trans_pcie->status);
|
clear_bit(STATUS_TPOWER_PMI, &trans_pcie->status);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void iwl_trans_pcie_wowlan_suspend(struct iwl_trans *trans)
|
static void iwl_trans_pcie_wowlan_suspend(struct iwl_trans *trans)
|
||||||
@ -1574,9 +1574,9 @@ static void iwl_trans_pcie_set_pmi(struct iwl_trans *trans, bool state)
|
|||||||
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
|
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
|
||||||
|
|
||||||
if (state)
|
if (state)
|
||||||
set_bit(STATUS_POWER_PMI, &trans_pcie->status);
|
set_bit(STATUS_TPOWER_PMI, &trans_pcie->status);
|
||||||
else
|
else
|
||||||
clear_bit(STATUS_POWER_PMI, &trans_pcie->status);
|
clear_bit(STATUS_TPOWER_PMI, &trans_pcie->status);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PM_SLEEP
|
#ifdef CONFIG_PM_SLEEP
|
||||||
|
Loading…
Reference in New Issue
Block a user