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

Commit fdd49146 authored by Henri Chataing's avatar Henri Chataing
Browse files

system/stack/gatt: Fix -Wmissing-prototype errors 

Bug: 369381361
Test: m com.android.btservices
Flag: EXEMPT, no logical change
Change-Id: I766addf414dc03345d4a254326e396856f229dbb
parent 9415ddaa

system/btif/src/bluetooth.cc

+1 −1
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ 
#include "stack/include/avdt_api.h"

#include "stack/include/btm_client_interface.h"

#include "stack/include/btm_status.h"

#include "stack/include/gatt_api.h"

#include "stack/include/hfp_lc3_decoder.h"

#include "stack/include/hfp_lc3_encoder.h"

#include "stack/include/hfp_msbc_decoder.h"
@@ -188,7 +189,6 @@ extern VolumeControlInterface* btif_volume_control_get_interface(); 


bt_status_t btif_av_sink_execute_service(bool b_enable);



extern void gatt_tcb_dump(int fd);

extern void bta_gatt_client_dump(int fd);



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

system/stack/acl/ble_acl.cc

+1 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "stack/include/acl_api.h"

#include "stack/include/btm_ble_addr.h"

#include "stack/include/btm_ble_privacy.h"

#include "stack/include/gatt_api.h"

#include "stack/include/l2cap_hci_link_interface.h"

#include "types/raw_address.h"
@@ -144,8 +145,6 @@ void acl_ble_connection_fail(const tBLE_BD_ADDR& address_with_type, uint16_t /* 
  btm_ble_update_mode_operation(HCI_ROLE_UNKNOWN, &address_with_type.bda, status);

}



void gatt_notify_conn_update(const RawAddress& remote, uint16_t interval, uint16_t latency,

                             uint16_t timeout, tHCI_STATUS status);

void acl_ble_update_event_received(tHCI_STATUS status, uint16_t handle, uint16_t interval,

                                   uint16_t latency, uint16_t timeout) {

  l2cble_process_conn_update_evt(handle, status, interval, latency, timeout);

system/stack/btm/btm_dev.cc

+1 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include "stack/include/btm_ble_privacy.h"

#include "stack/include/btm_client_interface.h"

#include "stack/include/btm_log_history.h"

#include "stack/include/gatt_api.h"

#include "stack/include/l2cap_interface.h"

#include "types/raw_address.h"
@@ -54,7 +55,6 @@ 
using namespace bluetooth;



extern tBTM_CB btm_cb;

void gatt_consolidate(const RawAddress& identity_addr, const RawAddress& rpa);



namespace {

system/stack/gatt/att_protocol.cc

+0 −4
Original line number Diff line number Diff line
@@ -37,10 +37,6 @@ 
#define GATT_OP_CODE_SIZE 1

#define GATT_START_END_HANDLE_SIZE 4



// TODO(b/369381361) Enfore -Wmissing-prototypes

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



using base::StringPrintf;

using bluetooth::Uuid;

using namespace bluetooth;

system/stack/gatt/gatt_api.cc

+2 −5
Original line number Diff line number Diff line
@@ -51,9 +51,6 @@ 
#include "types/bt_transport.h"

#include "types/raw_address.h"



// TODO(b/369381361) Enfore -Wmissing-prototypes

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



using namespace bluetooth::legacy::stack::sdp;

using namespace bluetooth;
@@ -63,7 +60,7 @@ using bluetooth::Uuid; 
 * Add a service handle range to the list in descending order of the start

 * handle. Return reference to the newly added element.

 **/

tGATT_HDL_LIST_ELEM& gatt_add_an_item_to_list(uint16_t s_handle) {

static tGATT_HDL_LIST_ELEM& gatt_add_an_item_to_list(uint16_t s_handle) {

  auto lst_ptr = gatt_cb.hdl_list_info;

  auto it = lst_ptr->begin();

  for (; it != lst_ptr->end(); it++) {
@@ -353,7 +350,7 @@ tGATT_STATUS GATTS_AddService(tGATT_IF gatt_if, btgatt_db_element_t* service, in 
  return GATT_SERVICE_STARTED;

}



bool is_active_service(const Uuid& app_uuid128, Uuid* p_svc_uuid, uint16_t start_handle) {

static bool is_active_service(const Uuid& app_uuid128, Uuid* p_svc_uuid, uint16_t start_handle) {

  for (auto& info : *gatt_cb.srv_list_info) {

    Uuid* p_this_uuid = gatts_get_service_uuid(info.p_db);