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

Commit b744cb79 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by Reinette Chatre
Browse files

iwlwifi: code cleanup for generic defines 



Some defines used by all agn devices, but the definitions were in
iwl-4965-hw.h, move those to iwl-agn-hw.h which is the better place for
those.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent d34a5a62

drivers/net/wireless/iwlwifi/iwl-3945-hw.h

+0 −5
Original line number Diff line number Diff line
@@ -71,10 +71,6 @@ 


#include "iwl-eeprom.h"



/* Time constants */

#define SHORT_SLOT_TIME 9

#define LONG_SLOT_TIME 20



/* RSSI to dBm */

#define IWL39_RSSI_OFFSET	95
@@ -230,7 +226,6 @@ struct iwl3945_eeprom { 


/* 4 DATA + 1 CMD. There are 2 HCCA queues that are not used. */

#define IWL39_NUM_QUEUES        5

#define IWL_NUM_SCAN_RATES         (2)



#define IWL_DEFAULT_TX_RETRY  15

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

+0 −24
Original line number Diff line number Diff line
@@ -81,26 +81,6 @@ 
 */

#define IWL49_FIRST_AMPDU_QUEUE	7



/* Time constants */

#define SHORT_SLOT_TIME 9

#define LONG_SLOT_TIME 20



/* RSSI to dBm */

#define IWL49_RSSI_OFFSET	44





/* PCI registers */

#define PCI_CFG_RETRY_TIMEOUT	0x041



/* PCI register values */

#define PCI_CFG_LINK_CTRL_VAL_L0S_EN	0x01

#define PCI_CFG_LINK_CTRL_VAL_L1_EN	0x02



#define IWL_NUM_SCAN_RATES         (2)



#define IWL_DEFAULT_TX_RETRY  15





/* Sizes and addresses for instruction and data memory (SRAM) in

 * 4965's embedded processor.  Driver access is via HBUS_TARG_MEM_* regs. */

#define IWL49_RTC_INST_LOWER_BOUND		(0x000000)
@@ -393,10 +373,6 @@ static inline int iwl4965_hw_valid_rtc_data_addr(u32 addr) 
 *     location(s) in command (struct iwl4965_txpowertable_cmd).

 */



/* Limit range of txpower output target to be between these values */

#define IWL_TX_POWER_TARGET_POWER_MIN       (0)	/* 0 dBm = 1 milliwatt */

#define IWL_TX_POWER_TARGET_POWER_MAX      (16)	/* 16 dBm */



/**

 * When MIMO is used (2 transmitters operating simultaneously), driver should

 * limit each transmitter to deliver a max of 3 dB below the regulatory limit

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

+1 −1
Original line number Diff line number Diff line
@@ -2086,7 +2086,7 @@ static int iwl4965_calc_rssi(struct iwl_priv *priv, 


	/* dBm = max_rssi dB - agc dB - constant.

	 * Higher AGC (higher radio gain) means lower signal. */

	return max_rssi - agc - IWL49_RSSI_OFFSET;

	return max_rssi - agc - IWLAGN_RSSI_OFFSET;

}

drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static int iwlagn_calc_rssi(struct iwl_priv *priv, 


	/* dBm = max_rssi dB - agc dB - constant.

	 * Higher AGC (higher radio gain) means lower signal. */

	return max_rssi - agc - IWL49_RSSI_OFFSET;

	return max_rssi - agc - IWLAGN_RSSI_OFFSET;

}



struct iwl_hcmd_ops iwlagn_hcmd = {

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

+16 −0
Original line number Diff line number Diff line
@@ -78,6 +78,22 @@ 
#define IWLAGN_RTC_DATA_SIZE (IWLAGN_RTC_DATA_UPPER_BOUND - \

				IWLAGN_RTC_DATA_LOWER_BOUND)



/* RSSI to dBm */

#define IWLAGN_RSSI_OFFSET	44



/* PCI registers */

#define PCI_CFG_RETRY_TIMEOUT	0x041



/* PCI register values */

#define PCI_CFG_LINK_CTRL_VAL_L0S_EN	0x01

#define PCI_CFG_LINK_CTRL_VAL_L1_EN	0x02



#define IWLAGN_DEFAULT_TX_RETRY  15



/* Limit range of txpower output target to be between these values */

#define IWLAGN_TX_POWER_TARGET_POWER_MIN	(0)	/* 0 dBm: 1 milliwatt */

#define IWLAGN_TX_POWER_TARGET_POWER_MAX	(16)	/* 16 dBm */



/* EEPROM */

#define IWLAGN_EEPROM_IMG_SIZE		2048