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

Commit 69956fd0 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge "Remove deprecated non-const STREAM_TO_BDADDR" into main

parents ff734e75 e2883e1c

system/stack/btm/btm_ble_gap.cc

+2 −2
Original line number Diff line number Diff line
@@ -1443,7 +1443,7 @@ void BTM_BlePeriodicSyncSetInfo(RawAddress addr, uint16_t service_data, 
 * Description     Host receives this event when synced PA has BIGInfo

 *

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

void btm_ble_biginfo_adv_report_rcvd(uint8_t* p, uint16_t param_len) {

void btm_ble_biginfo_adv_report_rcvd(const uint8_t* p, uint16_t param_len) {

  LOG_DEBUG("[PAST]: BIGINFO report received, len=%u", param_len);

  uint16_t sync_handle, iso_interval, max_pdu, max_sdu;

  uint8_t num_bises, nse, bn, pto, irc, phy, framing, encryption;
@@ -1488,7 +1488,7 @@ void btm_ble_biginfo_adv_report_rcvd(uint8_t* p, uint16_t param_len) { 
 *                 synced to PA associated with sync handle

 *

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

void btm_ble_periodic_adv_sync_tx_rcvd(uint8_t* p, uint16_t param_len) {

void btm_ble_periodic_adv_sync_tx_rcvd(const uint8_t* p, uint16_t param_len) {

  LOG_DEBUG("[PAST]: PAST received, param_len=%u", param_len);

  if (param_len < 19) {

    LOG_ERROR("%s", "Insufficient data");

system/stack/include/btm_ble_api.h

+3 −2
Original line number Diff line number Diff line
@@ -479,8 +479,9 @@ void btm_ble_periodic_adv_report(uint16_t sync_handle, uint8_t tx_power, 
                                 const uint8_t* periodic_data);

void btm_ble_periodic_adv_sync_lost(uint16_t sync_handle);



void btm_ble_biginfo_adv_report_rcvd(uint8_t* param, uint16_t param_len);

void btm_ble_periodic_adv_sync_tx_rcvd(uint8_t* param, uint16_t param_len);

void btm_ble_biginfo_adv_report_rcvd(const uint8_t* param, uint16_t param_len);

void btm_ble_periodic_adv_sync_tx_rcvd(const uint8_t* param,

                                       uint16_t param_len);

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

 *

 * Function         BTM_BleStartPeriodicSync

system/test/mock/mock_stack_btm_ble_gap.cc

+2 −2
Original line number Diff line number Diff line
@@ -250,11 +250,11 @@ void BTM_BlePeriodicSyncTxParameters(RawAddress /* addr */, uint8_t /* mode */, 
                                     StartSyncCb /* syncCb */) {

  inc_func_call_count(__func__);

}

void btm_ble_periodic_adv_sync_tx_rcvd(uint8_t* /* p */,

void btm_ble_periodic_adv_sync_tx_rcvd(const uint8_t* /* p */,

                                       uint16_t /* param_len */) {

  inc_func_call_count(__func__);

}

void btm_ble_biginfo_adv_report_rcvd(uint8_t* /* p */,

void btm_ble_biginfo_adv_report_rcvd(const uint8_t* /* p */,

                                     uint16_t /* param_len */) {

  inc_func_call_count(__func__);

}

system/types/raw_address.h

+0 −6
Original line number Diff line number Diff line
@@ -107,9 +107,3 @@ inline void STREAM_TO_BDADDR(RawAddress& a, const uint8_t*& p) { 
  uint8_t* pbda = (uint8_t*)(a.address) + BD_ADDR_LEN - 1;

  for (int ijk = 0; ijk < BD_ADDR_LEN; ijk++) *pbda-- = *(p)++;

}
 


// DEPRECATED

inline void STREAM_TO_BDADDR(RawAddress& a, uint8_t*& p) {

  uint8_t* pbda = (uint8_t*)(a.address) + BD_ADDR_LEN - 1;

  for (int ijk = 0; ijk < BD_ADDR_LEN; ijk++) *pbda-- = *(p)++;

}