diff options
Diffstat (limited to 'stack')
| -rwxr-xr-x | stack/l2cap/l2c_main.c | 14 | ||||
| -rw-r--r-- | stack/l2cap/l2c_utils.c | 36 |
2 files changed, 9 insertions, 41 deletions
diff --git a/stack/l2cap/l2c_main.c b/stack/l2cap/l2c_main.c index 4ca28ebee..caef05f2e 100755 --- a/stack/l2cap/l2c_main.c +++ b/stack/l2cap/l2c_main.c @@ -48,10 +48,6 @@ static void process_l2cap_cmd (tL2C_LCB *p_lcb, UINT8 *p, UINT16 pkt_len); tL2C_CB l2cb; #endif -/* Temporary - until l2cap implements group management */ -#if (TCS_BCST_SETUP_INCLUDED == TRUE && TCS_INCLUDED == TRUE) -extern void tcs_proc_bcst_msg( BD_ADDR addr, BT_HDR *p_msg ) ; -#endif /******************************************************************************* ** ** Function l2c_bcst_msg @@ -230,16 +226,6 @@ void l2c_rcv_acl_data (BT_HDR *p_msg) /* process_connectionless_data (p_lcb); */ STREAM_TO_UINT16 (psm, p); L2CAP_TRACE_DEBUG( "GOT CONNECTIONLESS DATA PSM:%d", psm ) ; -#if (TCS_BCST_SETUP_INCLUDED == TRUE && TCS_INCLUDED == TRUE) - if (psm == TCS_PSM_INTERCOM || psm == TCS_PSM_CORDLESS) - { - p_msg->offset += L2CAP_BCST_OVERHEAD; - p_msg->len -= L2CAP_BCST_OVERHEAD; - tcs_proc_bcst_msg( p_lcb->remote_bd_addr, p_msg ) ; - GKI_freebuf (p_msg); - } - else -#endif #if (L2CAP_UCD_INCLUDED == TRUE) /* if it is not broadcast, check UCD registration */ diff --git a/stack/l2cap/l2c_utils.c b/stack/l2cap/l2c_utils.c index 0dc2f8bfc..98697fcec 100644 --- a/stack/l2cap/l2c_utils.c +++ b/stack/l2cap/l2c_utils.c @@ -2206,10 +2206,6 @@ void l2cu_device_reset (void) #endif } -#if (TCS_WUG_MEMBER_INCLUDED == TRUE && TCS_INCLUDED == TRUE) -extern UINT16 tcs_wug_get_clk_offset( BD_ADDR addr ) ; -#endif - /******************************************************************************* ** ** Function l2cu_create_conn @@ -2356,35 +2352,21 @@ BOOLEAN l2cu_create_conn_after_switch (tL2C_LCB *p_lcb) p_lcb->link_state = LST_CONNECTING; - -#if (TCS_WUG_MEMBER_INCLUDED == TRUE && TCS_INCLUDED == TRUE) - if ( (clock_offset = tcs_wug_get_clk_offset( p_lcb->remote_bd_addr )) != 0 ) + /* Check with the BT manager if details about remote device are known */ + if ((p_inq_info = BTM_InqDbRead(p_lcb->remote_bd_addr)) != NULL) { - page_scan_rep_mode = HCI_PAGE_SCAN_REP_MODE_R0; - page_scan_mode = HCI_MANDATARY_PAGE_SCAN_MODE; + page_scan_rep_mode = p_inq_info->results.page_scan_rep_mode; + page_scan_mode = p_inq_info->results.page_scan_mode; + clock_offset = (UINT16)(p_inq_info->results.clock_offset); } else { -#endif - - /* Check with the BT manager if details about remote device are known */ - if ((p_inq_info = BTM_InqDbRead(p_lcb->remote_bd_addr)) != NULL) - { - page_scan_rep_mode = p_inq_info->results.page_scan_rep_mode; - page_scan_mode = p_inq_info->results.page_scan_mode; - clock_offset = (UINT16)(p_inq_info->results.clock_offset); - } - else - { - /* No info known. Use default settings */ - page_scan_rep_mode = HCI_PAGE_SCAN_REP_MODE_R1; - page_scan_mode = HCI_MANDATARY_PAGE_SCAN_MODE; + /* No info known. Use default settings */ + page_scan_rep_mode = HCI_PAGE_SCAN_REP_MODE_R1; + page_scan_mode = HCI_MANDATARY_PAGE_SCAN_MODE; - clock_offset = (p_dev_rec) ? p_dev_rec->clock_offset : 0; - } -#if (TCS_WUG_MEMBER_INCLUDED == TRUE && TCS_INCLUDED == TRUE) + clock_offset = (p_dev_rec) ? p_dev_rec->clock_offset : 0; } -#endif if (!btsnd_hcic_create_conn (p_lcb->remote_bd_addr, ( HCI_PKT_TYPES_MASK_DM1 | HCI_PKT_TYPES_MASK_DH1 |