aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2011-02-22 11:24:22 -0500
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-02-26 13:28:56 -0500
commit399f66fda08675e3e231ac6df9c59ea831441f4b (patch)
tree753b5108b89cf174ce3ac0863c851e7bb58f6e3c
parentd7220f0d4f7a7e84470916a3da8113a51f480514 (diff)
iwlagn: split BT page and inquiry UART msg
Both inquiry and page was combine in frame7 of UART message, separate it Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-lib.c10
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-commands.h9
2 files changed, 12 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 8c70f0be6b77..dc7055eee2d8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -1984,12 +1984,14 @@ static void iwlagn_print_uartmsg(struct iwl_priv *priv,
1984 (BT_UART_MSG_FRAME6DISCOVERABLE_MSK & uart_msg->frame6) >> 1984 (BT_UART_MSG_FRAME6DISCOVERABLE_MSK & uart_msg->frame6) >>
1985 BT_UART_MSG_FRAME6DISCOVERABLE_POS); 1985 BT_UART_MSG_FRAME6DISCOVERABLE_POS);
1986 1986
1987 IWL_DEBUG_NOTIF(priv, "Sniff Activity = 0x%X, Inquiry/Page SR Mode = " 1987 IWL_DEBUG_NOTIF(priv, "Sniff Activity = 0x%X, Page = "
1988 "0x%X, Connectable = 0x%X", 1988 "0x%X, Inquiry = 0x%X, Connectable = 0x%X",
1989 (BT_UART_MSG_FRAME7SNIFFACTIVITY_MSK & uart_msg->frame7) >> 1989 (BT_UART_MSG_FRAME7SNIFFACTIVITY_MSK & uart_msg->frame7) >>
1990 BT_UART_MSG_FRAME7SNIFFACTIVITY_POS, 1990 BT_UART_MSG_FRAME7SNIFFACTIVITY_POS,
1991 (BT_UART_MSG_FRAME7INQUIRYPAGESRMODE_MSK & uart_msg->frame7) >> 1991 (BT_UART_MSG_FRAME7PAGE_MSK & uart_msg->frame7) >>
1992 BT_UART_MSG_FRAME7INQUIRYPAGESRMODE_POS, 1992 BT_UART_MSG_FRAME7PAGE_POS,
1993 (BT_UART_MSG_FRAME7INQUIRY_MSK & uart_msg->frame7) >>
1994 BT_UART_MSG_FRAME7INQUIRY_POS,
1993 (BT_UART_MSG_FRAME7CONNECTABLE_MSK & uart_msg->frame7) >> 1995 (BT_UART_MSG_FRAME7CONNECTABLE_MSK & uart_msg->frame7) >>
1994 BT_UART_MSG_FRAME7CONNECTABLE_POS); 1996 BT_UART_MSG_FRAME7CONNECTABLE_POS);
1995} 1997}
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index df6abbf0b9d3..3629ee351478 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -4258,9 +4258,12 @@ enum iwl_bt_coex_profile_traffic_load {
4258#define BT_UART_MSG_FRAME7SNIFFACTIVITY_POS (0) 4258#define BT_UART_MSG_FRAME7SNIFFACTIVITY_POS (0)
4259#define BT_UART_MSG_FRAME7SNIFFACTIVITY_MSK \ 4259#define BT_UART_MSG_FRAME7SNIFFACTIVITY_MSK \
4260 (0x7 << BT_UART_MSG_FRAME7SNIFFACTIVITY_POS) 4260 (0x7 << BT_UART_MSG_FRAME7SNIFFACTIVITY_POS)
4261#define BT_UART_MSG_FRAME7INQUIRYPAGESRMODE_POS (3) 4261#define BT_UART_MSG_FRAME7PAGE_POS (3)
4262#define BT_UART_MSG_FRAME7INQUIRYPAGESRMODE_MSK \ 4262#define BT_UART_MSG_FRAME7PAGE_MSK \
4263 (0x3 << BT_UART_MSG_FRAME7INQUIRYPAGESRMODE_POS) 4263 (0x1 << BT_UART_MSG_FRAME7PAGE_POS)
4264#define BT_UART_MSG_FRAME7INQUIRY_POS (4)
4265#define BT_UART_MSG_FRAME7INQUIRY_MSK \
4266 (0x1 << BT_UART_MSG_FRAME7INQUIRY_POS)
4264#define BT_UART_MSG_FRAME7CONNECTABLE_POS (5) 4267#define BT_UART_MSG_FRAME7CONNECTABLE_POS (5)
4265#define BT_UART_MSG_FRAME7CONNECTABLE_MSK \ 4268#define BT_UART_MSG_FRAME7CONNECTABLE_MSK \
4266 (0x1 << BT_UART_MSG_FRAME7CONNECTABLE_POS) 4269 (0x1 << BT_UART_MSG_FRAME7CONNECTABLE_POS)