summaryrefslogtreecommitdiffstats
path: root/stack/l2cap
diff options
context:
space:
mode:
authorPriti Aghera <paghera@broadcom.com>2012-03-22 11:51:08 -0700
committerMatthew Xie <mattx@google.com>2012-07-14 11:19:14 -0700
commitc01f69a35563261eca49bd2083afd7064790940d (patch)
treeab42ef0ba2a5f9d86b6b972aa3f9143148e72b30 /stack/l2cap
parent146738bdcf0accdbd5d865440f86152d2430812d (diff)
downloadexternal_bluetooth_bluedroid-c01f69a35563261eca49bd2083afd7064790940d.zip
external_bluetooth_bluedroid-c01f69a35563261eca49bd2083afd7064790940d.tar.gz
external_bluetooth_bluedroid-c01f69a35563261eca49bd2083afd7064790940d.tar.bz2
HID-Host:Fixed white space issue and power management issue
Included more code to support mouse connectiona and reconnection Signed-off-by: Priti Aghera <paghera@broadcom.com> Change-Id: I1e20997e85eda5919f20a069131e580bcbb0ca63
Diffstat (limited to 'stack/l2cap')
-rwxr-xr-x[-rw-r--r--]stack/l2cap/l2c_link.c8
-rwxr-xr-x[-rw-r--r--]stack/l2cap/l2c_utils.c0
2 files changed, 5 insertions, 3 deletions
diff --git a/stack/l2cap/l2c_link.c b/stack/l2cap/l2c_link.c
index d0899aa..daaf2a7 100644..100755
--- a/stack/l2cap/l2c_link.c
+++ b/stack/l2cap/l2c_link.c
@@ -1040,14 +1040,15 @@ BOOLEAN l2c_link_check_power_mode (tL2C_LCB *p_lcb)
/* check power mode */
if (BTM_ReadPowerMode(p_lcb->remote_bd_addr, &mode) == BTM_SUCCESS)
{
+ /*
if ( mode == BTM_PM_MD_PARK )
{
L2CAP_TRACE_DEBUG1 ("LCB(0x%x) is in park mode", p_lcb->handle);
-/* Coverity:
+// Coverity:
// FALSE-POSITIVE error from Coverity test tool. Please do NOT remove following comment.
// coverity[uninit_use_in_call] False-positive: setting the mode to BTM_PM_MD_ACTIVE only uses settings.mode
the other data members of tBTM_PM_PWR_MD are ignored
-*/
+
memset((void*)&pm, 0, sizeof(pm));
pm.mode = BTM_PM_MD_ACTIVE;
BTM_SetPowerMode(BTM_PM_SET_ONLY_ID, p_lcb->remote_bd_addr, &pm);
@@ -1055,7 +1056,8 @@ BOOLEAN l2c_link_check_power_mode (tL2C_LCB *p_lcb)
BTU_TTYPE_L2CAP_LINK, L2CAP_WAIT_UNPARK_TOUT);
return TRUE;
}
- else if ( mode == BTM_PM_STS_PENDING )
+ */
+ if ( mode == BTM_PM_STS_PENDING )
{
L2CAP_TRACE_DEBUG1 ("LCB(0x%x) is in PM pending state", p_lcb->handle);
diff --git a/stack/l2cap/l2c_utils.c b/stack/l2cap/l2c_utils.c
index 0c1fb60..0c1fb60 100644..100755
--- a/stack/l2cap/l2c_utils.c
+++ b/stack/l2cap/l2c_utils.c