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

Commit cfea2a3d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "system/stack/*: Fix -Wmissing-prototypes warnings" into main

parents 3cd6347e b0874998

system/stack/ais/ais_ble.cc

+1 −4
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ 
#include "stack/include/gatt_api.h"

#include "types/bluetooth/uuid.h"



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

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



using bluetooth::Uuid;

using bluetooth::log::error;

using bluetooth::log::warn;
@@ -104,7 +101,7 @@ void ais_request_cback(tCONN_ID conn_id, uint32_t trans_id, tGATTS_REQ_TYPE type 
 * Returns          void.

 *

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

void ais_attr_db_init(void) {

static void ais_attr_db_init(void) {

  if (!com::android::bluetooth::flags::android_os_identifier()) {

    return;

  }

system/stack/bnep/bnep_utils.cc

+7 −8
Original line number Diff line number Diff line
@@ -45,9 +45,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;

using bluetooth::Uuid;
@@ -56,8 +53,9 @@ using bluetooth::Uuid; 
/******************************************************************************/

static uint8_t* bnepu_init_hdr(BT_HDR* p_buf, uint16_t hdr_len, uint8_t pkt_type);



void bnepu_process_peer_multicast_filter_set(tBNEP_CONN* p_bcb, uint8_t* p_filters, uint16_t len);

void bnepu_send_peer_multicast_filter_rsp(tBNEP_CONN* p_bcb, uint16_t response_code);

static void bnepu_process_peer_multicast_filter_set(tBNEP_CONN* p_bcb, uint8_t* p_filters,

                                                    uint16_t len);

static void bnepu_send_peer_multicast_filter_rsp(tBNEP_CONN* p_bcb, uint16_t response_code);



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

 *
@@ -343,7 +341,7 @@ void bnepu_send_peer_our_multi_filters(tBNEP_CONN* p_bcb) { 
 * Returns          void

 *

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

void bnepu_send_peer_filter_rsp(tBNEP_CONN* p_bcb, uint16_t response_code) {

static void bnepu_send_peer_filter_rsp(tBNEP_CONN* p_bcb, uint16_t response_code) {

  BT_HDR* p_buf = (BT_HDR*)osi_malloc(BNEP_BUF_SIZE);

  uint8_t* p;
@@ -1030,7 +1028,8 @@ void bnepu_process_multicast_filter_rsp(tBNEP_CONN* p_bcb, uint8_t* p_data) { 
 * Returns          void

 *

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

void bnepu_process_peer_multicast_filter_set(tBNEP_CONN* p_bcb, uint8_t* p_filters, uint16_t len) {

static void bnepu_process_peer_multicast_filter_set(tBNEP_CONN* p_bcb, uint8_t* p_filters,

                                                    uint16_t len) {

  uint16_t resp_code = BNEP_FILTER_CRL_OK;

  uint16_t num_filters, xx;

  uint8_t *p_temp_filters, null_bda[BD_ADDR_LEN] = {0, 0, 0, 0, 0, 0};
@@ -1106,7 +1105,7 @@ void bnepu_process_peer_multicast_filter_set(tBNEP_CONN* p_bcb, uint8_t* p_filte 
 * Returns          void

 *

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

void bnepu_send_peer_multicast_filter_rsp(tBNEP_CONN* p_bcb, uint16_t response_code) {

static void bnepu_send_peer_multicast_filter_rsp(tBNEP_CONN* p_bcb, uint16_t response_code) {

  BT_HDR* p_buf = (BT_HDR*)osi_malloc(BNEP_BUF_SIZE);

  uint8_t* p;

system/stack/btm/btm_ble_gap.cc

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

#include "stack/include/hci_error_code.h"

#include "stack/include/inq_hci_link_interface.h"

#include "stack/rnr/remote_name_request.h"

#include "types/ble_address_with_type.h"

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


extern tBTM_CB btm_cb;



void btm_inq_remote_name_timer_timeout(void* data);

void btm_ble_adv_filter_init(void);



#define BTM_EXT_BLE_RMT_NAME_TIMEOUT_MS (30 * 1000)

system/stack/connection_manager/connection_manager.cc

+5 −8
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ 


#define DIRECT_CONNECT_TIMEOUT (30 * 1000) /* 30 seconds */



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

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



using namespace bluetooth;



constexpr char kBtmLogTag[] = "TA";
@@ -62,8 +59,8 @@ static void alarm_closure_cb(void* p) { 
}



// Periodic alarms are not supported, because we clean up data in callback

void alarm_set_closure(const base::Location& posted_from, alarm_t* alarm, uint64_t interval_ms,

                       base::OnceClosure user_task) {

static void alarm_set_closure(const base::Location& posted_from, alarm_t* alarm,

                              uint64_t interval_ms, base::OnceClosure user_task) {

  closure_data* data = new closure_data;

  data->posted_from = posted_from;

  data->user_task = std::move(user_task);
@@ -118,7 +115,7 @@ std::set<tAPP_ID> get_apps_connecting_to(const RawAddress& address) { 
  return (it != bgconn_dev.end()) ? it->second.doing_bg_conn : std::set<tAPP_ID>();

}



bool IsTargetedAnnouncement(const uint8_t* p_eir, uint16_t eir_len) {

static bool IsTargetedAnnouncement(const uint8_t* p_eir, uint16_t eir_len) {

  const uint8_t* p_service_data = p_eir;

  uint8_t service_data_len = 0;
@@ -186,7 +183,7 @@ static void target_announcement_observe_results_cb(tBTM_INQ_RESULTS* p_inq, cons 
  do_in_main_thread(base::BindOnce(schedule_direct_connect_add, app_id, addr));

}



void target_announcements_filtering_set(bool enable) {

static void target_announcements_filtering_set(bool enable) {

  log::debug("enable {}", enable);

  BTM_LogHistory(kBtmLogTag, RawAddress::kEmpty, (enable ? "Start filtering" : "Stop filtering"));
@@ -431,7 +428,7 @@ void reset(bool after_reset) { 
  }

}



void wl_direct_connect_timeout_cb(uint8_t app_id, const RawAddress& address) {

static void wl_direct_connect_timeout_cb(uint8_t app_id, const RawAddress& address) {

  log::debug("app_id={}, address={}", static_cast<int>(app_id), address);

  on_connection_timed_out(app_id, address);

system/stack/hid/hidh_api.cc

+1 −4
Original line number Diff line number Diff line
@@ -49,9 +49,6 @@ 
#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"



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

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



using namespace bluetooth;

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

using bluetooth::Uuid;
@@ -95,7 +92,7 @@ tHID_STATUS HID_HostGetSDPRecord(const RawAddress& addr, tSDP_DISCOVERY_DB* p_db 
  }

}



void hidh_get_str_attr(tSDP_DISC_REC* p_rec, uint16_t attr_id, uint16_t max_len, char* str) {

static void hidh_get_str_attr(tSDP_DISC_REC* p_rec, uint16_t attr_id, uint16_t max_len, char* str) {

  tSDP_DISC_ATTR* p_attr;

  uint16_t name_len;