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

Commit 85defca0 authored by Ajay Panicker's avatar Ajay Panicker
Browse files

Remove some usages of UINT_TO_PTR macro 

Bug: 32995283
Test: Sanity test with various devices
Change-Id: I20a0b1571c044170ba5a8792d8e990a6790cbce2
parent 6eb3bfb0

system/bta/include/bta_jv_api.h

+4 −3
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ typedef union { 


/* JAVA DM Interface callback */

typedef void(tBTA_JV_DM_CBACK)(tBTA_JV_EVT event, tBTA_JV* p_data,

                               void* user_data);

                               uint32_t id);



/* JAVA RFCOMM interface callback */

typedef void*(tBTA_JV_RFCOMM_CBACK)(tBTA_JV_EVT event, tBTA_JV* p_data,
@@ -451,7 +451,7 @@ bool BTA_JvIsEncrypted(BD_ADDR bd_addr); 
 *                  BTA_JV_FAILURE, otherwise.

 *

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

tBTA_JV_STATUS BTA_JvGetChannelId(int conn_type, void* user_data,

tBTA_JV_STATUS BTA_JvGetChannelId(int conn_type, uint32_t id,

                                  int32_t channel);



/*******************************************************************************
@@ -481,7 +481,8 @@ tBTA_JV_STATUS BTA_JvFreeChannel(uint16_t channel, int conn_type); 
 *

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

tBTA_JV_STATUS BTA_JvStartDiscovery(BD_ADDR bd_addr, uint16_t num_uuid,

                                    tSDP_UUID* p_uuid_list, void* user_data);

                                    tSDP_UUID* p_uuid_list,

                                    uint32_t rfcomm_slot_id);



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

 *

system/bta/jv/bta_jv_act.cc

+7 −7
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ void bta_jv_get_channel_id(tBTA_JV_MSG* p_data) { 
      }

      if (bta_jv_cb.p_dm_cback)

        bta_jv_cb.p_dm_cback(BTA_JV_GET_SCN_EVT, (tBTA_JV*)&scn,

                             p_data->alloc_channel.user_data);

                             p_data->alloc_channel.rfcomm_slot_id);

      return;

    }

    case BTA_JV_CONN_TYPE_L2CAP:
@@ -733,7 +733,7 @@ void bta_jv_get_channel_id(tBTA_JV_MSG* p_data) { 


  if (bta_jv_cb.p_dm_cback)

    bta_jv_cb.p_dm_cback(BTA_JV_GET_PSM_EVT, (tBTA_JV*)&psm,

                         p_data->alloc_channel.user_data);

                         p_data->alloc_channel.l2cap_socket_id);

}



/*******************************************************************************
@@ -835,7 +835,7 @@ static void bta_jv_start_discovery_cback(uint16_t result, void* user_data) { 


    dcomp.status = status;

    bta_jv_cb.p_dm_cback(BTA_JV_DISCOVERY_COMP_EVT, (tBTA_JV*)&dcomp,

                         user_data);

                         PTR_TO_UINT(user_data));

  }

}
@@ -857,7 +857,7 @@ void bta_jv_start_discovery(tBTA_JV_MSG* p_data) { 
    status = BTA_JV_BUSY;

    if (bta_jv_cb.p_dm_cback)

      bta_jv_cb.p_dm_cback(BTA_JV_DISCOVERY_COMP_EVT, (tBTA_JV*)&status,

                           p_data->start_discovery.user_data);

                           p_data->start_discovery.rfcomm_slot_id);

    return;

  }
@@ -879,12 +879,12 @@ void bta_jv_start_discovery(tBTA_JV_MSG* p_data) { 
  bta_jv_cb.sdp_active = BTA_JV_SDP_ACT_YES;

  if (!SDP_ServiceSearchAttributeRequest2(

          p_data->start_discovery.bd_addr, p_bta_jv_cfg->p_sdp_db,

          bta_jv_start_discovery_cback, p_data->start_discovery.user_data)) {

          bta_jv_start_discovery_cback, UINT_TO_PTR(p_data->start_discovery.rfcomm_slot_id))) {

    bta_jv_cb.sdp_active = BTA_JV_SDP_ACT_NONE;

    /* failed to start SDP. report the failure right away */

    if (bta_jv_cb.p_dm_cback)

      bta_jv_cb.p_dm_cback(BTA_JV_DISCOVERY_COMP_EVT, (tBTA_JV*)&status,

                           p_data->start_discovery.user_data);

                           p_data->start_discovery.rfcomm_slot_id);

  }

  /*

  else report the result when the cback is called
@@ -908,7 +908,7 @@ void bta_jv_create_record(tBTA_JV_MSG* p_data) { 
    // callback user immediately to create his own sdp record in stack thread

    // context

    bta_jv_cb.p_dm_cback(BTA_JV_CREATE_RECORD_EVT, (tBTA_JV*)&evt_data,

                         cr->user_data);

                         PTR_TO_UINT(cr->user_data));

}



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

system/bta/jv/bta_jv_api.cc

+12 −4
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ bool BTA_JvIsEncrypted(BD_ADDR bd_addr) { 
 *                  BTA_JV_FAILURE, otherwise.

 *

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

tBTA_JV_STATUS BTA_JvGetChannelId(int conn_type, void* user_data,

tBTA_JV_STATUS BTA_JvGetChannelId(int conn_type, uint32_t id,

                                  int32_t channel) {

  tBTA_JV_API_ALLOC_CHANNEL* p_msg =

      (tBTA_JV_API_ALLOC_CHANNEL*)osi_malloc(sizeof(tBTA_JV_API_ALLOC_CHANNEL));
@@ -157,7 +157,15 @@ tBTA_JV_STATUS BTA_JvGetChannelId(int conn_type, void* user_data, 
  p_msg->hdr.event = BTA_JV_API_GET_CHANNEL_EVT;

  p_msg->type = conn_type;

  p_msg->channel = channel;

  p_msg->user_data = user_data;

  if (conn_type == BTA_JV_CONN_TYPE_RFCOMM) {

     p_msg->rfcomm_slot_id = id;

  } else if (conn_type == BTA_JV_CONN_TYPE_L2CAP ||

             conn_type == BTA_JV_CONN_TYPE_L2CAP_LE) {

     p_msg->l2cap_socket_id = id;

  } else {

     APPL_TRACE_ERROR("%s: Invalid connection type");

     return BTA_JV_FAILURE;

  }



  bta_sys_sendmsg(p_msg);
@@ -207,7 +215,7 @@ tBTA_JV_STATUS BTA_JvFreeChannel(uint16_t channel, int conn_type) { 
 *

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

tBTA_JV_STATUS BTA_JvStartDiscovery(BD_ADDR bd_addr, uint16_t num_uuid,

                                    tSDP_UUID* p_uuid_list, void* user_data) {

                                    tSDP_UUID* p_uuid_list, uint32_t rfcomm_slot_id) {

  tBTA_JV_API_START_DISCOVERY* p_msg = (tBTA_JV_API_START_DISCOVERY*)osi_malloc(

      sizeof(tBTA_JV_API_START_DISCOVERY));
@@ -218,7 +226,7 @@ tBTA_JV_STATUS BTA_JvStartDiscovery(BD_ADDR bd_addr, uint16_t num_uuid, 
  p_msg->num_uuid = num_uuid;

  memcpy(p_msg->uuid_list, p_uuid_list, num_uuid * sizeof(tSDP_UUID));

  p_msg->num_attr = 0;

  p_msg->user_data = user_data;

  p_msg->rfcomm_slot_id = rfcomm_slot_id;



  bta_sys_sendmsg(p_msg);

system/bta/jv/bta_jv_int.h

+3 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ typedef struct { 
  tSDP_UUID uuid_list[BTA_JV_MAX_UUIDS];

  uint16_t num_attr;

  uint16_t attr_list[BTA_JV_MAX_ATTRS];

  void* user_data; /* piggyback caller's private data*/

  uint32_t rfcomm_slot_id;

} tBTA_JV_API_START_DISCOVERY;



enum {
@@ -317,7 +317,8 @@ typedef struct { 
  BT_HDR hdr;

  int32_t type;    /* One of BTA_JV_CONN_TYPE_ */

  int32_t channel; /* optionally request a specific channel */

  void* user_data;

  uint32_t l2cap_socket_id;

  uint32_t rfcomm_slot_id;

} tBTA_JV_API_ALLOC_CHANNEL;

/* union of all data types */

typedef union {

system/btif/src/btif_sock_l2cap.cc

+2 −2
Original line number Diff line number Diff line
@@ -855,11 +855,11 @@ static bt_status_t btSock_start_l2cap_server_l(l2cap_socket* sock) { 
     * else we request a PSM and start the server after we receive a PSM. */

    if (sock->channel < 0) {

      if (sock->is_le_coc) {

        if (BTA_JvGetChannelId(BTA_JV_CONN_TYPE_L2CAP_LE, UINT_TO_PTR(sock->id),

        if (BTA_JvGetChannelId(BTA_JV_CONN_TYPE_L2CAP_LE, sock->id,

                               0) != BTA_JV_SUCCESS)

          stat = BT_STATUS_FAIL;

      } else {

        if (BTA_JvGetChannelId(BTA_JV_CONN_TYPE_L2CAP, UINT_TO_PTR(sock->id),

        if (BTA_JvGetChannelId(BTA_JV_CONN_TYPE_L2CAP, sock->id,

                               0) != BTA_JV_SUCCESS)

          stat = BT_STATUS_FAIL;

      }