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

Commit 184f3bb9 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

IA2: Properly type sco connection change callback am: c488b410 am:... 

IA2: Properly type sco connection change callback am: c488b410 am: 1aa70cc6 am: 06001a89 am: 1b51396d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2746126



Change-Id: I1bd171083dd4baad27a3db4fe24f524cade2e55b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d24a3878 1b51396d

system/bta/av/bta_av_main.cc

+7 −5
Original line number Original line Diff line number Diff line
@@ -106,8 +106,9 @@ static void bta_av_ci_data(tBTA_AV_DATA* p_data); 
static void bta_av_rpc_conn(tBTA_AV_DATA* p_data);

static void bta_av_rpc_conn(tBTA_AV_DATA* p_data);

static void bta_av_api_to_ssm(tBTA_AV_DATA* p_data);

static void bta_av_api_to_ssm(tBTA_AV_DATA* p_data);





static void bta_av_sco_chg_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,

static void bta_av_sco_chg_cback(tBTA_SYS_CONN_STATUS status,

                                 uint8_t app_id, const RawAddress& peer_addr);

                                 uint8_t num_sco_links, uint8_t app_id,

                                 const RawAddress& peer_addr);

static void bta_av_sys_rs_cback(tBTA_SYS_CONN_STATUS status, tHCI_ROLE new_role,

static void bta_av_sys_rs_cback(tBTA_SYS_CONN_STATUS status, tHCI_ROLE new_role,

                                tHCI_STATUS hci_status,

                                tHCI_STATUS hci_status,

                                const RawAddress& peer_addr);

                                const RawAddress& peer_addr);
@@ -1011,7 +1012,8 @@ static void bta_av_sys_rs_cback(UNUSED_ATTR tBTA_SYS_CONN_STATUS status, 
 * Returns          void

 * Returns          void

 *

 *

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

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

static void bta_av_sco_chg_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,

static void bta_av_sco_chg_cback(tBTA_SYS_CONN_STATUS status,

                                 uint8_t num_sco_links,

                                 UNUSED_ATTR uint8_t app_id,

                                 UNUSED_ATTR uint8_t app_id,

                                 UNUSED_ATTR const RawAddress& peer_addr) {

                                 UNUSED_ATTR const RawAddress& peer_addr) {

  tBTA_AV_SCB* p_scb;

  tBTA_AV_SCB* p_scb;
@@ -1019,8 +1021,8 @@ static void bta_av_sco_chg_cback(tBTA_SYS_CONN_STATUS status, uint8_t id, 
  tBTA_AV_API_STOP stop;

  tBTA_AV_API_STOP stop;





  LOG(INFO) << __func__ << ": status=" << bta_sys_conn_status_text(status)

  LOG(INFO) << __func__ << ": status=" << bta_sys_conn_status_text(status)

            << ", num_links=" << +id;

            << ", num_links=" << +num_sco_links;

  if (id) {

  if (num_sco_links) {

    bta_av_cb.sco_occupied = true;

    bta_av_cb.sco_occupied = true;

    LOG_DEBUG("SCO occupied peer:%s status:%s", ADDRESS_TO_LOGGABLE_CSTR(peer_addr),

    LOG_DEBUG("SCO occupied peer:%s status:%s", ADDRESS_TO_LOGGABLE_CSTR(peer_addr),

              bta_sys_conn_status_text(status).c_str());

              bta_sys_conn_status_text(status).c_str());

system/bta/sys/bta_sys.h

+5 −1
Original line number Original line Diff line number Diff line
@@ -166,6 +166,10 @@ inline std::string bta_sys_conn_status_text(tBTA_SYS_CONN_STATUS status) { 
typedef void(tBTA_SYS_CONN_CBACK)(tBTA_SYS_CONN_STATUS status,

typedef void(tBTA_SYS_CONN_CBACK)(tBTA_SYS_CONN_STATUS status,

                                  const tBTA_SYS_ID id, uint8_t app_id,

                                  const tBTA_SYS_ID id, uint8_t app_id,

                                  const RawAddress& peer_addr);

                                  const RawAddress& peer_addr);

/* conn callback for sco change */

typedef void(tBTA_SYS_CONN_SCO_CBACK)(tBTA_SYS_CONN_STATUS status,

                                      uint8_t num_sco_links, uint8_t app_id,

                                      const RawAddress& peer_addr);

/* callback for role switch */

/* callback for role switch */

typedef void(tBTA_SYS_ROLE_SWITCH_CBACK)(tBTA_SYS_CONN_STATUS status,

typedef void(tBTA_SYS_ROLE_SWITCH_CBACK)(tBTA_SYS_CONN_STATUS status,

                                         tHCI_ROLE new_role,

                                         tHCI_ROLE new_role,
@@ -224,7 +228,7 @@ void bta_sys_disable(); 
void bta_sys_rm_register(tBTA_SYS_CONN_CBACK* p_cback);

void bta_sys_rm_register(tBTA_SYS_CONN_CBACK* p_cback);

void bta_sys_pm_register(tBTA_SYS_CONN_CBACK* p_cback);

void bta_sys_pm_register(tBTA_SYS_CONN_CBACK* p_cback);





void bta_sys_sco_register(tBTA_SYS_CONN_CBACK* p_cback);

void bta_sys_sco_register(tBTA_SYS_CONN_SCO_CBACK* p_cback);





void bta_sys_conn_open(tBTA_SYS_ID id, uint8_t app_id,

void bta_sys_conn_open(tBTA_SYS_ID id, uint8_t app_id,

                       const RawAddress& peer_addr);

                       const RawAddress& peer_addr);

system/bta/sys/bta_sys_conn.cc

+2 −2
Original line number Original line Diff line number Diff line
@@ -152,7 +152,7 @@ void bta_sys_notify_collision(const RawAddress& peer_addr) { 
 * Returns          void

 * Returns          void

 *

 *

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

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

void bta_sys_sco_register(tBTA_SYS_CONN_CBACK* p_cback) {

void bta_sys_sco_register(tBTA_SYS_CONN_SCO_CBACK* p_cback) {

  bta_sys_cb.p_sco_cb = p_cback;

  bta_sys_cb.p_sco_cb = p_cback;

}

}
@@ -325,7 +325,7 @@ void bta_sys_sco_use(UNUSED_ATTR tBTA_SYS_ID id, uint8_t app_id, 
 * Returns          void

 * Returns          void

 *

 *

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

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

void bta_sys_sco_unuse(uint8_t id, uint8_t app_id,

void bta_sys_sco_unuse(UNUSED_ATTR tBTA_SYS_ID id, uint8_t app_id,

                       const RawAddress& peer_addr) {

                       const RawAddress& peer_addr) {

  if ((bta_sys_cb.p_sco_cb)) {

  if ((bta_sys_cb.p_sco_cb)) {

    uint8_t num_sco_links = BTM_GetNumScoLinks();

    uint8_t num_sco_links = BTM_GetNumScoLinks();

system/bta/sys/bta_sys_int.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ typedef struct { 
  tBTA_SYS_CONN_CBACK* prm_cb; /* role management callback registered by DM */

  tBTA_SYS_CONN_CBACK* prm_cb; /* role management callback registered by DM */

  tBTA_SYS_CONN_CBACK*

  tBTA_SYS_CONN_CBACK*

      ppm_cb; /* low power management callback registered by DM */

      ppm_cb; /* low power management callback registered by DM */

  tBTA_SYS_CONN_CBACK*

  tBTA_SYS_CONN_SCO_CBACK*

      p_sco_cb; /* SCO connection change callback registered by AV */

      p_sco_cb; /* SCO connection change callback registered by AV */

  tBTA_SYS_ROLE_SWITCH_CBACK*

  tBTA_SYS_ROLE_SWITCH_CBACK*

      p_role_cb;                  /* role change callback registered by AV */

      p_role_cb;                  /* role change callback registered by AV */

system/test/mock/mock_bta_sys_conn.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ void bta_sys_sco_close(uint8_t id, uint8_t app_id, 
void bta_sys_sco_open(uint8_t id, uint8_t app_id, const RawAddress& peer_addr) {

void bta_sys_sco_open(uint8_t id, uint8_t app_id, const RawAddress& peer_addr) {

  inc_func_call_count(__func__);

  inc_func_call_count(__func__);

}

}

void bta_sys_sco_register(tBTA_SYS_CONN_CBACK* p_cback) {

void bta_sys_sco_register(tBTA_SYS_CONN_SCO_CBACK* p_cback) {

  inc_func_call_count(__func__);

  inc_func_call_count(__func__);

}

}

void bta_sys_sco_unuse(tBTA_SYS_ID id, uint8_t app_id,

void bta_sys_sco_unuse(tBTA_SYS_ID id, uint8_t app_id,