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

Commit fee1247a authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: move driver status inliners into iwl-core.h 



This patch moves inline functions into iwl-core.h

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 12a81f60

drivers/net/wireless/iwlwifi/iwl-4965.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -39,8 +39,8 @@ 
#include <asm/unaligned.h>

#include <asm/unaligned.h>





#include "iwl-eeprom.h"

#include "iwl-eeprom.h"

#include "iwl-core.h"

#include "iwl-4965.h"

#include "iwl-4965.h"

#include "iwl-core.h"

#include "iwl-io.h"

#include "iwl-io.h"

#include "iwl-helpers.h"

#include "iwl-helpers.h"

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

+0 −20
Original line number Original line Diff line number Diff line
@@ -414,26 +414,6 @@ struct iwl4965_rx_queue { 
#define MAX_B_CHANNELS  14

#define MAX_B_CHANNELS  14

#define MIN_B_CHANNELS  1

#define MIN_B_CHANNELS  1





#define STATUS_HCMD_ACTIVE	0	/* host command in progress */

#define STATUS_HCMD_SYNC_ACTIVE	1	/* sync host command in progress */

#define STATUS_INT_ENABLED	2

#define STATUS_RF_KILL_HW	3

#define STATUS_RF_KILL_SW	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_IN_SUSPEND	11

#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_CONF_PENDING	18



#define MAX_TID_COUNT        9

#define MAX_TID_COUNT        9





#define IWL_INVALID_RATE     0xFF

#define IWL_INVALID_RATE     0xFF

drivers/net/wireless/iwlwifi/iwl-core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -34,10 +34,10 @@ 
struct iwl_priv; /* FIXME: remove */

struct iwl_priv; /* FIXME: remove */

#include "iwl-debug.h"

#include "iwl-debug.h"

#include "iwl-eeprom.h"

#include "iwl-eeprom.h"

#include "iwl-4965.h" /* FIXME: remove */

#include "iwl-core.h"

#include "iwl-core.h"

#include "iwl-rfkill.h"

#include "iwl-rfkill.h"





#include "iwl-4965.h" /* FIXME: remove */





MODULE_DESCRIPTION("iwl core");

MODULE_DESCRIPTION("iwl core");

MODULE_VERSION(IWLWIFI_VERSION);

MODULE_VERSION(IWLWIFI_VERSION);

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

+57 −0
Original line number Original line Diff line number Diff line
@@ -148,6 +148,63 @@ int iwl_send_cmd_pdu_async(struct iwl_priv *priv, u8 id, u16 len, 
			   int (*callback)(struct iwl_priv *priv,

			   int (*callback)(struct iwl_priv *priv,

					   struct iwl_cmd *cmd,

					   struct iwl_cmd *cmd,

					   struct sk_buff *skb));

					   struct sk_buff *skb));

/*************** DRIVER STATUS FUNCTIONS   *****/



#define STATUS_HCMD_ACTIVE	0	/* host command in progress */

#define STATUS_HCMD_SYNC_ACTIVE	1	/* sync host command in progress */

#define STATUS_INT_ENABLED	2

#define STATUS_RF_KILL_HW	3

#define STATUS_RF_KILL_SW	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_IN_SUSPEND	11

#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_CONF_PENDING	18





static inline int iwl_is_ready(struct iwl_priv *priv)

{

	/* The adapter is 'ready' if READY and GEO_CONFIGURED bits are

	 * set but EXIT_PENDING is not */

	return test_bit(STATUS_READY, &priv->status) &&

	       test_bit(STATUS_GEO_CONFIGURED, &priv->status) &&

	       !test_bit(STATUS_EXIT_PENDING, &priv->status);

}



static inline int iwl_is_alive(struct iwl_priv *priv)

{

	return test_bit(STATUS_ALIVE, &priv->status);

}



static inline int iwl_is_init(struct iwl_priv *priv)

{

	return test_bit(STATUS_INIT, &priv->status);

}



static inline int iwl_is_rfkill(struct iwl_priv *priv)

{

	return test_bit(STATUS_RF_KILL_HW, &priv->status) ||

	       test_bit(STATUS_RF_KILL_SW, &priv->status);

}



static inline int iwl_is_ready_rf(struct iwl_priv *priv)

{



	if (iwl_is_rfkill(priv))

		return 0;



	return iwl_is_ready(priv);

}







enum iwlcore_card_notify {

enum iwlcore_card_notify {

	IWLCORE_INIT_EVT = 0,

	IWLCORE_INIT_EVT = 0,

drivers/net/wireless/iwlwifi/iwl-debugfs.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ 




#include "iwl-4965.h"

#include "iwl-4965.h"

#include "iwl-debug.h"

#include "iwl-debug.h"

#include "iwl-core.h"

#include "iwl-io.h"

#include "iwl-io.h"