pioduino/esp-idf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ble/bluedroid): Delete batch_scan related code

Browse Source 
(cherry picked from commit a784adef004af9e325c7edd18132e8950bd6f09d)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
This commit is contained in:
Zhi Wei Jian
2026-01-07 17:24:29 +08:00
parent 4965bc14ee
commit 57f330727a
5 changed files with 1 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bt/host/bluedroid/bta/dm/include/bta_dm_int.h
-2
View File
@@ -2286,8 +2286,6 @@ extern void bta_dm_ble_gap_set_ext_scan_params(tBTA_DM_MSG *p_data);
extern void bta_dm_ble_gap_ext_scan(tBTA_DM_MSG *p_data);
extern void bta_dm_ble_gap_set_prefer_ext_conn_params(tBTA_DM_MSG *p_data);
#endif // #if (BLE_50_FEATURE_SUPPORT == TRUE)
extern void bta_dm_ble_enable_batch_scan(tBTA_DM_MSG *p_data);
extern void bta_dm_ble_disable_batch_scan(tBTA_DM_MSG *p_data);
extern void bta_dm_ble_read_scan_reports(tBTA_DM_MSG *p_data);
#endif
components/bt/host/bluedroid/bta/include/bta/bta_api.h
-35
View File
@@ -511,13 +511,6 @@ typedef struct {
tBTA_BLE_SERVICE service;
} tBTA_BLE_INQ_DATA;
enum {
BTA_BLE_BATCH_SCAN_MODE_PASS = 1,
BTA_BLE_BATCH_SCAN_MODE_ACTI = 2,
BTA_BLE_BATCH_SCAN_MODE_PASS_ACTI = 3
};
typedef UINT8 tBTA_BLE_BATCH_SCAN_MODE;
enum {
BTA_BLE_DISCARD_OLD_ITEMS = 0,
BTA_BLE_DISCARD_LOWER_RSSI_ITEMS = 1
@@ -3019,34 +3012,6 @@ void BTA_DmBleGapCsSetProcPatams(tBTA_DM_CS_SET_PROC_PARAMS *set_proc_params);
void BTA_DmBleGapCsProcEnable(uint16_t conn_handle, uint8_t config_id, uint8_t enable);
#endif // (BT_BLE_FEAT_CHANNEL_SOUNDING == TRUE)
/*******************************************************************************
**
** Function BTA_DmBleReadScanReports
**
** Description This function is called to read the batch scan reports
**
** Parameters scan_mode -Batch scan mode
** ref_value - Reference value
**
** Returns None
**
*******************************************************************************/
extern void BTA_DmBleReadScanReports(tBTA_BLE_BATCH_SCAN_MODE scan_type,
tBTA_DM_BLE_REF_VALUE ref_value);
/*******************************************************************************
**
** Function BTA_DmBleDisableBatchScan
**
** Description This function is called to disable the batch scanning
**
** Parameters ref_value - Reference value
**
** Returns None
**
*******************************************************************************/
extern void BTA_DmBleDisableBatchScan(tBTA_DM_BLE_REF_VALUE ref_value);
/*******************************************************************************
**
** Function BTA_BrcmInit
components/bt/host/bluedroid/common/include/common/bt_target.h
-5
View File
@@ -1659,11 +1659,6 @@
#endif
#endif
#ifndef BLE_BATCH_SCAN_INCLUDED
#define BLE_BATCH_SCAN_INCLUDED TRUE
#endif
/******************************************************************************
**
** ATT/GATT Protocol/Profile Settings
components/bt/host/bluedroid/stack/include/stack/btm_ble_api.h
-124
View File
@@ -57,13 +57,6 @@ typedef UINT32 tBTM_BLE_REF_VALUE;
#define BTM_BLE_SCAN_MODE_NONE 0xff
typedef UINT8 tBLE_SCAN_MODE;
#define BTM_BLE_BATCH_SCAN_MODE_DISABLE 0
#define BTM_BLE_BATCH_SCAN_MODE_PASS 1
#define BTM_BLE_BATCH_SCAN_MODE_ACTI 2
#define BTM_BLE_BATCH_SCAN_MODE_PASS_ACTI 3
typedef UINT8 tBTM_BLE_BATCH_SCAN_MODE;
/* advertising channel map */
#define BTM_BLE_ADV_CHNL_37 (0x01 << 0)
#define BTM_BLE_ADV_CHNL_38 (0x01 << 1)
@@ -496,60 +489,17 @@ typedef void (tBTM_BLE_SCAN_REP_CBACK)(tBTM_BLE_REF_VALUE ref_value, UINT8 repor
UINT8 *p_rep_data, UINT8 status);
typedef void (tBTM_BLE_SCAN_SETUP_CBACK)(UINT8 evt, tBTM_BLE_REF_VALUE ref_value, UINT8 status);
#ifndef BTM_BLE_BATCH_SCAN_MAX
#define BTM_BLE_BATCH_SCAN_MAX 5
#endif
#ifndef BTM_BLE_BATCH_REP_MAIN_Q_SIZE
#define BTM_BLE_BATCH_REP_MAIN_Q_SIZE 2
#endif
typedef enum {
BTM_BLE_SCAN_INVALID_STATE = 0,
BTM_BLE_SCAN_ENABLE_CALLED = 1,
BTM_BLE_SCAN_ENABLED_STATE = 2,
BTM_BLE_SCAN_DISABLE_CALLED = 3,
BTM_BLE_SCAN_DISABLED_STATE = 4
} tBTM_BLE_BATCH_SCAN_STATE;
enum {
BTM_BLE_DISCARD_OLD_ITEMS,
BTM_BLE_DISCARD_LOWER_RSSI_ITEMS
};
typedef UINT8 tBTM_BLE_DISCARD_RULE;
typedef struct {
UINT8 sub_code[BTM_BLE_BATCH_SCAN_MAX];
tBTM_BLE_BATCH_SCAN_STATE cur_state[BTM_BLE_BATCH_SCAN_MAX];
tBTM_BLE_REF_VALUE ref_value[BTM_BLE_BATCH_SCAN_MAX];
UINT8 pending_idx;
UINT8 next_idx;
} tBTM_BLE_BATCH_SCAN_OPQ;
typedef struct {
UINT8 rep_mode[BTM_BLE_BATCH_REP_MAIN_Q_SIZE];
tBTM_BLE_REF_VALUE ref_value[BTM_BLE_BATCH_REP_MAIN_Q_SIZE];
UINT8 num_records[BTM_BLE_BATCH_REP_MAIN_Q_SIZE];
UINT16 data_len[BTM_BLE_BATCH_REP_MAIN_Q_SIZE];
UINT8 *p_data[BTM_BLE_BATCH_REP_MAIN_Q_SIZE];
UINT8 pending_idx;
UINT8 next_idx;
} tBTM_BLE_BATCH_SCAN_REP_Q;
typedef struct {
tBTM_BLE_BATCH_SCAN_STATE cur_state;
tBTM_BLE_BATCH_SCAN_MODE scan_mode;
UINT32 scan_interval;
UINT32 scan_window;
tBLE_ADDR_TYPE addr_type;
tBTM_BLE_DISCARD_RULE discard_rule;
tBTM_BLE_BATCH_SCAN_OPQ op_q;
tBTM_BLE_BATCH_SCAN_REP_Q main_rep_q;
tBTM_BLE_SCAN_SETUP_CBACK *p_setup_cback;
tBTM_BLE_SCAN_THRESHOLD_CBACK *p_thres_cback;
tBTM_BLE_SCAN_REP_CBACK *p_scan_rep_cback;
tBTM_BLE_REF_VALUE ref_value;
} tBTM_BLE_BATCH_SCAN_CB;
/// Ble scan duplicate type
enum {
@@ -2142,20 +2092,6 @@ void BTM_BleClearRandAddress(void);
void BTM_BleReadAdvParams (UINT16 *adv_int_min, UINT16 *adv_int_max,
tBLE_BD_ADDR *p_dir_bda, tBTM_BLE_ADV_CHNL_MAP *p_chnl_map);
/*******************************************************************************
**
** Function BTM_BleObtainVendorCapabilities
**
** Description This function is called to obtain vendor capabilities
**
** Parameters p_cmn_vsc_cb - Returns the vendor capabilities
**
** Returns void
**
*******************************************************************************/
//extern
void BTM_BleObtainVendorCapabilities(tBTM_BLE_VSC_CB *p_cmn_vsc_cb);
/*******************************************************************************
**
** Function BTM_BleSetScanFilterParams
@@ -2192,66 +2128,6 @@ tBTM_STATUS BTM_BleSetScanFilterParams(tGATT_IF client_if, UINT32 scan_interval,
*******************************************************************************/
//extern
void BTM_BleGetVendorCapabilities(tBTM_BLE_VSC_CB *p_cmn_vsc_cb);
/*******************************************************************************
**
** Function BTM_BleSetStorageConfig
**
** Description This function is called to setup storage configuration and setup callbacks.
**
** Parameters UINT8 batch_scan_full_max -Batch scan full maximum
UINT8 batch_scan_trunc_max - Batch scan truncated value maximum
UINT8 batch_scan_notify_threshold - Threshold value
tBTM_BLE_SCAN_SETUP_CBACK *p_setup_cback - Setup callback
tBTM_BLE_SCAN_THRESHOLD_CBACK *p_thres_cback -Threshold callback
void *p_ref - Reference value
**
** Returns tBTM_STATUS
**
*******************************************************************************/
//extern
tBTM_STATUS BTM_BleSetStorageConfig(UINT8 batch_scan_full_max,
UINT8 batch_scan_trunc_max,
UINT8 batch_scan_notify_threshold,
tBTM_BLE_SCAN_SETUP_CBACK *p_setup_cback,
tBTM_BLE_SCAN_THRESHOLD_CBACK *p_thres_cback,
tBTM_BLE_SCAN_REP_CBACK *p_cback,
tBTM_BLE_REF_VALUE ref_value);
/*******************************************************************************
**
** Function BTM_BleEnableBatchScan
**
** Description This function is called to enable batch scan
**
** Parameters tBTM_BLE_BATCH_SCAN_MODE scan_mode - Batch scan mode
UINT32 scan_interval -Scan interval
UINT32 scan_window - Scan window value
tBLE_ADDR_TYPE addr_type - Address type
tBTM_BLE_DISCARD_RULE discard_rule - Data discard rules
**
** Returns tBTM_STATUS
**
*******************************************************************************/
//extern
tBTM_STATUS BTM_BleEnableBatchScan(tBTM_BLE_BATCH_SCAN_MODE scan_mode,
UINT32 scan_interval, UINT32 scan_window,
tBTM_BLE_DISCARD_RULE discard_rule,
tBLE_ADDR_TYPE addr_type,
tBTM_BLE_REF_VALUE ref_value);
/*******************************************************************************
**
** Function BTM_BleDisableBatchScan
**
** Description This function is called to disable batch scanning
**
** Parameters void
**
** Returns void
**
*******************************************************************************/
//extern
tBTM_STATUS BTM_BleDisableBatchScan(tBTM_BLE_REF_VALUE ref_value);
/*******************************************************************************
**
components/bt/host/bluedroid/stack/include/stack/hcidefs.h
+1 -9
View File
@@ -488,7 +488,6 @@
//ESP BLE subcode define
#define HCI_SUBCODE_BLE_INIT 0x00
#define HCI_SUBCODE_BLE_MULTI_ADV 0x01
#define HCI_SUBCODE_BLE_BATCH_SCAN 0x02
#define HCI_SUBCODE_BLE_ADV_FILTER 0x03
#define HCI_SUBCODE_BLE_TRACK_ADV 0x04
@@ -536,8 +535,7 @@
//ESP BLE HCI CMD
/* Multi adv OCF */
#define HCI_BLE_MULTI_ADV_OCF HCI_ESP_VENDOR_OPCODE_BUILD(HCI_VENDOR_OGF, HCI_ESP_GROUP_BLE, HCI_SUBCODE_BLE_MULTI_ADV)
/* Batch scan OCF */
#define HCI_BLE_BATCH_SCAN_OCF HCI_ESP_VENDOR_OPCODE_BUILD(HCI_VENDOR_OGF, HCI_ESP_GROUP_BLE, HCI_SUBCODE_BLE_BATCH_SCAN)
/* ADV filter OCF */
#define HCI_BLE_ADV_FILTER_OCF HCI_ESP_VENDOR_OPCODE_BUILD(HCI_VENDOR_OGF, HCI_ESP_GROUP_BLE, HCI_SUBCODE_BLE_ADV_FILTER)
/* Tracking OCF */
@@ -574,12 +572,6 @@
/* multi adv VSE subcode */
#define HCI_VSE_SUBCODE_BLE_MULTI_ADV_ST_CHG 0x55 /* multi adv instance state change */
/* subcode for batch scan feature */
#define BTM_BLE_BATCH_SCAN_ENB_DISAB_CUST_FEATURE 0x01
#define BTM_BLE_BATCH_SCAN_SET_STORAGE_PARAM 0x02
#define BTM_BLE_BATCH_SCAN_SET_PARAMS 0x03
#define BTM_BLE_BATCH_SCAN_READ_RESULTS 0x04
/* batch scan VSE subcode */
#define HCI_VSE_SUBCODE_BLE_THRESHOLD_SUB_EVT 0x54 /* Threshold event */