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

Commit 92a79539 authored by Chris Manton's avatar Chris Manton
Browse files

mock: [13/63] Remove BTM_CreateSco use btm_client_interface

Use get_btm_client_interface() instead

Bug: 352129816
Test: m .
Flag: EXEMPT, Test infrastructure

Change-Id: I4298c4471c1411b4944e420496f7c809344d817f
parent cd3a0e70
Loading
Loading
Loading
Loading
+6 −5
Original line number Diff line number Diff line
@@ -555,8 +555,9 @@ void bta_ag_create_sco(tBTA_AG_SCB* p_scb, bool is_orig) {
      }
    }

    if (BTM_CreateSco(&p_scb->peer_addr, true, params.packet_types, &p_scb->sco_idx,
                      bta_ag_sco_conn_cback, bta_ag_sco_disc_cback) == BTM_CMD_STARTED) {
    if (get_btm_client_interface().sco.BTM_CreateSco(&p_scb->peer_addr, true, params.packet_types,
                                                     &p_scb->sco_idx, bta_ag_sco_conn_cback,
                                                     bta_ag_sco_disc_cback) == BTM_CMD_STARTED) {
      /* Initiating the connection, set the current sco handle */
      bta_ag_cb.sco.cur_idx = p_scb->sco_idx;
      /* Configure input/output data. */
@@ -568,9 +569,9 @@ void bta_ag_create_sco(tBTA_AG_SCB* p_scb, bool is_orig) {
               params.packet_types);
  } else {
    /* Not initiating, go to listen mode */
    tBTM_STATUS btm_status =
            BTM_CreateSco(&p_scb->peer_addr, false, params.packet_types, &p_scb->sco_idx,
                          bta_ag_sco_conn_cback, bta_ag_sco_disc_cback);
    tBTM_STATUS btm_status = get_btm_client_interface().sco.BTM_CreateSco(
            &p_scb->peer_addr, false, params.packet_types, &p_scb->sco_idx, bta_ag_sco_conn_cback,
            bta_ag_sco_disc_cback);
    if (btm_status == BTM_CMD_STARTED) {
      if (get_btm_client_interface().sco.BTM_RegForEScoEvts(
                  p_scb->sco_idx, bta_ag_esco_connreq_cback) != BTM_SUCCESS) {
+3 −2
Original line number Diff line number Diff line
@@ -259,7 +259,8 @@ static void bta_hf_client_sco_create(tBTA_HF_CLIENT_CB* client_cb, bool is_orig)
    bta_sys_sco_use(BTA_ID_HS, 1, client_cb->peer_addr);
  }

  status = BTM_CreateSco(&client_cb->peer_addr, is_orig, params.packet_types, &client_cb->sco_idx,
  status = get_btm_client_interface().sco.BTM_CreateSco(
          &client_cb->peer_addr, is_orig, params.packet_types, &client_cb->sco_idx,
          bta_hf_client_sco_conn_cback, bta_hf_client_sco_disc_cback);
  if (status == BTM_CMD_STARTED && !is_orig) {
    if (!BTM_RegForEScoEvts(client_cb->sco_idx, bta_hf_client_esco_connreq_cback)) {
+16 −1
Original line number Diff line number Diff line
@@ -272,10 +272,18 @@ TEST_F_WITH_FLAGS(BtaAgCmdTest, at_hfp_cback__qcs_ev_codec_disabled,
TEST_F_WITH_FLAGS(BtaAgCmdTest, at_hfp_cback__qcs_ev_codec_q0_enabled,
                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(TEST_BT, hfp_codec_aptx_voice))) {
  reset_mock_btm_client_interface();
  mock_btm_client_interface.sco.BTM_SetEScoMode = [](enh_esco_params_t* p_parms) -> tBTM_STATUS {
  mock_btm_client_interface.sco.BTM_SetEScoMode =
          [](enh_esco_params_t* /* p_parms */) -> tBTM_STATUS {
    inc_func_call_count("BTM_SetEScoMode");
    return BTM_SUCCESS;
  };
  mock_btm_client_interface.sco.BTM_CreateSco =
          [](const RawAddress* /* remote_bda */, bool /* is_orig */, uint16_t /* pkt_types */,
             uint16_t* /* p_sco_inx */, tBTM_SCO_CB* /* p_conn_cb */,
             tBTM_SCO_CB* /* p_disc_cb */) -> tBTM_STATUS {
    inc_func_call_count("BTM_CreateSco");
    return BTM_CMD_STARTED;
  };

  tBTA_AG_SCB p_scb = {.peer_addr = addr,
                       .sco_idx = BTM_INVALID_SCO_INDEX,
@@ -309,6 +317,13 @@ TEST_F_WITH_FLAGS(BtaAgCmdTest, handle_swb_at_event__qcs_ev_codec_q1_fallback_to
    inc_func_call_count("BTM_SetEScoMode");
    return BTM_SUCCESS;
  };
  mock_btm_client_interface.sco.BTM_CreateSco =
          [](const RawAddress* /* remote_bda */, bool /* is_orig */, uint16_t /* pkt_types */,
             uint16_t* /* p_sco_inx */, tBTM_SCO_CB* /* p_conn_cb */,
             tBTM_SCO_CB* /* p_disc_cb */) -> tBTM_STATUS {
    inc_func_call_count("BTM_CreateSco");
    return BTM_CMD_STARTED;
  };

  tBTA_AG_SCB p_scb = {.peer_addr = addr,
                       .sco_idx = BTM_INVALID_SCO_INDEX,
+3 −2
Original line number Diff line number Diff line
@@ -151,7 +151,8 @@ static sco_socket_t* sco_socket_establish_locked(bool is_listening, const RawAdd
  }

  params = esco_parameters_for_codec(SCO_CODEC_CVSD_D1, true);
  status = BTM_CreateSco(bd_addr, !is_listening, params.packet_types, &sco_socket->sco_handle,
  status = get_btm_client_interface().sco.BTM_CreateSco(
          bd_addr, !is_listening, params.packet_types, &sco_socket->sco_handle,
          connect_completed_cb, disconnect_completed_cb);
  if (status != BTM_CMD_STARTED) {
    log::error("unable to create SCO socket: {}", status);