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

Commit 7e838eaa authored by Chris Manton's avatar Chris Manton
Browse files

bta:: Remove UNUSED_ATTR and comment out unused params 

Bug: 333127501
Test: m .
Flag: EXEMPT, Unused Parameter Commenting Out

Change-Id: Ifdf503698b79025e4dd02d6402d21acea2e97601
parent e6036ec8

system/bta/ag/bta_ag_act.cc

+6 −10
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 


#include "btif/include/btif_config.h"

#include "device/include/device_iot_config.h"

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

#include "stack/include/bt_uuid16.h"

#include "stack/include/btm_sec_api_types.h"

#include "stack/include/l2c_api.h"
@@ -309,8 +308,7 @@ void bta_ag_disc_acp_res(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { 
 * Returns          void

 *

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

void bta_ag_disc_fail(tBTA_AG_SCB* p_scb,

                      UNUSED_ATTR const tBTA_AG_DATA& data) {

void bta_ag_disc_fail(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) {

  /* reopen registered servers */

  bta_ag_start_servers(p_scb, p_scb->reg_services);
@@ -350,7 +348,7 @@ void bta_ag_open_fail(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { 
 * Returns          void

 *

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

void bta_ag_rfc_fail(tBTA_AG_SCB* p_scb, UNUSED_ATTR const tBTA_AG_DATA& data) {

void bta_ag_rfc_fail(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) {

  log::info("reset p_scb with index={}", bta_ag_scb_to_idx(p_scb));

  RawAddress peer_addr = p_scb->peer_addr;

  /* reinitialize stuff */
@@ -383,8 +381,7 @@ void bta_ag_rfc_fail(tBTA_AG_SCB* p_scb, UNUSED_ATTR const tBTA_AG_DATA& data) { 
 * Returns          void

 *

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

void bta_ag_rfc_close(tBTA_AG_SCB* p_scb,

                      UNUSED_ATTR const tBTA_AG_DATA& data) {

void bta_ag_rfc_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) {

  tBTA_AG_CLOSE close = {};

  tBTA_SERVICE_MASK services;

  int i, num_active_conn = 0;
@@ -655,7 +652,7 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { 
 * Returns          void

 *

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

void bta_ag_rfc_data(tBTA_AG_SCB* p_scb, UNUSED_ATTR const tBTA_AG_DATA& data) {

void bta_ag_rfc_data(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) {

  uint16_t len;

  char buf[BTA_AG_RFC_READ_MAX] = "";
@@ -820,8 +817,7 @@ void bta_ag_post_sco_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { 
 * Returns          void

 *

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

void bta_ag_svc_conn_open(tBTA_AG_SCB* p_scb,

                          UNUSED_ATTR const tBTA_AG_DATA& data) {

void bta_ag_svc_conn_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) {

  tBTA_AG_CONN evt = {};



  if (!p_scb->svc_conn) {
@@ -910,7 +906,7 @@ static void bta_ag_collision_timer_cback(void* data) { 
}



void bta_ag_handle_collision(tBTA_AG_SCB* p_scb,

                             UNUSED_ATTR const tBTA_AG_DATA& data) {

                             const tBTA_AG_DATA& /* data */) {

  /* Cancel SDP if it had been started. */

  if (p_scb->p_disc_db) {

    get_legacy_stack_sdp_api()->service.SDP_CancelServiceSearch(

system/bta/ag/bta_ag_cmd.cc

+2 −5
Original line number Diff line number Diff line
@@ -39,10 +39,8 @@ 
#include "device/include/interop.h"

#include "internal_include/bt_target.h"

#include "internal_include/bt_trace.h"

#include "os/log.h"

#include "os/system_properties.h"

#include "osi/include/compat.h"

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

#include "stack/btm/btm_sco_hfp_hal.h"

#include "stack/include/port_api.h"
@@ -421,7 +419,7 @@ static bool bta_ag_parse_cmer(char* p_s, char* p_end, bool* p_enabled) { 
 digit

 *

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

static uint8_t bta_ag_parse_chld(UNUSED_ATTR tBTA_AG_SCB* p_scb, char* p_s) {

static uint8_t bta_ag_parse_chld(tBTA_AG_SCB* /* p_scb */, char* p_s) {

  uint8_t retval = 0;



  if (!isdigit(p_s[0])) {
@@ -1935,8 +1933,7 @@ bool bta_ag_is_sco_open_allowed(tBTA_AG_SCB* p_scb, const std::string event) { 
 * Returns          void

 *

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

void bta_ag_send_ring(tBTA_AG_SCB* p_scb,

                      UNUSED_ATTR const tBTA_AG_DATA& data) {

void bta_ag_send_ring(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) {

  if ((p_scb->conn_service == BTA_AG_HFP) &&

      p_scb->callsetup_ind != BTA_AG_CALLSETUP_INCOMING) {

    log::warn("don't send RING, conn_service={}, callsetup_ind={}",

system/bta/ag/bta_ag_main.cc

+2 −5
Original line number Diff line number Diff line
@@ -31,10 +31,8 @@ 
#include "bta/ag/bta_ag_int.h"

#include "bta/include/bta_hfp_api.h"

#include "internal_include/bt_target.h"

#include "os/log.h"

#include "osi/include/alarm.h"

#include "osi/include/compat.h"

#include "osi/include/osi.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/btm_api.h"

#include "types/raw_address.h"
@@ -354,9 +352,8 @@ bool bta_ag_scb_open(tBTA_AG_SCB* p_curr_scb) { 
 * Returns          void

 *

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

void bta_ag_collision_cback(UNUSED_ATTR tBTA_SYS_CONN_STATUS status,

                            tBTA_SYS_ID id, UNUSED_ATTR uint8_t app_id,

                            const RawAddress& peer_addr) {

void bta_ag_collision_cback(tBTA_SYS_CONN_STATUS /* status */, tBTA_SYS_ID id,

                            uint8_t /* app_id */, const RawAddress& peer_addr) {

  /* Check if we have opening scb for the peer device. */

  uint16_t handle = bta_ag_idx_by_bdaddr(&peer_addr);

  tBTA_AG_SCB* p_scb = bta_ag_scb_by_idx(handle);

system/bta/ag/bta_ag_rfc.cc

+2 −4
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include "bta/ag/bta_ag_int.h"

#include "bta/include/bta_sec_api.h"

#include "internal_include/bt_trace.h"

#include "osi/include/osi.h"

#include "stack/include/main_thread.h"

#include "stack/include/port_api.h"

#include "types/raw_address.h"
@@ -73,7 +72,7 @@ const tBTA_AG_PORT_CBACK bta_ag_mgmt_cback_tbl[] = { 
 * Returns          void

 *

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

static void bta_ag_port_cback(UNUSED_ATTR uint32_t code, uint16_t port_handle,

static void bta_ag_port_cback(uint32_t /* code */, uint16_t port_handle,

                              uint16_t handle) {

  tBTA_AG_SCB* p_scb = bta_ag_scb_by_idx(handle);

  if (p_scb != nullptr) {
@@ -360,8 +359,7 @@ void bta_ag_rfc_do_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { 
 * Returns          void

 *

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

void bta_ag_rfc_do_close(tBTA_AG_SCB* p_scb,

                         UNUSED_ATTR const tBTA_AG_DATA& data) {

void bta_ag_rfc_do_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) {

  log::info("p_scb->conn_handle: 0x{:04x}", p_scb->conn_handle);

  if (p_scb->conn_handle) {

    RFCOMM_RemoveConnection(p_scb->conn_handle);

system/bta/ag/bta_ag_sco.cc

+7 −13
Original line number Diff line number Diff line
@@ -36,8 +36,7 @@ 
#include "internal_include/bt_target.h"

#include "internal_include/bt_trace.h"

#include "main/shim/entry.h"

#include "os/log.h"

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

#include "os/logging/log_adapter.h"

#include "osi/include/properties.h"

#include "stack/btm/btm_int_types.h"

#include "stack/btm/btm_sco.h"
@@ -1329,8 +1328,7 @@ bool bta_ag_sco_is_opening(tBTA_AG_SCB* p_scb) { 
 * Returns          void

 *

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

void bta_ag_sco_listen(tBTA_AG_SCB* p_scb,

                       UNUSED_ATTR const tBTA_AG_DATA& data) {

void bta_ag_sco_listen(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) {

  log::info("{}", ADDRESS_TO_LOGGABLE_STR(p_scb->peer_addr));

  bta_ag_sco_event(p_scb, BTA_AG_SCO_LISTEN_E);

}
@@ -1345,7 +1343,7 @@ void bta_ag_sco_listen(tBTA_AG_SCB* p_scb, 
 * Returns          void

 *

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

void bta_ag_sco_open(tBTA_AG_SCB* p_scb, UNUSED_ATTR const tBTA_AG_DATA& data) {

void bta_ag_sco_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {

  if (!sco_allowed) {

    log::info("not opening sco, by policy");

    return;
@@ -1396,8 +1394,7 @@ void bta_ag_sco_open(tBTA_AG_SCB* p_scb, UNUSED_ATTR const tBTA_AG_DATA& data) { 
 * Returns          void

 *

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

void bta_ag_sco_close(tBTA_AG_SCB* p_scb,

                      UNUSED_ATTR const tBTA_AG_DATA& data) {

void bta_ag_sco_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) {

  /* if scb is in use */

  /* sco_idx is not allocated in SCO_CODEC_ST, still need to move to listen

   * state. */
@@ -1443,8 +1440,7 @@ void bta_ag_sco_codec_nego(tBTA_AG_SCB* p_scb, bool result) { 
 * Returns          void

 *

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

void bta_ag_sco_shutdown(tBTA_AG_SCB* p_scb,

                         UNUSED_ATTR const tBTA_AG_DATA& data) {

void bta_ag_sco_shutdown(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) {

  bta_ag_sco_event(p_scb, BTA_AG_SCO_SHUTDOWN_E);

}
@@ -1458,8 +1454,7 @@ void bta_ag_sco_shutdown(tBTA_AG_SCB* p_scb, 
 * Returns          void

 *

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

void bta_ag_sco_conn_open(tBTA_AG_SCB* p_scb,

                          UNUSED_ATTR const tBTA_AG_DATA& data) {

void bta_ag_sco_conn_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) {

  bta_ag_sco_event(p_scb, BTA_AG_SCO_CONN_OPEN_E);

  bta_sys_sco_open(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);
@@ -1508,8 +1503,7 @@ void bta_ag_sco_conn_open(tBTA_AG_SCB* p_scb, 
 * Returns          void

 *

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

void bta_ag_sco_conn_close(tBTA_AG_SCB* p_scb,

                           UNUSED_ATTR const tBTA_AG_DATA& data) {

void bta_ag_sco_conn_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) {

  /* clear current scb */

  bta_ag_cb.sco.p_curr_scb = nullptr;

  p_scb->sco_idx = BTM_INVALID_SCO_INDEX;