feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/build_err_with_ssr_enabled_v4.2' into 'release/v4.2'

Browse Source 
bt: Fixed build errors when sniff subrating is enabled (v4.2)

See merge request espressif/esp-idf!22353
This commit is contained in:
Jiang Jiang Jian
2023-02-17 13:51:55 +08:00
parent 30af2e87f5 c25d227280
commit ab0ae8733f
4 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/host/bluedroid/bta/dm/bta_dm_pm.c
View File

@ -54,7 +54,7 @@ static void bta_dm_pm_stop_timer_by_index(tBTA_PM_TIMER *p_timer,
#if (BTM_SSR_INCLUDED == TRUE)
#if (defined BTA_HH_INCLUDED && BTA_HH_INCLUDED == TRUE)
#include "../hh/bta_hh_int.h"
#include "bta_hh_int.h"
/* BTA_DM_PM_SSR1 will be dedicated for HH SSR setting entry, no other profile can use it */
#define BTA_DM_PM_SSR_HH BTA_DM_PM_SSR1
#endif /* (defined BTA_HH_INCLUDED && BTA_HH_INCLUDED == TRUE) */

2
components/bt/host/bluedroid/common/include/common/bt_target.h
View File

@ -880,7 +880,7 @@
/* TRUE to include Sniff Subrating */
#if (BTA_DM_PM_INCLUDED == TRUE)
#ifndef BTM_SSR_INCLUDED
#define BTM_SSR_INCLUDED FALSE
#define BTM_SSR_INCLUDED TRUE
#endif
#endif /* BTA_DM_PM_INCLUDED */

8
components/bt/host/bluedroid/stack/btm/btm_pm.c
View File

@ -838,7 +838,7 @@ void btm_pm_proc_ssr_evt (UINT8 *p, UINT16 evt_len)
UINT8 status;
UINT16 handle;
UINT16 max_rx_lat;
int xx, yy;
int xx;
tBTM_PM_MCB *p_cb;
tACL_CONN *p_acl = NULL;
UINT16 use_ssr = TRUE;
@ -863,10 +863,10 @@ void btm_pm_proc_ssr_evt (UINT8 *p, UINT16 evt_len)
}
/* notify registered parties */
for (yy = 0; yy < BTM_MAX_PM_RECORDS; yy++) {
if (btm_cb.pm_reg_db[yy].mask & BTM_PM_REG_NOTIF) {
for (xx = 0; xx < BTM_MAX_PM_RECORDS; xx++) {
if (btm_cb.pm_reg_db[xx].mask & BTM_PM_REG_NOTIF) {
if ( p_acl) {
(*btm_cb.pm_reg_db[yy].cback)( p_acl->remote_addr, BTM_PM_STS_SSR, use_ssr, status);
(*btm_cb.pm_reg_db[xx].cback)( p_acl->remote_addr, BTM_PM_STS_SSR, use_ssr, status);
}
}
}

17
components/bt/host/bluedroid/stack/btu/btu_hcif.c
View File

@ -116,11 +116,7 @@ static void btu_hcif_link_supv_to_changed_evt (UINT8 *p);
static void btu_hcif_enhanced_flush_complete_evt (void);
#endif
#if (BTM_SSR_INCLUDED == TRUE)
static void btu_hcif_ssr_evt (UINT8 *p, UINT16 evt_len);
#else
static void btu_hcif_ssr_evt_dump (UINT8 *p, UINT16 evt_len);
#endif /* BTM_SSR_INCLUDED == TRUE */
#if BLE_INCLUDED == TRUE
static void btu_ble_ll_conn_complete_evt (UINT8 *p, UINT16 evt_len);
@ -293,11 +289,7 @@ void btu_hcif_process_event (UNUSED_ATTR UINT8 controller_id, BT_HDR *p_msg)
btu_hcif_esco_connection_chg_evt (p);
break;
case HCI_SNIFF_SUB_RATE_EVT:
#if (BTM_SSR_INCLUDED == TRUE)
btu_hcif_ssr_evt (p, hci_evt_len);
#else
btu_hcif_ssr_evt_dump (p, hci_evt_len);
#endif /* BTM_SSR_INCLUDED == TRUE */
break;
case HCI_RMT_HOST_SUP_FEAT_NOTIFY_EVT:
btu_hcif_host_support_evt (p);
@ -1445,14 +1437,12 @@ static void btu_hcif_mode_change_evt (UINT8 *p)
** Returns void
**
*******************************************************************************/
#if (BTM_SSR_INCLUDED == TRUE)
static void btu_hcif_ssr_evt (UINT8 *p, UINT16 evt_len)
{
#if (BTM_SSR_INCLUDED == TRUE)
btm_pm_proc_ssr_evt(p, evt_len);
}
#else
static void btu_hcif_ssr_evt_dump (UINT8 *p, UINT16 evt_len)
{
#endif
UINT8 status;
UINT16 handle;
UINT16 max_tx_lat;
@ -1470,7 +1460,6 @@ static void btu_hcif_ssr_evt_dump (UINT8 *p, UINT16 evt_len)
HCI_TRACE_WARNING("hcif ssr evt: st 0x%x, hdl 0x%x, tx_lat %d rx_lat %d", status, handle, max_tx_lat, max_rx_lat);
}
#endif
/*******************************************************************************
**