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

Commit 4e75b452 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "stack:: Use proper type tHCI_STATUS [#2]" into main

parents 87795d4a 154bcb91

system/bta/hf_client/bta_hf_client_sco.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -106,7 +106,7 @@ void bta_hf_client_cback_sco(tBTA_HF_CLIENT_CB* client_cb, uint8_t event) { 
static void bta_hf_client_sco_conn_rsp(tBTA_HF_CLIENT_CB* client_cb,

static void bta_hf_client_sco_conn_rsp(tBTA_HF_CLIENT_CB* client_cb,

                                       tBTM_ESCO_CONN_REQ_EVT_DATA* p_data) {

                                       tBTM_ESCO_CONN_REQ_EVT_DATA* p_data) {

  enh_esco_params_t resp;

  enh_esco_params_t resp;

  uint8_t hci_status = HCI_SUCCESS;

  tHCI_STATUS hci_status = HCI_SUCCESS;





  log::verbose("");

  log::verbose("");

system/stack/btm/btm_sco.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -1607,7 +1607,7 @@ static tBTM_STATUS BTM_ChangeEScoLinkParms(uint16_t sco_inx, 
 * Returns          void

 * Returns          void

 *

 *

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

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

void BTM_EScoConnRsp(uint16_t sco_inx, uint8_t hci_status,

void BTM_EScoConnRsp(uint16_t sco_inx, tHCI_STATUS hci_status,

                     enh_esco_params_t* p_parms) {

                     enh_esco_params_t* p_parms) {

  if (sco_inx < BTM_MAX_SCO_LINKS &&

  if (sco_inx < BTM_MAX_SCO_LINKS &&

      btm_cb.sco_cb.sco_db[sco_inx].state == SCO_ST_W4_CONN_RSP) {

      btm_cb.sco_cb.sco_db[sco_inx].state == SCO_ST_W4_CONN_RSP) {

system/stack/include/btm_api.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -527,7 +527,7 @@ void BTM_RemoveSco(const RawAddress& bda); 
 * Returns          void

 * Returns          void

 *

 *

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

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

void BTM_EScoConnRsp(uint16_t sco_inx, uint8_t hci_status,

void BTM_EScoConnRsp(uint16_t sco_inx, tHCI_STATUS hci_status,

                     enh_esco_params_t* p_parms);

                     enh_esco_params_t* p_parms);





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

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

system/stack/include/btm_client_interface.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -139,7 +139,7 @@ struct btm_client_interface_t { 
        uint16_t sco_inx, tBTM_ESCO_CBACK* p_esco_cback);

        uint16_t sco_inx, tBTM_ESCO_CBACK* p_esco_cback);

    [[nodiscard]] tBTM_STATUS (*BTM_RemoveSco)(uint16_t sco_inx);

    [[nodiscard]] tBTM_STATUS (*BTM_RemoveSco)(uint16_t sco_inx);

    void (*BTM_WriteVoiceSettings)(uint16_t settings);

    void (*BTM_WriteVoiceSettings)(uint16_t settings);

    void (*BTM_EScoConnRsp)(uint16_t sco_inx, uint8_t hci_status,

    void (*BTM_EScoConnRsp)(uint16_t sco_inx, tHCI_STATUS hci_status,

                            enh_esco_params_t* p_parms);

                            enh_esco_params_t* p_parms);

    [[nodiscard]] uint8_t (*BTM_GetNumScoLinks)();

    [[nodiscard]] uint8_t (*BTM_GetNumScoLinks)();

    [[nodiscard]] tBTM_STATUS (*BTM_SetEScoMode)(enh_esco_params_t* p_parms);

    [[nodiscard]] tBTM_STATUS (*BTM_SetEScoMode)(enh_esco_params_t* p_parms);

system/stack/include/l2cap_hci_link_interface.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ 
bool l2c_link_hci_disc_comp(uint16_t handle, tHCI_REASON reason);

bool l2c_link_hci_disc_comp(uint16_t handle, tHCI_REASON reason);





void l2c_link_role_changed(const RawAddress* bd_addr, uint8_t new_role,

void l2c_link_role_changed(const RawAddress* bd_addr, uint8_t new_role,

                           uint8_t hci_status);

                           tHCI_STATUS hci_status);





bool l2cble_conn_comp(uint16_t handle, uint8_t role, const RawAddress& bda,

bool l2cble_conn_comp(uint16_t handle, uint8_t role, const RawAddress& bda,

                      tBLE_ADDR_TYPE type, uint16_t conn_interval,

                      tBLE_ADDR_TYPE type, uint16_t conn_interval,