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

Commit 136891d1 authored by Chris Manton's avatar Chris Manton
Browse files

Variable rename stack::rfcomm::p_mgmt_cb -> p_mgmt_callback 

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

Change-Id: I4f94206dac0a1dbc5dc90c52b1871f34b064f62d
parent 3af7742a

system/stack/include/port_api.h

+3 −3
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ struct formatter<tPORT_RESULT> : enum_formatter<tPORT_RESULT> {}; 
 *                  mask         - specifies events to be enabled.  A value

 *                                 of zero disables all events.

 *                  p_handle     - OUT pointer to the handle.

 *                  p_mgmt_cb    - pointer to callback function to receive

 *                  p_mgmt_callback - pointer to callback function to receive

 *                                 connection up/down events.

 * Notes:

 *
@@ -224,8 +224,8 @@ struct formatter<tPORT_RESULT> : enum_formatter<tPORT_RESULT> {}; 
 ******************************************************************************/

[[nodiscard]] int RFCOMM_CreateConnectionWithSecurity(

    uint16_t uuid, uint8_t scn, bool is_server, uint16_t mtu,

    const RawAddress& bd_addr, uint16_t* p_handle, tPORT_CALLBACK* p_mgmt_cb,

    uint16_t sec_mask);

    const RawAddress& bd_addr, uint16_t* p_handle,

    tPORT_CALLBACK* p_mgmt_callback, uint16_t sec_mask);



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

 *

system/stack/rfcomm/port_api.cc

+3 −3
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ const char kBtmLogTag[] = "RFCOMM"; 
 *                  mtu          - Maximum frame size the application can accept

 *                  bd_addr      - address of the peer (client)

 *                  p_handle     - OUT pointer to the handle.

 *                  p_mgmt_cb    - pointer to callback function to receive

 *                  p_mgmt_callback - pointer to callback function to receive

 *                                 connection up/down events.

 *                  sec_mask     - bitmask of BTM_SEC_* values indicating the

 *                                 minimum security requirements for this
@@ -112,7 +112,7 @@ int RFCOMM_CreateConnectionWithSecurity(uint16_t uuid, uint8_t scn, 
                                        bool is_server, uint16_t mtu,

                                        const RawAddress& bd_addr,

                                        uint16_t* p_handle,

                                        tPORT_CALLBACK* p_mgmt_cb,

                                        tPORT_CALLBACK* p_mgmt_callback,

                                        uint16_t sec_mask) {

  *p_handle = 0;
@@ -217,7 +217,7 @@ int RFCOMM_CreateConnectionWithSecurity(uint16_t uuid, uint8_t scn, 
  }

  p_port->local_ctrl.modem_signal = p_port->default_signal_state;

  p_port->local_ctrl.fc = false;

  p_port->p_mgmt_callback = p_mgmt_cb;

  p_port->p_mgmt_callback = p_mgmt_callback;

  p_port->bd_addr = bd_addr;



  log::info(

system/test/mock/mock_stack_rfcomm_port_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ int RFCOMM_CreateConnectionWithSecurity(uint16_t /* uuid */, uint8_t /* scn */, 
                                        uint16_t /* mtu */,

                                        const RawAddress& /* bd_addr */,

                                        uint16_t* /* p_handle */,

                                        tPORT_CALLBACK* /* p_mgmt_cb */,

                                        tPORT_CALLBACK* /* p_mgmt_callback */,

                                        uint16_t /* sec_mask */) {

  inc_func_call_count(__func__);

  return 0;