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

Commit a52b62a5 authored by Chris Manton's avatar Chris Manton
Browse files

legacy: Const-ify various btm_ble_ 

Bug: 187830698
Tag: #refactor
Test: gd/cert/run

Change-Id: Ifd70ed0672487befd92b822c91125573c2e29774
parent 1cedf010

system/stack/btm/ble_scanner_hci_interface.cc

+5 −5
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ class BleScannerImplBase : public BleScannerHciInterface { 


  void OnPeriodicScanResult(uint16_t sync_handle, uint8_t tx_power, int8_t rssi,

                            uint8_t cte_type, uint8_t pkt_data_status,

                            uint8_t pkt_data_len, uint8_t* p_pkt_data) {

                            uint8_t pkt_data_len, const uint8_t* p_pkt_data) {

    // The observer should handle the caching and reassembly of the fragmented

    // packet.

    if (scan_event_observer) {
@@ -351,7 +351,7 @@ void BleScannerHciInterface::CleanUp() { 
}



void btm_ble_process_periodic_adv_sync_est_evt(uint8_t data_len,

                                               uint8_t* data) {

                                               const uint8_t* data) {

  uint16_t sync_handle, adv_interval;

  uint8_t status, adv_sid, adv_addr_type, adv_phy, adv_clock_accuracy;

  RawAddress adv_addr;
@@ -378,8 +378,8 @@ void btm_ble_process_periodic_adv_sync_est_evt(uint8_t data_len, 
  }

}



void btm_ble_process_periodic_adv_pkt(uint8_t data_len, uint8_t* data) {

  uint8_t* p = data;

void btm_ble_process_periodic_adv_pkt(uint8_t data_len, const uint8_t* data) {

  const uint8_t* p = data;

  uint16_t sync_handle;

  uint8_t tx_power, cte_type, pkt_data_status, pkt_data_len;

  int8_t rssi;
@@ -394,7 +394,7 @@ void btm_ble_process_periodic_adv_pkt(uint8_t data_len, uint8_t* data) { 
  STREAM_TO_UINT8(pkt_data_status, p);

  STREAM_TO_UINT8(pkt_data_len, p);



  uint8_t* pkt_data = p;

  const uint8_t* pkt_data = p;

  p += pkt_data_len;



  if (p > data + data_len) {

system/stack/btm/btm_ble_int.h

+3 −2
Original line number Diff line number Diff line
@@ -34,8 +34,9 @@ 
#include "stack/include/hci_error_code.h"

#include "types/raw_address.h"



extern void btm_ble_process_periodic_adv_sync_est_evt(uint8_t len, uint8_t* p);

extern void btm_ble_process_periodic_adv_pkt(uint8_t len, uint8_t* p);

extern void btm_ble_process_periodic_adv_sync_est_evt(uint8_t len,

                                                      const uint8_t* p);

extern void btm_ble_process_periodic_adv_pkt(uint8_t len, const uint8_t* p);

extern void btm_ble_process_periodic_adv_sync_lost_evt(uint8_t len, uint8_t* p);

extern void btm_send_hci_set_scan_params(uint8_t scan_type, uint16_t scan_int,

                                         uint16_t scan_win,

system/stack/btu/btu_hcif.cc

+4 −2
Original line number Diff line number Diff line
@@ -435,11 +435,13 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id, BT_HDR* p_msg) { 
          break;



        case HCI_BLE_PERIODIC_ADV_SYNC_EST_EVT:

          btm_ble_process_periodic_adv_sync_est_evt(ble_evt_len, p);

          btm_ble_process_periodic_adv_sync_est_evt(

              ble_evt_len, const_cast<const uint8_t*>(p));

          break;



        case HCI_BLE_PERIODIC_ADV_REPORT_EVT:

          btm_ble_process_periodic_adv_pkt(ble_evt_len, p);

          btm_ble_process_periodic_adv_pkt(ble_evt_len,

                                           const_cast<const uint8_t*>(p));

          break;



        case HCI_BLE_PERIODIC_ADV_SYNC_LOST_EVT:

system/stack/include/ble_hci_link_interface.h

+3 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ extern void btm_ble_remove_resolving_list_entry_complete(uint8_t* p, 
extern void btm_ble_add_resolving_list_entry_complete(uint8_t* p,

                                                      uint16_t evt_len);

extern void btm_ble_clear_resolving_list_complete(uint8_t* p, uint16_t evt_len);

extern void btm_ble_process_periodic_adv_pkt(uint8_t len, uint8_t* p);

extern void btm_ble_process_periodic_adv_sync_est_evt(uint8_t len, uint8_t* p);

extern void btm_ble_process_periodic_adv_pkt(uint8_t len, const uint8_t* p);

extern void btm_ble_process_periodic_adv_sync_est_evt(uint8_t len,

                                                      const uint8_t* p);

extern void btm_ble_process_periodic_adv_sync_lost_evt(uint8_t len, uint8_t* p);

system/test/mock/mock_stack_btm_ble_scanner_hci_interface.cc

+2 −2
Original line number Diff line number Diff line
@@ -61,12 +61,12 @@ struct btm_ble_process_periodic_adv_sync_lost_evt 


// Mocked functions, if any

void btm_ble_process_periodic_adv_sync_est_evt(uint8_t data_len,

                                               uint8_t* data) {

                                               const uint8_t* data) {

  mock_function_count_map[__func__]++;

  test::mock::stack_btm_ble_scanner_hci_interface::

      btm_ble_process_periodic_adv_sync_est_evt(data_len, data);

}

void btm_ble_process_periodic_adv_pkt(uint8_t data_len, uint8_t* data) {

void btm_ble_process_periodic_adv_pkt(uint8_t data_len, const uint8_t* data) {

  mock_function_count_map[__func__]++;

  test::mock::stack_btm_ble_scanner_hci_interface::

      btm_ble_process_periodic_adv_pkt(data_len, data);