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

Commit d2d33d80 authored by Chris Manton's avatar Chris Manton
Browse files

legacy: Const-ify extended inquiry response path 

Bug: 187830698
Tag: #refactor
Test: gd/cert/run

Change-Id: I6c7d58ede4ee5143ee17f907d6326f14d2ae39d1
parent 19ed873f

system/bta/dm/bta_dm_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ tBTA_STATUS BTA_DmRemoveDevice(const RawAddress& bd_addr) { 
 *

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

extern const uint16_t bta_service_id_to_uuid_lkup_tbl[];

void BTA_GetEirService(uint8_t* p_eir, size_t eir_len,

void BTA_GetEirService(const uint8_t* p_eir, size_t eir_len,

                       tBTA_SERVICE_MASK* p_services) {

  uint8_t xx, yy;

  uint8_t num_uuid, max_num_uuid = 32;

system/bta/include/bta_api.h

+1 −1
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ extern tBTA_STATUS BTA_DmRemoveDevice(const RawAddress& bd_addr); 
 * Returns          None

 *

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

extern void BTA_GetEirService(uint8_t* p_eir, size_t eir_len,

extern void BTA_GetEirService(const uint8_t* p_eir, size_t eir_len,

                              tBTA_SERVICE_MASK* p_services);



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

system/stack/btm/btm_inq.cc

+7 −7
Original line number Diff line number Diff line
@@ -145,8 +145,8 @@ static tBTM_STATUS btm_initiate_rem_name(const RawAddress& remote_bda, 


static uint8_t btm_convert_uuid_to_eir_service(uint16_t uuid16);

void btm_set_eir_uuid(uint8_t* p_eir, tBTM_INQ_RESULTS* p_results);

static const uint8_t* btm_eir_get_uuid_list(uint8_t* p_eir, size_t eir_len,

                                            uint8_t uuid_size,

static const uint8_t* btm_eir_get_uuid_list(const uint8_t* p_eir,

                                            size_t eir_len, uint8_t uuid_size,

                                            uint8_t* p_num_uuid,

                                            uint8_t* p_uuid_list_type);
@@ -1683,9 +1683,9 @@ uint8_t BTM_GetEirSupportedServices(uint32_t* p_eir_uuid, uint8_t** p, 
 *                  HCI_EIR_MORE_128BITS_UUID_TYPE

 *

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

uint8_t BTM_GetEirUuidList(uint8_t* p_eir, size_t eir_len, uint8_t uuid_size,

                           uint8_t* p_num_uuid, uint8_t* p_uuid_list,

                           uint8_t max_num_uuid) {

uint8_t BTM_GetEirUuidList(const uint8_t* p_eir, size_t eir_len,

                           uint8_t uuid_size, uint8_t* p_num_uuid,

                           uint8_t* p_uuid_list, uint8_t max_num_uuid) {

  const uint8_t* p_uuid_data;

  uint8_t type;

  uint8_t yy, xx;
@@ -1747,8 +1747,8 @@ uint8_t BTM_GetEirUuidList(uint8_t* p_eir, size_t eir_len, uint8_t uuid_size, 
 *                  beginning of UUID list in EIR - otherwise

 *

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

static const uint8_t* btm_eir_get_uuid_list(uint8_t* p_eir, size_t eir_len,

                                            uint8_t uuid_size,

static const uint8_t* btm_eir_get_uuid_list(const uint8_t* p_eir,

                                            size_t eir_len, uint8_t uuid_size,

                                            uint8_t* p_num_uuid,

                                            uint8_t* p_uuid_list_type) {

  const uint8_t* p_uuid_data;

system/stack/include/btm_api.h

+3 −3
Original line number Diff line number Diff line
@@ -922,9 +922,9 @@ uint8_t BTM_GetEirSupportedServices(uint32_t* p_eir_uuid, uint8_t** p, 
 *                  HCI_EIR_MORE_128BITS_UUID_TYPE

 *

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

uint8_t BTM_GetEirUuidList(uint8_t* p_eir, size_t eir_len, uint8_t uuid_size,

                           uint8_t* p_num_uuid, uint8_t* p_uuid_list,

                           uint8_t max_num_uuid);

uint8_t BTM_GetEirUuidList(const uint8_t* p_eir, size_t eir_len,

                           uint8_t uuid_size, uint8_t* p_num_uuid,

                           uint8_t* p_uuid_list, uint8_t max_num_uuid);



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

 *

system/stack/include/btm_client_interface.h

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ struct btm_client_interface_s { 
    uint8_t (*BTM_GetEirSupportedServices)(uint32_t* p_eir_uuid, uint8_t** p,

                                           uint8_t max_num_uuid16,

                                           uint8_t* p_num_uuid16);

    uint8_t (*BTM_GetEirUuidList)(uint8_t* p_eir, size_t eir_len,

    uint8_t (*BTM_GetEirUuidList)(const uint8_t* p_eir, size_t eir_len,

                                  uint8_t uuid_size, uint8_t* p_num_uuid,

                                  uint8_t* p_uuid_list, uint8_t max_num_uuid);

    void (*BTM_AddEirService)(uint32_t* p_eir_uuid, uint16_t uuid16);