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

Commit 5d8936ff authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge "Make btm_route_sco_data static" into main

parents 869bc6bd a0d79383

system/stack/btm/btm_sco.cc

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ constexpr char kBtmLogTag[] = "SCO"; 
using bluetooth::legacy::hci::GetInterface;



// forward declaration for dequeueing packets

void btm_route_sco_data(bluetooth::hci::ScoView valid_packet);

static void btm_route_sco_data(bluetooth::hci::ScoView valid_packet);



namespace cpp {

bluetooth::common::BidiQueueEnd<bluetooth::hci::ScoBuilder,
@@ -281,7 +281,7 @@ static tSCO_CONN* btm_get_active_sco() { 
 * Returns          void

 *

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

void btm_route_sco_data(bluetooth::hci::ScoView valid_packet) {

static void btm_route_sco_data(bluetooth::hci::ScoView valid_packet) {

  uint16_t handle = valid_packet.GetHandle();

  if (handle > HCI_HANDLE_MAX) {

    LOG_ERROR("Dropping SCO data with invalid handle: 0x%X > 0x%X, ", handle,

system/test/mock/mock_stack_btm_sco.cc

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ void BTM_EScoConnRsp(uint16_t sco_inx, uint8_t hci_status, 
  inc_func_call_count(__func__);

}

void BTM_RemoveSco(const RawAddress& bda) { inc_func_call_count(__func__); }

void btm_route_sco_data(BT_HDR* p_msg) { inc_func_call_count(__func__); }

void btm_sco_acl_removed(const RawAddress* bda) {

  inc_func_call_count(__func__);

}