aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ipw2200.h
diff options
context:
space:
mode:
authorZhu Yi <yi.zhu@intel.com>2006-01-24 03:36:59 -0500
committerJohn W. Linville <linville@tuxdriver.com>2006-01-30 20:35:33 -0500
commit810dabd466fe70869b66ab64dd326b6153cef645 (patch)
treeca919a3a3b819b6bb46cc9d072b58f8b698b1070 /drivers/net/wireless/ipw2200.h
parent3e234b4e5768b4f783fc45f20be8c6515b875f17 (diff)
[PATCH] ipw2200: Bluetooth coexistence support
I've added a new module param "bt_coexist" which defaults to OFF. This does not seem to fix the firmware restarts, but it does do "the right thing" and disables something that we were enabling by default: signaling the Bluetooth h/w which channel we're on (whether or not the BT h/w was out there). Signed-off-by: Ben M Cahill <ben.m.cahill@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.h35
1 files changed, 21 insertions, 14 deletions
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h
index 5f32834745b5..d6d7d9db0462 100644
--- a/drivers/net/wireless/ipw2200.h
+++ b/drivers/net/wireless/ipw2200.h
@@ -1566,13 +1566,18 @@ do { if (ipw_debug_level & (level)) \
1566#define EEPROM_BSS_CHANNELS_BG (GET_EEPROM_ADDR(0x2c,LSB)) /* 2 bytes */ 1566#define EEPROM_BSS_CHANNELS_BG (GET_EEPROM_ADDR(0x2c,LSB)) /* 2 bytes */
1567#define EEPROM_HW_VERSION (GET_EEPROM_ADDR(0x72,LSB)) /* 2 bytes */ 1567#define EEPROM_HW_VERSION (GET_EEPROM_ADDR(0x72,LSB)) /* 2 bytes */
1568 1568
1569/* NIC type as found in the one byte EEPROM_NIC_TYPE offset*/ 1569/* NIC type as found in the one byte EEPROM_NIC_TYPE offset */
1570#define EEPROM_NIC_TYPE_0 0 1570#define EEPROM_NIC_TYPE_0 0
1571#define EEPROM_NIC_TYPE_1 1 1571#define EEPROM_NIC_TYPE_1 1
1572#define EEPROM_NIC_TYPE_2 2 1572#define EEPROM_NIC_TYPE_2 2
1573#define EEPROM_NIC_TYPE_3 3 1573#define EEPROM_NIC_TYPE_3 3
1574#define EEPROM_NIC_TYPE_4 4 1574#define EEPROM_NIC_TYPE_4 4
1575 1575
1576/* Bluetooth Coexistence capabilities as found in EEPROM_SKU_CAPABILITY */
1577#define EEPROM_SKU_CAP_BT_CHANNEL_SIG 0x01 /* we can tell BT our channel # */
1578#define EEPROM_SKU_CAP_BT_PRIORITY 0x02 /* BT can take priority over us */
1579#define EEPROM_SKU_CAP_BT_OOB 0x04 /* we can signal BT out-of-band */
1580
1576#define FW_MEM_REG_LOWER_BOUND 0x00300000 1581#define FW_MEM_REG_LOWER_BOUND 0x00300000
1577#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)
1578#define IPW_EVENT_REG (FW_MEM_REG_LOWER_BOUND + 0x04) 1583#define IPW_EVENT_REG (FW_MEM_REG_LOWER_BOUND + 0x04)
@@ -1869,21 +1874,23 @@ struct ipw_cmd_log {
1869 struct host_cmd cmd; 1874 struct host_cmd cmd;
1870}; 1875};
1871 1876
1872#define CFG_BT_COEXISTENCE_MIN 0x00 1877/* SysConfig command parameters ... */
1873#define CFG_BT_COEXISTENCE_DEFER 0x02 1878/* bt_coexistence param */
1874#define CFG_BT_COEXISTENCE_KILL 0x04 1879#define CFG_BT_COEXISTENCE_SIGNAL_CHNL 0x01 /* tell BT our chnl # */
1875#define CFG_BT_COEXISTENCE_WME_OVER_BT 0x08 1880#define CFG_BT_COEXISTENCE_DEFER 0x02 /* defer our Tx if BT traffic */
1876#define CFG_BT_COEXISTENCE_OOB 0x10 1881#define CFG_BT_COEXISTENCE_KILL 0x04 /* kill our Tx if BT traffic */
1877#define CFG_BT_COEXISTENCE_MAX 0xFF 1882#define CFG_BT_COEXISTENCE_WME_OVER_BT 0x08 /* multimedia extensions */
1878#define CFG_BT_COEXISTENCE_DEF 0x80 /* read Bt from EEPROM */ 1883#define CFG_BT_COEXISTENCE_OOB 0x10 /* signal BT via out-of-band */
1879 1884
1880#define CFG_CTS_TO_ITSELF_ENABLED_MIN 0x0 1885/* clear-to-send to self param */
1881#define CFG_CTS_TO_ITSELF_ENABLED_MAX 0x1 1886#define CFG_CTS_TO_ITSELF_ENABLED_MIN 0x00
1887#define CFG_CTS_TO_ITSELF_ENABLED_MAX 0x01
1882#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
1883 1889
1884#define CFG_SYS_ANTENNA_BOTH 0x000 1890/* Antenna diversity param (h/w can select best antenna, based on signal) */
1885#define CFG_SYS_ANTENNA_A 0x001 1891#define CFG_SYS_ANTENNA_BOTH 0x00 /* NIC selects best antenna */
1886#define CFG_SYS_ANTENNA_B 0x003 1892#define CFG_SYS_ANTENNA_A 0x01 /* force antenna A */
1893#define CFG_SYS_ANTENNA_B 0x03 /* force antenna B */
1887 1894
1888/* 1895/*
1889 * The definitions below were lifted off the ipw2100 driver, which only 1896 * The definitions below were lifted off the ipw2100 driver, which only