From: Tomas Winkler <tomas.winkler@intel.com>
To: linville@tuxdriver.com, yi.zhu@intel.com, johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org, Ben Cahill <ben.m.cahill@intel.com>
Subject: [PATCH 16/34] iwlwifi: Clean up unused definitions in iwl-3945-hw.h
Date: Mon, 3 Dec 2007 13:43:28 +0200 [thread overview]
Message-ID: <1196682231211-git-send-email-tomas.winkler@intel.com> (raw)
In-Reply-To: <1196682230754-git-send-email-tomas.winkler@intel.com>
From: Ben Cahill <ben.m.cahill@intel.com>
Clean up unused definitions in iwl-3945-hw.h
Signed-off-by: Ben Cahill <ben.m.cahill@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
---
drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 130 +---------------------------
1 files changed, 1 insertions(+), 129 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
index 6e961ac..b63cd72 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
@@ -102,10 +102,6 @@
#define IWL_EEPROM_ACCESS_TIMEOUT 5000 /* uSec */
#define IWL_EEPROM_ACCESS_DELAY 10 /* uSec */
-/* EEPROM field values */
-#define ANTENNA_SWITCH_NORMAL 0
-#define ANTENNA_SWITCH_INVERSE 1
-
/*
* Regulatory channel usage flags in EEPROM struct iwl_eeprom_channel.flags.
*
@@ -127,31 +123,10 @@ enum {
EEPROM_CHANNEL_ACTIVE = (1 << 3), /* active scanning allowed */
EEPROM_CHANNEL_RADAR = (1 << 4), /* radar detection required */
EEPROM_CHANNEL_WIDE = (1 << 5), /* 20 MHz channel okay */
- EEPROM_CHANNEL_NARROW = (1 << 6), /* 10 MHz channel, not used */
+ EEPROM_CHANNEL_NARROW = (1 << 6), /* 10 MHz channel (not used) */
EEPROM_CHANNEL_DFS = (1 << 7), /* dynamic freq selection candidate */
};
-/* EEPROM field lengths */
-#define EEPROM_BOARD_PBA_NUMBER_LENGTH 11
-
-/* EEPROM field lengths */
-#define EEPROM_BOARD_PBA_NUMBER_LENGTH 11
-#define EEPROM_REGULATORY_SKU_ID_LENGTH 4
-#define EEPROM_REGULATORY_BAND1_CHANNELS_LENGTH 14
-#define EEPROM_REGULATORY_BAND2_CHANNELS_LENGTH 13
-#define EEPROM_REGULATORY_BAND3_CHANNELS_LENGTH 12
-#define EEPROM_REGULATORY_BAND4_CHANNELS_LENGTH 11
-#define EEPROM_REGULATORY_BAND5_CHANNELS_LENGTH 6
-
-#define EEPROM_REGULATORY_CHANNELS_LENGTH ( \
- EEPROM_REGULATORY_BAND1_CHANNELS_LENGTH + \
- EEPROM_REGULATORY_BAND2_CHANNELS_LENGTH + \
- EEPROM_REGULATORY_BAND3_CHANNELS_LENGTH + \
- EEPROM_REGULATORY_BAND4_CHANNELS_LENGTH + \
- EEPROM_REGULATORY_BAND5_CHANNELS_LENGTH)
-
-#define EEPROM_REGULATORY_NUMBER_OF_BANDS 5
-
/* SKU Capabilities */
#define EEPROM_SKU_CAP_SW_RF_KILL_ENABLE (1 << 0)
#define EEPROM_SKU_CAP_HW_RF_KILL_ENABLE (1 << 1)
@@ -646,15 +621,7 @@ struct iwl3945_eeprom {
/* spectrum and channel data structures */
#define IWL_NUM_SCAN_RATES (2)
-#define IWL_SCAN_FLAG_24GHZ (1<<0)
-#define IWL_SCAN_FLAG_52GHZ (1<<1)
-#define IWL_SCAN_FLAG_ACTIVE (1<<2)
-#define IWL_SCAN_FLAG_DIRECT (1<<3)
-
-#define IWL_MAX_CMD_SIZE 1024
-
#define IWL_DEFAULT_TX_RETRY 15
-#define IWL_MAX_TX_RETRY 16
/*********************************************/
@@ -665,101 +632,6 @@ struct iwl3945_eeprom {
#define RX_QUEUE_MASK 255
#define RX_QUEUE_SIZE_LOG 8
-/* QoS definitions */
-
-#define CW_MIN_OFDM 15
-#define CW_MAX_OFDM 1023
-#define CW_MIN_CCK 31
-#define CW_MAX_CCK 1023
-
-#define QOS_TX0_CW_MIN_OFDM CW_MIN_OFDM
-#define QOS_TX1_CW_MIN_OFDM CW_MIN_OFDM
-#define QOS_TX2_CW_MIN_OFDM ((CW_MIN_OFDM + 1) / 2 - 1)
-#define QOS_TX3_CW_MIN_OFDM ((CW_MIN_OFDM + 1) / 4 - 1)
-
-#define QOS_TX0_CW_MIN_CCK CW_MIN_CCK
-#define QOS_TX1_CW_MIN_CCK CW_MIN_CCK
-#define QOS_TX2_CW_MIN_CCK ((CW_MIN_CCK + 1) / 2 - 1)
-#define QOS_TX3_CW_MIN_CCK ((CW_MIN_CCK + 1) / 4 - 1)
-
-#define QOS_TX0_CW_MAX_OFDM CW_MAX_OFDM
-#define QOS_TX1_CW_MAX_OFDM CW_MAX_OFDM
-#define QOS_TX2_CW_MAX_OFDM CW_MIN_OFDM
-#define QOS_TX3_CW_MAX_OFDM ((CW_MIN_OFDM + 1) / 2 - 1)
-
-#define QOS_TX0_CW_MAX_CCK CW_MAX_CCK
-#define QOS_TX1_CW_MAX_CCK CW_MAX_CCK
-#define QOS_TX2_CW_MAX_CCK CW_MIN_CCK
-#define QOS_TX3_CW_MAX_CCK ((CW_MIN_CCK + 1) / 2 - 1)
-
-#define QOS_TX0_AIFS 3
-#define QOS_TX1_AIFS 7
-#define QOS_TX2_AIFS 2
-#define QOS_TX3_AIFS 2
-
-#define QOS_TX0_ACM 0
-#define QOS_TX1_ACM 0
-#define QOS_TX2_ACM 0
-#define QOS_TX3_ACM 0
-
-#define QOS_TX0_TXOP_LIMIT_CCK 0
-#define QOS_TX1_TXOP_LIMIT_CCK 0
-#define QOS_TX2_TXOP_LIMIT_CCK 6016
-#define QOS_TX3_TXOP_LIMIT_CCK 3264
-
-#define QOS_TX0_TXOP_LIMIT_OFDM 0
-#define QOS_TX1_TXOP_LIMIT_OFDM 0
-#define QOS_TX2_TXOP_LIMIT_OFDM 3008
-#define QOS_TX3_TXOP_LIMIT_OFDM 1504
-
-#define DEF_TX0_CW_MIN_OFDM CW_MIN_OFDM
-#define DEF_TX1_CW_MIN_OFDM CW_MIN_OFDM
-#define DEF_TX2_CW_MIN_OFDM CW_MIN_OFDM
-#define DEF_TX3_CW_MIN_OFDM CW_MIN_OFDM
-
-#define DEF_TX0_CW_MIN_CCK CW_MIN_CCK
-#define DEF_TX1_CW_MIN_CCK CW_MIN_CCK
-#define DEF_TX2_CW_MIN_CCK CW_MIN_CCK
-#define DEF_TX3_CW_MIN_CCK CW_MIN_CCK
-
-#define DEF_TX0_CW_MAX_OFDM CW_MAX_OFDM
-#define DEF_TX1_CW_MAX_OFDM CW_MAX_OFDM
-#define DEF_TX2_CW_MAX_OFDM CW_MAX_OFDM
-#define DEF_TX3_CW_MAX_OFDM CW_MAX_OFDM
-
-#define DEF_TX0_CW_MAX_CCK CW_MAX_CCK
-#define DEF_TX1_CW_MAX_CCK CW_MAX_CCK
-#define DEF_TX2_CW_MAX_CCK CW_MAX_CCK
-#define DEF_TX3_CW_MAX_CCK CW_MAX_CCK
-
-#define DEF_TX0_AIFS (2)
-#define DEF_TX1_AIFS (2)
-#define DEF_TX2_AIFS (2)
-#define DEF_TX3_AIFS (2)
-
-#define DEF_TX0_ACM 0
-#define DEF_TX1_ACM 0
-#define DEF_TX2_ACM 0
-#define DEF_TX3_ACM 0
-
-#define DEF_TX0_TXOP_LIMIT_CCK 0
-#define DEF_TX1_TXOP_LIMIT_CCK 0
-#define DEF_TX2_TXOP_LIMIT_CCK 0
-#define DEF_TX3_TXOP_LIMIT_CCK 0
-
-#define DEF_TX0_TXOP_LIMIT_OFDM 0
-#define DEF_TX1_TXOP_LIMIT_OFDM 0
-#define DEF_TX2_TXOP_LIMIT_OFDM 0
-#define DEF_TX3_TXOP_LIMIT_OFDM 0
-
-#define QOS_QOS_SETS 3
-#define QOS_PARAM_SET_ACTIVE 0
-#define QOS_PARAM_SET_DEF_CCK 1
-#define QOS_PARAM_SET_DEF_OFDM 2
-
-#define CTRL_QOS_NO_ACK (0x0020)
-#define DCT_FLAG_EXT_QOS_ENABLED (0x10)
-
#define U32_PAD(n) ((4-(n))&0x3)
/*
--
1.5.2.2
---------------------------------------------------------------------
Intel Israel (74) Limited
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
next prev parent reply other threads:[~2007-12-03 11:45 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-03 11:43 [PATCH 0/34 V2] iwlwifi (version 1.1.22) Tomas Winkler
2007-12-03 11:43 ` [PATCH 01/34] iwlwifi: Support for uCode without init and bsm section Tomas Winkler
2007-12-03 11:43 ` [PATCH 02/34] iwlwifi: continue namespace changes - fix CONFIG variables Tomas Winkler
2007-12-03 11:43 ` [PATCH 03/34] iwl3945: re-align 3945 event log data Tomas Winkler
2007-12-03 11:43 ` [PATCH 04/34] iwl4965: add comments to rate scaling code Tomas Winkler
2007-12-03 11:43 ` [PATCH 05/34] iwlwifi: add comments to EEPROM stuff Tomas Winkler
2007-12-03 11:43 ` [PATCH 06/34] iwl-4965-hw.h: clean up unused eeprom structures and definitions Tomas Winkler
2007-12-03 11:43 ` [PATCH 07/34] iwlwifi: clean up and clarify some comments after 3945/4965 split Tomas Winkler
2007-12-03 11:43 ` [PATCH 08/34] iwlwifi: Move is_legacy() macro family from iwl-4965-hw.h to iwl-4965-rs.h Tomas Winkler
2007-12-03 11:43 ` [PATCH 09/34] iwlwifi: Add comments to some driver data structures Tomas Winkler
2007-12-03 11:43 ` [PATCH 10/34] iwlwifi: Document 4965 rate_n_flags bits Tomas Winkler
2007-12-03 11:43 ` [PATCH 11/34] iwlwifi: Document Rx calibration Tomas Winkler
2007-12-03 11:43 ` [PATCH 12/34] iwlwifi: Partially clean-up, add comments to iwl-*-hw.h Tomas Winkler
2007-12-03 11:43 ` [PATCH 13/34] iwlwifi: clean up some unused definitions in iwl-4965.h and iwl-3945.h Tomas Winkler
2007-12-03 11:43 ` [PATCH 14/34] iwlwifi: add comments, mostly on Tx queues Tomas Winkler
2007-12-03 11:43 ` [PATCH 15/34] iwlwifi: add comments to iwl*-base.c Tomas Winkler
2007-12-03 11:43 ` Tomas Winkler [this message]
2007-12-03 11:43 ` [PATCH 17/34] iwlwifi: clean up unused definitions in iwl-4965-hw.h Tomas Winkler
2007-12-03 11:43 ` [PATCH 18/34] iwlwifi: move uCode API definitions to iwl-4965-commands.h Tomas Winkler
2007-12-03 11:43 ` [PATCH 19/34] iwlwifi: move HT_IE_EXT_CHANNEL_* driver definitions to iwl-4965.h Tomas Winkler
2007-12-03 11:43 ` [PATCH 20/34] iwlwifi: document temperature calculation Tomas Winkler
2007-12-03 11:43 ` [PATCH 21/34] iwlwifi: document txpower calculations Tomas Winkler
2007-12-03 11:43 ` [PATCH 22/34] iwlwifi: document keep-warm buffer Tomas Winkler
2007-12-03 11:43 ` [PATCH 23/34] iwlwifi: document Rx registers Tomas Winkler
2007-12-03 11:43 ` [PATCH 24/34] iwlwifi: document shared Tx structures Tomas Winkler
2007-12-03 11:43 ` [PATCH 25/34] iwlwifi: document 4965 Tx scheduler Tomas Winkler
2007-12-03 11:43 ` [PATCH 26/34] iwlwifi: document command header and "alive" responses Tomas Winkler
2007-12-03 11:43 ` [PATCH 27/34] iwlwifi: add comments to RXON command and txpower formats Tomas Winkler
2007-12-03 11:43 ` [PATCH 28/34] iwlwifi: add comments to QOS and ADD_STA commands Tomas Winkler
2007-12-03 11:43 ` [PATCH 29/34] iwlwifi: add comments to Tx commands Tomas Winkler
2007-12-03 11:43 ` [PATCH 30/34] iwlwifi: document 4965 rate scaling Tomas Winkler
2007-12-03 11:43 ` [PATCH 31/34] iwlwifi: enhance WPA authenication stability Tomas Winkler
2007-12-03 11:43 ` [PATCH 32/34] iwlwifi: fix ucode assertion for RX queue overrun Tomas Winkler
2007-12-03 11:43 ` [PATCH 33/34] iwlwifi: avoid firmware command sending if rfkill is enabled Tomas Winkler
2007-12-03 11:43 ` [PATCH 34/34] iwlwifi: update version number to 1.2.22 Tomas Winkler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1196682231211-git-send-email-tomas.winkler@intel.com \
--to=tomas.winkler@intel.com \
--cc=ben.m.cahill@intel.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=yi.zhu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).