Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a454f920 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Delete legacy batch scan implementation" into main

parents f6f7364c b25dd658

system/stack/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ cc_library_static { 
        "btm/btm_ble.cc",

        "btm/btm_ble_addr.cc",

        "btm/btm_ble_adv_filter.cc",

        "btm/btm_ble_batchscan.cc",

        "btm/btm_ble_bgconn.cc",

        "btm/btm_ble_cont_energy.cc",

        "btm/btm_ble_gap.cc",
@@ -1494,7 +1493,6 @@ cc_test { 
        "btm/btm_ble.cc",

        "btm/btm_ble_addr.cc",

        "btm/btm_ble_adv_filter.cc",

        "btm/btm_ble_batchscan.cc",

        "btm/btm_ble_bgconn.cc",

        "btm/btm_ble_cont_energy.cc",

        "btm/btm_ble_gap.cc",

system/stack/BUILD.gn

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ source_set("stack") { 
    "btm/btm_ble.cc",

    "btm/btm_ble_addr.cc",

    "btm/btm_ble_adv_filter.cc",

    "btm/btm_ble_batchscan.cc",

    "btm/btm_ble_bgconn.cc",

    "btm/btm_ble_cont_energy.cc",

    "btm/btm_ble_gap.cc",

system/stack/btm/btm_ble_batchscan.cc

deleted100644 → 0
+0 −589

File deleted.

Preview size limit exceeded, changes collapsed.

system/stack/btm/btm_ble_gap.cc

+0 −3
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ 
extern tBTM_CB btm_cb;



void btm_inq_remote_name_timer_timeout(void* data);

void btm_ble_batchscan_init(void);

void btm_ble_adv_filter_init(void);



#define BTM_EXT_BLE_RMT_NAME_TIMEOUT_MS (30 * 1000)
@@ -770,8 +769,6 @@ static void btm_ble_vendor_capability_vsc_cmpl_cback( 
      controller_get_interface()->get_ble_resolving_list_max_size() == 0)

    btm_ble_resolving_list_init(btm_cb.cmn_ble_vsc_cb.max_irk_list_sz);



  if (btm_cb.cmn_ble_vsc_cb.tot_scan_results_strg > 0) btm_ble_batchscan_init();



  if (p_ctrl_le_feature_rd_cmpl_cback != NULL)

    p_ctrl_le_feature_rd_cmpl_cback(static_cast<tHCI_STATUS>(status));

}

system/stack/include/btm_ble_api.h

+0 −43
Original line number Diff line number Diff line
@@ -71,49 +71,6 @@ void BTM_BleGetVendorCapabilities(tBTM_BLE_VSC_CB* p_cmn_vsc_cb); 
void BTM_BleGetDynamicAudioBuffer(

    tBTM_BT_DYNAMIC_AUDIO_BUFFER_CB* p_dynamic_audio_buffer_cb);



/*******************************************************************************

 *

 * Function         BTM_BleSetStorageConfig

 *

 * Description      This function is called to setup storage configuration and

 *                  setup callbacks.

 *

 * Parameters       uint8_t batch_scan_full_max -Batch scan full maximum

                    uint8_t batch_scan_trunc_max - Batch scan truncated value

 maximum

                    uint8_t batch_scan_notify_threshold - Threshold value

                    cb - Setup callback

                    tBTM_BLE_SCAN_THRESHOLD_CBACK *p_thres_cback -Threshold

 callback

                    void *p_ref - Reference value

 *

 *

 ******************************************************************************/

void BTM_BleSetStorageConfig(uint8_t batch_scan_full_max,

                             uint8_t batch_scan_trunc_max,

                             uint8_t batch_scan_notify_threshold,

                             base::Callback<void(uint8_t /* status */)> cb,

                             tBTM_BLE_SCAN_THRESHOLD_CBACK* p_thres_cback,

                             tBTM_BLE_REF_VALUE ref_value);



/* This function is called to enable batch scan */

void BTM_BleEnableBatchScan(tBTM_BLE_BATCH_SCAN_MODE scan_mode,

                            uint32_t scan_interval, uint32_t scan_window,

                            tBTM_BLE_DISCARD_RULE discard_rule,

                            tBLE_ADDR_TYPE addr_type,

                            base::Callback<void(uint8_t /* status */)> cb);



/* This function is called to disable batch scanning */

void BTM_BleDisableBatchScan(base::Callback<void(uint8_t /* status */)> cb);



/* This function is called to read batch scan reports */

void BTM_BleReadScanReports(tBLE_SCAN_MODE scan_mode,

                            tBTM_BLE_SCAN_REP_CBACK cb);



/* This function is called to setup the callback for tracking */

void BTM_BleTrackAdvertiser(tBTM_BLE_TRACK_ADV_CBACK* p_track_cback,

                            tBTM_BLE_REF_VALUE ref_value);



/*******************************************************************************

 *

 * Function         BTM_BleObserve