From c01f69a35563261eca49bd2083afd7064790940d Mon Sep 17 00:00:00 2001 From: Priti Aghera Date: Thu, 22 Mar 2012 11:51:08 -0700 Subject: HID-Host:Fixed white space issue and power management issue Included more code to support mouse connectiona and reconnection Signed-off-by: Priti Aghera Change-Id: I1e20997e85eda5919f20a069131e580bcbb0ca63 --- stack/btm/btm_pm.c | 2 +- stack/l2cap/l2c_link.c | 8 +++++--- stack/l2cap/l2c_utils.c | 0 3 files changed, 6 insertions(+), 4 deletions(-) mode change 100644 => 100755 stack/l2cap/l2c_link.c mode change 100644 => 100755 stack/l2cap/l2c_utils.c (limited to 'stack') diff --git a/stack/btm/btm_pm.c b/stack/btm/btm_pm.c index 169a1b3..afe7275 100644 --- a/stack/btm/btm_pm.c +++ b/stack/btm/btm_pm.c @@ -842,7 +842,7 @@ void btm_pm_proc_mode_change (UINT8 hci_status, UINT16 hci_handle, UINT8 mode, U BTM_TRACE_DEBUG0 ("btm mode change to active; check l2c_link for outgoing packets"); l2c_link_check_send_pkts (p_lcb, NULL, NULL); - btu_stop_timer (&p_lcb->timer_entry); + //btu_stop_timer (&p_lcb->timer_entry); } /* notify registered parties */ diff --git a/stack/l2cap/l2c_link.c b/stack/l2cap/l2c_link.c old mode 100644 new mode 100755 index d0899aa..daaf2a7 --- 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 old mode 100644 new mode 100755 -- cgit v1.1