Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01d651d4 authored by Don Fry's avatar Don Fry Committed by Wey-Yi Guy
Browse files

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: default avatarDon Fry <donald.h.fry@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent f8c6c6b5

drivers/net/wireless/iwlwifi/iwl-agn.h

+18 −0
Original line number Diff line number Diff line
@@ -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;



extern struct ieee80211_ops iwlagn_hw_ops;

drivers/net/wireless/iwlwifi/iwl-shared.h

+0 −24
Original line number Diff line number Diff line
@@ -185,28 +185,4 @@ const char *get_cmd_string(u8 cmd); 


#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__ */

drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h

+8 −0
Original line number Diff line number Diff line
@@ -278,6 +278,14 @@ struct iwl_trans_pcie { 
	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) \

	((struct iwl_trans_pcie *) ((_iwl_trans)->trans_specific))

drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ void iwl_rx_queue_update_write_ptr(struct iwl_trans *trans, 
			IWL_TRANS_GET_PCIE_TRANS(trans);



		/* 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);



			if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {

drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c

+1 −1
Original line number Diff line number Diff line
@@ -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 =

			IWL_TRANS_GET_PCIE_TRANS(trans);

		/* 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 ...

			 * uCode will wake up, and interrupt us again, so next

			 * time we'll skip this part. */