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

Commit 0a4c694e authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge changes I8f250752,I9c44c412 into main 

* changes:
  Remove Gd from HandleGdNumComplDataPkts
  Remove HandleNumComplDataPkts only used in tests
parents 9bff2427 c7993545

system/bta/le_audio/mock_iso_manager.cc

+2 −4
Original line number Diff line number Diff line
@@ -121,13 +121,11 @@ void IsoManager::HandleDisconnect(uint16_t handle, uint8_t reason) { 
  pimpl_->HandleDisconnect(handle, reason);

}



void IsoManager::HandleNumComplDataPkts(uint8_t* p, uint8_t evt_len) {

void IsoManager::HandleNumComplDataPkts(uint16_t handle, uint16_t credits) {

  if (!pimpl_) return;

  pimpl_->HandleNumComplDataPkts(p, evt_len);

  pimpl_->HandleNumComplDataPkts(handle, credits);

}



void IsoManager::HandleGdNumComplDataPkts(uint16_t handle, uint16_t credits) {}



void IsoManager::HandleHciEvent(uint8_t sub_code, uint8_t* params,

                                uint16_t length) {

  if (!pimpl_) return;

system/bta/le_audio/mock_iso_manager.h

+2 −2
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ struct MockIsoManager { 
  MOCK_METHOD((void), TerminateBig, (uint8_t big_id, uint8_t reason));

  MOCK_METHOD((void), HandleIsoData, (void* p_msg));

  MOCK_METHOD((void), HandleDisconnect, (uint16_t handle, uint8_t reason));

  MOCK_METHOD((void), HandleNumComplDataPkts, (uint8_t * p, uint8_t evt_len));

  MOCK_METHOD((void), HandleGdNumComplDataPkts, (uint8_t * p, uint8_t evt_len));

  MOCK_METHOD((void), HandleNumComplDataPkts,

              (uint16_t handle, uint16_t credits));

  MOCK_METHOD((void), HandleHciEvent,

              (uint8_t sub_code, uint8_t* params, uint16_t length));

system/stack/acl/btm_acl.cc

+2 −2
Original line number Diff line number Diff line
@@ -2707,7 +2707,7 @@ void acl_rcv_acl_data(BT_HDR* p_msg) { 


void acl_packets_completed(uint16_t handle, uint16_t credits) {

  l2c_packets_completed(handle, credits);

  bluetooth::hci::IsoManager::GetInstance()->HandleGdNumComplDataPkts(handle,

  bluetooth::hci::IsoManager::GetInstance()->HandleNumComplDataPkts(handle,

                                                                    credits);

}

system/stack/btm/btm_iso.cc

+1 −6
Original line number Diff line number Diff line
@@ -126,12 +126,7 @@ void IsoManager::HandleDisconnect(uint16_t handle, uint8_t reason) { 
    pimpl_->iso_impl_->disconnection_complete(handle, reason);

}



void IsoManager::HandleNumComplDataPkts(uint8_t* p, uint8_t evt_len) {

  if (pimpl_->IsRunning())

    pimpl_->iso_impl_->handle_num_completed_pkts(p, evt_len);

}



void IsoManager::HandleGdNumComplDataPkts(uint16_t handle, uint16_t credits) {

void IsoManager::HandleNumComplDataPkts(uint16_t handle, uint16_t credits) {

  if (pimpl_->IsRunning())

    pimpl_->iso_impl_->handle_gd_num_completed_pkts(handle, credits);

}

system/stack/btm/btm_iso_impl.h

+0 −29
Original line number Diff line number Diff line
@@ -657,35 +657,6 @@ struct iso_impl { 
    }

  }



  void handle_num_completed_pkts(uint8_t* p, uint8_t evt_len) {

    uint8_t num_handles;



    STREAM_TO_UINT8(num_handles, p);



    LOG_ASSERT(evt_len == num_handles * 4 + 1);



    for (int i = 0; i < num_handles; i++) {

      uint16_t handle, num_sent;



      STREAM_TO_UINT16(handle, p);

      STREAM_TO_UINT16(num_sent, p);



      auto iter = conn_hdl_to_cis_map_.find(handle);

      if (iter != conn_hdl_to_cis_map_.end()) {

        iter->second->used_credits -= num_sent;

        iso_credits_ += num_sent;

        continue;

      }



      iter = conn_hdl_to_bis_map_.find(handle);

      if (iter != conn_hdl_to_bis_map_.end()) {

        iter->second->used_credits -= num_sent;

        iso_credits_ += num_sent;

        continue;

      }

    }

  }



  void handle_gd_num_completed_pkts(uint16_t handle, uint16_t credits) {

    auto iter = conn_hdl_to_cis_map_.find(handle);

    if (iter != conn_hdl_to_cis_map_.end()) {