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

Commit 305011db authored by Chris Manton's avatar Chris Manton
Browse files

Update signature stack::rfcomm::PORT_MGMT_CALLBACK 

Bug: 341805467
Test: m .
Flag: EXEMPT, Mechanical Refactor

Change-Id: I5be6a27d7a24246c57026bbf26251ab448d8105f
parent b388022d

system/bta/ag/bta_ag_rfc.cc

+13 −13
Original line number Diff line number Diff line
@@ -45,12 +45,12 @@ void bta_ag_port_cback_3(uint32_t code, uint16_t port_handle); 
void bta_ag_port_cback_4(uint32_t code, uint16_t port_handle);

void bta_ag_port_cback_5(uint32_t code, uint16_t port_handle);

void bta_ag_port_cback_6(uint32_t code, uint16_t port_handle);

void bta_ag_mgmt_cback_1(uint32_t code, uint16_t port_handle);

void bta_ag_mgmt_cback_2(uint32_t code, uint16_t port_handle);

void bta_ag_mgmt_cback_3(uint32_t code, uint16_t port_handle);

void bta_ag_mgmt_cback_4(uint32_t code, uint16_t port_handle);

void bta_ag_mgmt_cback_5(uint32_t code, uint16_t port_handle);

void bta_ag_mgmt_cback_6(uint32_t code, uint16_t port_handle);

void bta_ag_mgmt_cback_1(const tPORT_RESULT code, uint16_t port_handle);

void bta_ag_mgmt_cback_2(const tPORT_RESULT code, uint16_t port_handle);

void bta_ag_mgmt_cback_3(const tPORT_RESULT code, uint16_t port_handle);

void bta_ag_mgmt_cback_4(const tPORT_RESULT code, uint16_t port_handle);

void bta_ag_mgmt_cback_5(const tPORT_RESULT code, uint16_t port_handle);

void bta_ag_mgmt_cback_6(const tPORT_RESULT code, uint16_t port_handle);



/* rfcomm callback function tables */

typedef tPORT_CALLBACK* tBTA_AG_PORT_CBACK;
@@ -105,7 +105,7 @@ static void bta_ag_port_cback(uint32_t /* code */, uint16_t port_handle, 
 * Returns          void

 *

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

static void bta_ag_mgmt_cback(uint32_t code, uint16_t port_handle,

static void bta_ag_mgmt_cback(const tPORT_RESULT code, uint16_t port_handle,

                              uint16_t handle) {

  tBTA_AG_SCB* p_scb = bta_ag_scb_by_idx(handle);

  log::verbose("code={}, port_handle={}, scb_handle={}, p_scb=0x{}", code,
@@ -171,22 +171,22 @@ static void bta_ag_mgmt_cback(uint32_t code, uint16_t port_handle, 
 * Returns          void

 *

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

void bta_ag_mgmt_cback_1(uint32_t code, uint16_t port_handle) {

void bta_ag_mgmt_cback_1(const tPORT_RESULT code, uint16_t port_handle) {

  bta_ag_mgmt_cback(code, port_handle, 1);

}

void bta_ag_mgmt_cback_2(uint32_t code, uint16_t port_handle) {

void bta_ag_mgmt_cback_2(const tPORT_RESULT code, uint16_t port_handle) {

  bta_ag_mgmt_cback(code, port_handle, 2);

}

void bta_ag_mgmt_cback_3(uint32_t code, uint16_t port_handle) {

void bta_ag_mgmt_cback_3(const tPORT_RESULT code, uint16_t port_handle) {

  bta_ag_mgmt_cback(code, port_handle, 3);

}

void bta_ag_mgmt_cback_4(uint32_t code, uint16_t port_handle) {

void bta_ag_mgmt_cback_4(const tPORT_RESULT code, uint16_t port_handle) {

  bta_ag_mgmt_cback(code, port_handle, 4);

}

void bta_ag_mgmt_cback_5(uint32_t code, uint16_t port_handle) {

void bta_ag_mgmt_cback_5(const tPORT_RESULT code, uint16_t port_handle) {

  bta_ag_mgmt_cback(code, port_handle, 5);

}

void bta_ag_mgmt_cback_6(uint32_t code, uint16_t port_handle) {

void bta_ag_mgmt_cback_6(const tPORT_RESULT code, uint16_t port_handle) {

  bta_ag_mgmt_cback(code, port_handle, 6);

}

void bta_ag_port_cback_1(uint32_t code, uint16_t port_handle) {

system/bta/hf_client/bta_hf_client_rfc.cc

+2 −1
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ static void bta_hf_client_port_cback(uint32_t /* code */, 
 * Returns          void

 *

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

static void bta_hf_client_mgmt_cback(uint32_t code, uint16_t port_handle) {

static void bta_hf_client_mgmt_cback(const tPORT_RESULT code,

                                     uint16_t port_handle) {

  tBTA_HF_CLIENT_CB* client_cb =

      bta_hf_client_find_cb_by_rfc_handle(port_handle);

system/bta/jv/bta_jv_act.cc

+4 −2
Original line number Diff line number Diff line
@@ -1372,7 +1372,8 @@ static int bta_jv_port_data_co_cback(uint16_t port_handle, uint8_t* buf, 
 * Returns      void

 *

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

static void bta_jv_port_mgmt_cl_cback(uint32_t code, uint16_t port_handle) {

static void bta_jv_port_mgmt_cl_cback(const tPORT_RESULT code,

                                      uint16_t port_handle) {

  tBTA_JV_RFC_CB* p_cb = bta_jv_rfc_port_to_cb(port_handle);

  tBTA_JV_PCB* p_pcb = bta_jv_rfc_port_to_pcb(port_handle);

  RawAddress rem_bda = RawAddress::kEmpty;
@@ -1594,7 +1595,8 @@ void bta_jv_rfcomm_close(uint32_t handle, uint32_t rfcomm_slot_id) { 
 * Returns      void

 *

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

static void bta_jv_port_mgmt_sr_cback(uint32_t code, uint16_t port_handle) {

static void bta_jv_port_mgmt_sr_cback(const tPORT_RESULT code,

                                      uint16_t port_handle) {

  tBTA_JV_PCB* p_pcb = bta_jv_rfc_port_to_pcb(port_handle);

  tBTA_JV_RFC_CB* p_cb = bta_jv_rfc_port_to_cb(port_handle);

  tBTA_JV evt_data;

system/stack/include/port_api.h

+2 −1
Original line number Diff line number Diff line
@@ -187,7 +187,8 @@ template <> 
struct formatter<tPORT_RESULT> : enum_formatter<tPORT_RESULT> {};

}  // namespace fmt



typedef void(tPORT_MGMT_CALLBACK)(uint32_t code, uint16_t port_handle);

typedef void(tPORT_MGMT_CALLBACK)(const tPORT_RESULT code,

                                  uint16_t port_handle);



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

 *  External Function Declarations

system/stack/rfcomm/port_rfc.cc

+5 −1
Original line number Diff line number Diff line
@@ -1017,7 +1017,11 @@ void port_rfc_closed(tPORT* p_port, uint8_t res) { 
  if ((p_port->p_callback != NULL) && events)

    p_port->p_callback(events, p_port->handle);



  if (p_port->p_mgmt_callback) p_port->p_mgmt_callback(res, p_port->handle);

  if (p_port->p_mgmt_callback) {

    uint32_t res2 = res;

    if (res2 >= PORT_ERR_MAX) res2 = PORT_ERR_MAX;

    p_port->p_mgmt_callback(static_cast<tPORT_RESULT>(res2), p_port->handle);

  }



  p_port->rfc.state = RFC_STATE_CLOSED;