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

Commit 8e8df78f authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge "system/stack/avrc: Fix -Wmissing-prototype errors" into main

parents 04a7871a ae595fb4

system/stack/avrc/avrc_api.cc

+1 −4
Original line number Diff line number Diff line
@@ -41,9 +41,6 @@ 
#include "storage/config_keys.h"

#include "types/raw_address.h"



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

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



using namespace bluetooth;



/*****************************************************************************
@@ -156,7 +153,7 @@ void avrc_flush_cmd_q(uint8_t handle) { 
 * Returns          Nothing.

 *

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

void avrc_process_timeout(void* data) {

static void avrc_process_timeout(void* data) {

  tAVRC_PARAM* param = (tAVRC_PARAM*)data;



  log::verbose("AVRC: command timeout (handle=0x{:02x}, label=0x{:02x})", param->handle,

system/stack/avrc/avrc_bld_tg.cc

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

#include "stack/include/bt_types.h"



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

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



using namespace bluetooth;



/*****************************************************************************
@@ -708,7 +705,7 @@ static tAVRC_STS avrc_bld_set_absolute_volume_rsp(uint8_t abs_vol, BT_HDR* p_pkt 
 *                  Otherwise, the error code.

 *

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

tAVRC_STS avrc_bld_group_navigation_rsp(uint16_t navi_id, BT_HDR* p_pkt) {

static tAVRC_STS avrc_bld_group_navigation_rsp(uint16_t navi_id, BT_HDR* p_pkt) {

  if (!AVRC_IS_VALID_GROUP(navi_id)) {

    log::error("bad navigation op id: {}", navi_id);

    return AVRC_STS_BAD_PARAM;

system/stack/avrc/avrc_pars_ct.cc

+2 −4
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ 
#include "osi/include/osi.h"

#include "stack/include/bt_types.h"



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

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



using namespace bluetooth;



/*****************************************************************************
@@ -132,7 +129,8 @@ static tAVRC_STS avrc_pars_vendor_rsp(tAVRC_MSG_VENDOR* p_msg, tAVRC_RESPONSE* p 
  return status;

}



tAVRC_STS avrc_parse_notification_rsp(uint8_t* p_stream, uint16_t len, tAVRC_REG_NOTIF_RSP* p_rsp) {

static tAVRC_STS avrc_parse_notification_rsp(uint8_t* p_stream, uint16_t len,

                                             tAVRC_REG_NOTIF_RSP* p_rsp) {

  uint32_t min_len = 1;



  if (len < min_len) {

system/test/mock/mock_stack_avrc_api.cc

+0 −4
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ 
#include "test/common/mock_functions.h"

#include "types/raw_address.h"



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

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



bool avrcp_absolute_volume_is_enabled() {

  inc_func_call_count(__func__);

  return true;
@@ -79,7 +76,6 @@ uint16_t AVRC_PassRsp(uint8_t /* handle */, uint8_t /* label */, tAVRC_MSG_PASS* 
  return 0;

}

void avrc_flush_cmd_q(uint8_t /* handle */) { inc_func_call_count(__func__); }

void avrc_process_timeout(void* /* data */) { inc_func_call_count(__func__); }

void avrc_send_next_vendor_cmd(uint8_t /* handle */) { inc_func_call_count(__func__); }

void avrc_start_cmd_timer(uint8_t /* handle */, uint8_t /* label */, uint8_t /* msg_mask */) {

  inc_func_call_count(__func__);

system/test/mock/mock_stack_avrc_bld_tg.cc

+0 −7
Original line number Diff line number Diff line
@@ -24,15 +24,8 @@ 
#include "stack/include/bt_hdr.h"

#include "test/common/mock_functions.h"



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

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



tAVRC_STS AVRC_BldResponse(uint8_t /* handle */, tAVRC_RESPONSE* /* p_rsp */,

                           BT_HDR** /* pp_pkt */) {

  inc_func_call_count(__func__);

  return 0;

}
 
tAVRC_STS avrc_bld_group_navigation_rsp(uint16_t /* navi_id */, BT_HDR* /* p_pkt */) {

  inc_func_call_count(__func__);

  return 0;

}