aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ipw2200.h
diff options
context:
space:
mode:
authorZhu Yi <yi.zhu@intel.com>2006-01-24 03:37:52 -0500
committerJohn W. Linville <linville@tuxdriver.com>2006-01-30 20:35:34 -0500
commit2638bc394195f27801d1c184c4358ce25599146b (patch)
tree5524a41930056c9cd5a65f795f8901f8f25c579b /drivers/net/wireless/ipw2200.h
parent7c97eb3f1dd09548fe7167e684da4fc94580aceb (diff)
[PATCH] ipw2200: remove white space and better format the code
Signed-off-by: James Ketrenos <jketreno@linux.intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ipw2200.h')
-rw-r--r--drivers/net/wireless/ipw2200.h29
1 files changed, 14 insertions, 15 deletions
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h
index c09888b1f1f8..eedd347b892e 100644
--- a/drivers/net/wireless/ipw2200.h
+++ b/drivers/net/wireless/ipw2200.h
@@ -1453,12 +1453,11 @@ do { if (ipw_debug_level & (level)) \
1453#define IPW_DOMAIN_0_END 0x1000 1453#define IPW_DOMAIN_0_END 0x1000
1454#define CLX_MEM_BAR_SIZE 0x1000 1454#define CLX_MEM_BAR_SIZE 0x1000
1455 1455
1456
1457/* Dino/baseband control registers bits */ 1456/* Dino/baseband control registers bits */
1458 1457
1459#define DINO_ENABLE_SYSTEM 0x80 /* 1 = baseband processor on, 0 = reset */ 1458#define DINO_ENABLE_SYSTEM 0x80 /* 1 = baseband processor on, 0 = reset */
1460#define DINO_ENABLE_CS 0x40 /* 1 = enable ucode load */ 1459#define DINO_ENABLE_CS 0x40 /* 1 = enable ucode load */
1461#define DINO_RXFIFO_DATA 0x01 /* 1 = data available */ 1460#define DINO_RXFIFO_DATA 0x01 /* 1 = data available */
1462#define IPW_BASEBAND_CONTROL_STATUS 0X00200000 1461#define IPW_BASEBAND_CONTROL_STATUS 0X00200000
1463#define IPW_BASEBAND_TX_FIFO_WRITE 0X00200004 1462#define IPW_BASEBAND_TX_FIFO_WRITE 0X00200004
1464#define IPW_BASEBAND_RX_FIFO_READ 0X00200004 1463#define IPW_BASEBAND_RX_FIFO_READ 0X00200004
@@ -1575,9 +1574,9 @@ do { if (ipw_debug_level & (level)) \
1575#define EEPROM_NIC_TYPE_4 4 1574#define EEPROM_NIC_TYPE_4 4
1576 1575
1577/* Bluetooth Coexistence capabilities as found in EEPROM_SKU_CAPABILITY */ 1576/* Bluetooth Coexistence capabilities as found in EEPROM_SKU_CAPABILITY */
1578#define EEPROM_SKU_CAP_BT_CHANNEL_SIG 0x01 /* we can tell BT our channel # */ 1577#define EEPROM_SKU_CAP_BT_CHANNEL_SIG 0x01 /* we can tell BT our channel # */
1579#define EEPROM_SKU_CAP_BT_PRIORITY 0x02 /* BT can take priority over us */ 1578#define EEPROM_SKU_CAP_BT_PRIORITY 0x02 /* BT can take priority over us */
1580#define EEPROM_SKU_CAP_BT_OOB 0x04 /* we can signal BT out-of-band */ 1579#define EEPROM_SKU_CAP_BT_OOB 0x04 /* we can signal BT out-of-band */
1581 1580
1582#define FW_MEM_REG_LOWER_BOUND 0x00300000 1581#define FW_MEM_REG_LOWER_BOUND 0x00300000
1583#define FW_MEM_REG_EEPROM_ACCESS (FW_MEM_REG_LOWER_BOUND + 0x40) 1582#define FW_MEM_REG_EEPROM_ACCESS (FW_MEM_REG_LOWER_BOUND + 0x40)
@@ -1877,11 +1876,11 @@ struct ipw_cmd_log {
1877 1876
1878/* SysConfig command parameters ... */ 1877/* SysConfig command parameters ... */
1879/* bt_coexistence param */ 1878/* bt_coexistence param */
1880#define CFG_BT_COEXISTENCE_SIGNAL_CHNL 0x01 /* tell BT our chnl # */ 1879#define CFG_BT_COEXISTENCE_SIGNAL_CHNL 0x01 /* tell BT our chnl # */
1881#define CFG_BT_COEXISTENCE_DEFER 0x02 /* defer our Tx if BT traffic */ 1880#define CFG_BT_COEXISTENCE_DEFER 0x02 /* defer our Tx if BT traffic */
1882#define CFG_BT_COEXISTENCE_KILL 0x04 /* kill our Tx if BT traffic */ 1881#define CFG_BT_COEXISTENCE_KILL 0x04 /* kill our Tx if BT traffic */
1883#define CFG_BT_COEXISTENCE_WME_OVER_BT 0x08 /* multimedia extensions */ 1882#define CFG_BT_COEXISTENCE_WME_OVER_BT 0x08 /* multimedia extensions */
1884#define CFG_BT_COEXISTENCE_OOB 0x10 /* signal BT via out-of-band */ 1883#define CFG_BT_COEXISTENCE_OOB 0x10 /* signal BT via out-of-band */
1885 1884
1886/* clear-to-send to self param */ 1885/* clear-to-send to self param */
1887#define CFG_CTS_TO_ITSELF_ENABLED_MIN 0x00 1886#define CFG_CTS_TO_ITSELF_ENABLED_MIN 0x00
@@ -1889,9 +1888,9 @@ struct ipw_cmd_log {
1889#define CFG_CTS_TO_ITSELF_ENABLED_DEF CFG_CTS_TO_ITSELF_ENABLED_MIN 1888#define CFG_CTS_TO_ITSELF_ENABLED_DEF CFG_CTS_TO_ITSELF_ENABLED_MIN
1890 1889
1891/* Antenna diversity param (h/w can select best antenna, based on signal) */ 1890/* Antenna diversity param (h/w can select best antenna, based on signal) */
1892#define CFG_SYS_ANTENNA_BOTH 0x00 /* NIC selects best antenna */ 1891#define CFG_SYS_ANTENNA_BOTH 0x00 /* NIC selects best antenna */
1893#define CFG_SYS_ANTENNA_A 0x01 /* force antenna A */ 1892#define CFG_SYS_ANTENNA_A 0x01 /* force antenna A */
1894#define CFG_SYS_ANTENNA_B 0x03 /* force antenna B */ 1893#define CFG_SYS_ANTENNA_B 0x03 /* force antenna B */
1895 1894
1896/* 1895/*
1897 * The definitions below were lifted off the ipw2100 driver, which only 1896 * The definitions below were lifted off the ipw2100 driver, which only