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

Commit 1faa8d4c authored by Henri Chataing's avatar Henri Chataing
Browse files

system/bta/av: Fix -Wmissing-prototypes errors 

Bug: 369381361
Test: m com.android.btservices
Flag: EXEMPT, minor fixes
Change-Id: Ia8e80b055d1a948239951d3bd5b313ff71778b44
parent e7a55e26

system/bta/av/bta_av_aact.cc

+3 −6
Original line number Diff line number Diff line
@@ -61,9 +61,6 @@ 
#include "types/hci_role.h"

#include "types/raw_address.h"



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

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



using namespace bluetooth;



namespace {
@@ -3003,7 +3000,7 @@ void bta_av_open_at_inc(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
  }

}



void offload_vendor_callback(tBTM_VSC_CMPL* param) {

static void offload_vendor_callback(tBTM_VSC_CMPL* param) {

  tBTA_AV value{0};

  uint8_t sub_opcode = 0;

  if (param->param_len) {
@@ -3041,7 +3038,7 @@ void offload_vendor_callback(tBTM_VSC_CMPL* param) { 
  }

}



void bta_av_vendor_offload_start(tBTA_AV_SCB* p_scb, tBT_A2DP_OFFLOAD* offload_start) {

static void bta_av_vendor_offload_start(tBTA_AV_SCB* p_scb, tBT_A2DP_OFFLOAD* offload_start) {

  uint8_t param[sizeof(tBT_A2DP_OFFLOAD)];

  log::verbose("");
@@ -3072,7 +3069,7 @@ void bta_av_vendor_offload_start(tBTA_AV_SCB* p_scb, tBT_A2DP_OFFLOAD* offload_s 
                                                              param, offload_vendor_callback);

}



void bta_av_vendor_offload_start_v2(tBTA_AV_SCB* p_scb, A2dpCodecConfigExt* offload_codec) {

static void bta_av_vendor_offload_start_v2(tBTA_AV_SCB* p_scb, A2dpCodecConfigExt* offload_codec) {

  log::verbose("");



  uint16_t connection_handle = get_btm_client_interface().peer.BTM_GetHCIConnHandle(

system/bta/av/bta_av_act.cc

+7 −10
Original line number Diff line number Diff line
@@ -49,9 +49,6 @@ 
#include "stack/include/sdp_status.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;
@@ -828,7 +825,7 @@ static tAVRC_STS bta_av_chk_notif_evt_id(tAVRC_MSG_VENDOR* p_vendor) { 
  return status;

}



void bta_av_proc_rsp(tAVRC_RESPONSE* p_rc_rsp) {

static void bta_av_proc_rsp(tAVRC_RESPONSE* p_rc_rsp) {

  uint16_t rc_ver = 0x105;

  const tBTA_AV_CFG* p_src_cfg = NULL;

  if (rc_ver != 0x103) {
@@ -862,7 +859,7 @@ void bta_av_proc_rsp(tAVRC_RESPONSE* p_rc_rsp) { 
 * Returns          true to respond immediately

 *

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

tBTA_AV_EVT bta_av_proc_meta_cmd(tAVRC_RESPONSE* p_rc_rsp, tBTA_AV_RC_MSG* p_msg,

static tBTA_AV_EVT bta_av_proc_meta_cmd(tAVRC_RESPONSE* p_rc_rsp, tBTA_AV_RC_MSG* p_msg,

                                        uint8_t* p_ctype) {

  tBTA_AV_EVT evt = BTA_AV_META_MSG_EVT;

  uint8_t u8, pdu, *p;
@@ -1785,7 +1782,7 @@ static void bta_av_store_peer_rc_version() { 
 * Returns          tBTA_AV_FEAT peer device feature mask

 *

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

tBTA_AV_FEAT bta_av_check_peer_features(uint16_t service_uuid) {

static tBTA_AV_FEAT bta_av_check_peer_features(uint16_t service_uuid) {

  tBTA_AV_FEAT peer_features = 0;

  tBTA_AV_CB* p_cb = &bta_av_cb;

  tSDP_DISC_REC* p_rec = NULL;
@@ -1860,7 +1857,7 @@ tBTA_AV_FEAT bta_av_check_peer_features(uint16_t service_uuid) { 
 * Returns          tBTA_AV_FEAT peer device feature mask

 *

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

tBTA_AV_FEAT bta_avk_check_peer_features(uint16_t service_uuid) {

static tBTA_AV_FEAT bta_avk_check_peer_features(uint16_t service_uuid) {

  tBTA_AV_FEAT peer_features = 0;

  tBTA_AV_CB* p_cb = &bta_av_cb;
@@ -1949,7 +1946,7 @@ tBTA_AV_FEAT bta_avk_check_peer_features(uint16_t service_uuid) { 
 *                  one does not exist.

 *

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

uint16_t bta_avk_get_cover_art_psm() {

static uint16_t bta_avk_get_cover_art_psm() {

  log::verbose("searching for cover art psm");

  /* Cover Art L2CAP PSM is only available on a target device */

  tBTA_AV_CB* p_cb = &bta_av_cb;
@@ -2031,7 +2028,7 @@ uint16_t bta_avk_get_cover_art_psm() { 
  return 0x0000;

}



void bta_av_rc_disc_done_all(tBTA_AV_DATA* /* p_data */) {

static void bta_av_rc_disc_done_all(tBTA_AV_DATA* /* p_data */) {

  tBTA_AV_CB* p_cb = &bta_av_cb;

  tBTA_AV_SCB* p_scb = NULL;

  tBTA_AV_LCB* p_lcb;

system/bta/av/bta_av_cfg.cc

+2 −4
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


#include <cstdint>



#include "bta/av/bta_av_int.h"

#include "bta/include/bta_av_api.h"

#include "internal_include/bt_target.h"

#include "stack/include/avrc_api.h"
@@ -39,9 +40,6 @@ 
#define BTA_AV_RC_PASS_RSP_CODE AVRC_RSP_NOT_IMPL

#endif



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

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



using namespace bluetooth;



const uint32_t bta_av_meta_caps_co_ids[] = {AVRC_CO_METADATA, AVRC_CO_BROADCOM};
@@ -97,7 +95,7 @@ const uint8_t bta_av_meta_caps_evt_ids[] = { 
  (sizeof(bta_av_meta_caps_evt_ids) / sizeof(bta_av_meta_caps_evt_ids[0]))

#endif /* BTA_AV_NUM_RC_EVT_IDS */



const uint8_t* get_bta_avk_meta_caps_evt_ids() {

static const uint8_t* get_bta_avk_meta_caps_evt_ids() {

  if (avrcp_absolute_volume_is_enabled()) {

    static const uint8_t bta_avk_meta_caps_evt_ids[] = {

            AVRC_EVT_VOLUME_CHANGE,

system/bta/av/bta_av_ci.cc

+2 −3
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 


#define LOG_TAG "bluetooth-a2dp"



#include "bta/include/bta_av_ci.h"



#include <bluetooth/log.h>



#include "bta/av/bta_av_int.h"
@@ -32,9 +34,6 @@ 
#include "osi/include/allocator.h"

#include "stack/include/bt_hdr.h"



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

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



using namespace bluetooth;



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