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

Commit 40571296 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "system/btif: Remove UNUSED_ATTR" into main am: 7ea6ca88 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3052525



Change-Id: I15a831f93658389b64500a61949faa69ff4f5ae2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e79bfce 7ea6ca88

system/btif/co/bta_av_co.cc

+3 −4
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include "include/hardware/bt_av.h"

#include "internal_include/bt_trace.h"

#include "osi/include/allocator.h"

#include "osi/include/osi.h"  // UNUSED_ATTR

#include "stack/include/a2dp_codec_api.h"

#include "stack/include/a2dp_error_codes.h"

#include "stack/include/a2dp_ext.h"
@@ -448,9 +447,9 @@ tA2DP_STATUS BtaAvCo::ProcessSinkGetConfig(tBTA_AV_HNDL bta_av_handle, 
}



void BtaAvCo::ProcessSetConfig(tBTA_AV_HNDL bta_av_handle,

                               UNUSED_ATTR const RawAddress& peer_address,

                               const uint8_t* p_codec_info,

                               UNUSED_ATTR uint8_t seid, uint8_t num_protect,

                               const RawAddress& peer_address,

                               const uint8_t* p_codec_info, uint8_t seid,

                               uint8_t num_protect,

                               const uint8_t* p_protect_info,

                               uint8_t t_local_sep, uint8_t avdt_handle) {

  tA2DP_STATUS status = A2DP_SUCCESS;

system/btif/co/bta_hh_co.cc

+5 −5
Original line number Diff line number Diff line
@@ -538,8 +538,8 @@ void bta_hh_co_close(btif_hh_device_t* p_dev) { 
 ******************************************************************************/

void bta_hh_co_data(uint8_t dev_handle, uint8_t* p_rpt, uint16_t len,

                    tBTA_HH_PROTO_MODE mode, uint8_t sub_class,

                    uint8_t ctry_code,

                    UNUSED_ATTR const tAclLinkSpec& link_spec, uint8_t app_id) {

                    uint8_t ctry_code, const tAclLinkSpec& /* link_spec */,

                    uint8_t app_id) {

  btif_hh_device_t* p_dev;



  log::verbose(
@@ -774,7 +774,7 @@ void bta_hh_co_get_rpt_rsp(uint8_t dev_handle, uint8_t status, 
 ******************************************************************************/

void bta_hh_le_co_rpt_info(const tAclLinkSpec& link_spec,

                           tBTA_HH_RPT_CACHE_ENTRY* p_entry,

                           UNUSED_ATTR uint8_t app_id) {

                           uint8_t /* app_id */) {

  unsigned idx = 0;



  std::string addrstr = link_spec.addrt.bda.ToString();
@@ -816,7 +816,7 @@ void bta_hh_le_co_rpt_info(const tAclLinkSpec& link_spec, 
 ******************************************************************************/

tBTA_HH_RPT_CACHE_ENTRY* bta_hh_le_co_cache_load(const tAclLinkSpec& link_spec,

                                                 uint8_t* p_num_rpt,

                                                 UNUSED_ATTR uint8_t app_id) {

                                                 uint8_t app_id) {

  std::string addrstr = link_spec.addrt.bda.ToString();

  const char* bdstr = addrstr.c_str();
@@ -855,7 +855,7 @@ tBTA_HH_RPT_CACHE_ENTRY* bta_hh_le_co_cache_load(const tAclLinkSpec& link_spec, 
 *

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

void bta_hh_le_co_reset_rpt_cache(const tAclLinkSpec& link_spec,

                                  UNUSED_ATTR uint8_t app_id) {

                                  uint8_t /* app_id */) {

  std::string addrstr = link_spec.addrt.bda.ToString();

  const char* bdstr = addrstr.c_str();

system/btif/co/bta_pan_co.cc

+8 −15
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include "btif_util.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "osi/include/osi.h"

#include "pan_api.h"

#include "stack/include/bt_hdr.h"

#include "types/raw_address.h"
@@ -164,8 +163,7 @@ void bta_pan_co_tx_path(uint16_t handle, uint8_t app_id) { 
 * Returns          void

 *

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

void bta_pan_co_rx_path(UNUSED_ATTR uint16_t handle,

                        UNUSED_ATTR uint8_t app_id) {

void bta_pan_co_rx_path(uint16_t /* handle */, uint8_t /* app_id */) {

  log::verbose("bta_pan_co_rx_path not used");

}
@@ -183,8 +181,7 @@ void bta_pan_co_rx_path(UNUSED_ATTR uint16_t handle, 
 * Returns          void

 *

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

void bta_pan_co_rx_flow(UNUSED_ATTR uint16_t handle, UNUSED_ATTR uint8_t app_id,

                        UNUSED_ATTR bool enable) {

void bta_pan_co_rx_flow(uint16_t handle, uint8_t /* app_id */, bool enable) {

  log::verbose("bta_pan_co_rx_flow, enabled:{}, not used", enable);

  btpan_conn_t* conn = btpan_find_conn_handle(handle);

  if (!conn || conn->state != PAN_STATE_OPEN) return;
@@ -200,11 +197,9 @@ void bta_pan_co_rx_flow(UNUSED_ATTR uint16_t handle, UNUSED_ATTR uint8_t app_id, 
 * Returns          void

 *

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

void bta_pan_co_pfilt_ind(UNUSED_ATTR uint16_t handle,

                          UNUSED_ATTR bool indication,

                          UNUSED_ATTR tBTA_PAN_STATUS result,

                          UNUSED_ATTR uint16_t len,

                          UNUSED_ATTR uint8_t* p_filters) {

void bta_pan_co_pfilt_ind(uint16_t /* handle */, bool /* indication */,

                          tBTA_PAN_STATUS /* result */, uint16_t /* len */,

                          uint8_t* /* p_filters */) {

  log::verbose("bta_pan_co_pfilt_ind");

}
@@ -217,10 +212,8 @@ void bta_pan_co_pfilt_ind(UNUSED_ATTR uint16_t handle, 
 * Returns          void

 *

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

void bta_pan_co_mfilt_ind(UNUSED_ATTR uint16_t handle,

                          UNUSED_ATTR bool indication,

                          UNUSED_ATTR tBTA_PAN_STATUS result,

                          UNUSED_ATTR uint16_t len,

                          UNUSED_ATTR uint8_t* p_filters) {

void bta_pan_co_mfilt_ind(uint16_t /* handle */, bool /* indication */,

                          tBTA_PAN_STATUS /* result */, uint16_t /* len */,

                          uint8_t* /* p_filters */) {

  log::verbose("bta_pan_co_mfilt_ind");

}

system/btif/src/btif_sock_rfc.cc

+2 −3
Original line number Diff line number Diff line
@@ -625,8 +625,7 @@ static void on_cli_rfc_connect(tBTA_JV_RFCOMM_OPEN* p_open, uint32_t id) { 
  }

}



static void on_rfc_close(UNUSED_ATTR tBTA_JV_RFCOMM_CLOSE* p_close,

                         uint32_t id) {

static void on_rfc_close(tBTA_JV_RFCOMM_CLOSE* /* p_close */, uint32_t id) {

  log::verbose("id:{}", id);

  std::unique_lock<std::recursive_mutex> lock(slot_lock);
@@ -944,7 +943,7 @@ static bool flush_incoming_que_on_wr_signal(rfc_slot_t* slot) { 
  return true;

}



void btsock_rfc_signaled(UNUSED_ATTR int fd, int flags, uint32_t id) {

void btsock_rfc_signaled(int /* fd */, int flags, uint32_t id) {

  bool need_close = false;

  std::unique_lock<std::recursive_mutex> lock(slot_lock);

  rfc_slot_t* slot = find_rfc_slot_by_id(id);