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

Commit 76b0f18f authored by Henri Chataing's avatar Henri Chataing
Browse files

system/bta/{ag,ar}: Enforce -Wmissing-prototypes 

Bug: 369381361
Test: m com.android.btservices
Flag: EXEMPT, minor refactor
Change-Id: Ie54164aef2956484240ccf8df19e2f48acd83b54
parent ca6865b0

system/bta/ag/bta_ag_at.cc

+1 −4
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ 
#include "os/log.h"

#include "osi/include/allocator.h"



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

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



using namespace bluetooth;



/*****************************************************************************
@@ -90,7 +87,7 @@ void bta_ag_at_reinit(tBTA_AG_AT_CB* p_cb) { 
 * Returns          void

 *

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

void bta_ag_process_at(tBTA_AG_AT_CB* p_cb, char* p_end) {

static void bta_ag_process_at(tBTA_AG_AT_CB* p_cb, char* p_end) {

  uint16_t idx;

  uint8_t arg_type;

  char* p_arg;

system/bta/ag/bta_ag_rfc.cc

+27 −30
Original line number Diff line number Diff line
@@ -36,33 +36,30 @@ 
/* Event mask for RfCOMM port callback */

#define BTA_AG_PORT_EV_MASK PORT_EV_RXCHAR



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

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



using namespace bluetooth;



/* each scb has its own rfcomm callbacks */

void bta_ag_port_cback_1(uint32_t code, uint16_t port_handle);

void bta_ag_port_cback_2(uint32_t code, uint16_t port_handle);

void bta_ag_port_cback_3(uint32_t code, uint16_t port_handle);

void bta_ag_port_cback_4(uint32_t code, uint16_t port_handle);

void bta_ag_port_cback_5(uint32_t code, uint16_t port_handle);

void bta_ag_port_cback_6(uint32_t code, uint16_t port_handle);

void bta_ag_mgmt_cback_1(const tPORT_RESULT code, uint16_t port_handle);

void bta_ag_mgmt_cback_2(const tPORT_RESULT code, uint16_t port_handle);

void bta_ag_mgmt_cback_3(const tPORT_RESULT code, uint16_t port_handle);

void bta_ag_mgmt_cback_4(const tPORT_RESULT code, uint16_t port_handle);

void bta_ag_mgmt_cback_5(const tPORT_RESULT code, uint16_t port_handle);

void bta_ag_mgmt_cback_6(const tPORT_RESULT code, uint16_t port_handle);

static void bta_ag_port_cback_1(uint32_t code, uint16_t port_handle);

static void bta_ag_port_cback_2(uint32_t code, uint16_t port_handle);

static void bta_ag_port_cback_3(uint32_t code, uint16_t port_handle);

static void bta_ag_port_cback_4(uint32_t code, uint16_t port_handle);

static void bta_ag_port_cback_5(uint32_t code, uint16_t port_handle);

static void bta_ag_port_cback_6(uint32_t code, uint16_t port_handle);

static void bta_ag_mgmt_cback_1(const tPORT_RESULT code, uint16_t port_handle);

static void bta_ag_mgmt_cback_2(const tPORT_RESULT code, uint16_t port_handle);

static void bta_ag_mgmt_cback_3(const tPORT_RESULT code, uint16_t port_handle);

static void bta_ag_mgmt_cback_4(const tPORT_RESULT code, uint16_t port_handle);

static void bta_ag_mgmt_cback_5(const tPORT_RESULT code, uint16_t port_handle);

static void bta_ag_mgmt_cback_6(const tPORT_RESULT code, uint16_t port_handle);



/* rfcomm callback function tables */

typedef tPORT_CALLBACK* tBTA_AG_PORT_CBACK;

const tBTA_AG_PORT_CBACK bta_ag_port_cback_tbl[] = {bta_ag_port_cback_1, bta_ag_port_cback_2,

static const tBTA_AG_PORT_CBACK bta_ag_port_cback_tbl[] = {bta_ag_port_cback_1, bta_ag_port_cback_2,

                                                    bta_ag_port_cback_3, bta_ag_port_cback_4,

                                                    bta_ag_port_cback_5, bta_ag_port_cback_6};



typedef tPORT_MGMT_CALLBACK* tBTA_AG_PORT_MGMT_CBACK;

const tBTA_AG_PORT_MGMT_CBACK bta_ag_mgmt_cback_tbl[] = {bta_ag_mgmt_cback_1, bta_ag_mgmt_cback_2,

static const tBTA_AG_PORT_MGMT_CBACK bta_ag_mgmt_cback_tbl[] = {bta_ag_mgmt_cback_1, bta_ag_mgmt_cback_2,

                                                         bta_ag_mgmt_cback_3, bta_ag_mgmt_cback_4,

                                                         bta_ag_mgmt_cback_5, bta_ag_mgmt_cback_6};
@@ -165,40 +162,40 @@ static void bta_ag_mgmt_cback(const tPORT_RESULT code, uint16_t port_handle, uin 
 * Returns          void

 *

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

void bta_ag_mgmt_cback_1(const tPORT_RESULT code, uint16_t port_handle) {

static void bta_ag_mgmt_cback_1(const tPORT_RESULT code, uint16_t port_handle) {

  bta_ag_mgmt_cback(code, port_handle, 1);

}

void bta_ag_mgmt_cback_2(const tPORT_RESULT code, uint16_t port_handle) {

static void bta_ag_mgmt_cback_2(const tPORT_RESULT code, uint16_t port_handle) {

  bta_ag_mgmt_cback(code, port_handle, 2);

}

void bta_ag_mgmt_cback_3(const tPORT_RESULT code, uint16_t port_handle) {

static void bta_ag_mgmt_cback_3(const tPORT_RESULT code, uint16_t port_handle) {

  bta_ag_mgmt_cback(code, port_handle, 3);

}

void bta_ag_mgmt_cback_4(const tPORT_RESULT code, uint16_t port_handle) {

static void bta_ag_mgmt_cback_4(const tPORT_RESULT code, uint16_t port_handle) {

  bta_ag_mgmt_cback(code, port_handle, 4);

}

void bta_ag_mgmt_cback_5(const tPORT_RESULT code, uint16_t port_handle) {

static void bta_ag_mgmt_cback_5(const tPORT_RESULT code, uint16_t port_handle) {

  bta_ag_mgmt_cback(code, port_handle, 5);

}

void bta_ag_mgmt_cback_6(const tPORT_RESULT code, uint16_t port_handle) {

static void bta_ag_mgmt_cback_6(const tPORT_RESULT code, uint16_t port_handle) {

  bta_ag_mgmt_cback(code, port_handle, 6);

}

void bta_ag_port_cback_1(uint32_t code, uint16_t port_handle) {

static void bta_ag_port_cback_1(uint32_t code, uint16_t port_handle) {

  bta_ag_port_cback(code, port_handle, 1);

}

void bta_ag_port_cback_2(uint32_t code, uint16_t port_handle) {

static void bta_ag_port_cback_2(uint32_t code, uint16_t port_handle) {

  bta_ag_port_cback(code, port_handle, 2);

}

void bta_ag_port_cback_3(uint32_t code, uint16_t port_handle) {

static void bta_ag_port_cback_3(uint32_t code, uint16_t port_handle) {

  bta_ag_port_cback(code, port_handle, 3);

}

void bta_ag_port_cback_4(uint32_t code, uint16_t port_handle) {

static void bta_ag_port_cback_4(uint32_t code, uint16_t port_handle) {

  bta_ag_port_cback(code, port_handle, 4);

}

void bta_ag_port_cback_5(uint32_t code, uint16_t port_handle) {

static void bta_ag_port_cback_5(uint32_t code, uint16_t port_handle) {

  bta_ag_port_cback(code, port_handle, 5);

}

void bta_ag_port_cback_6(uint32_t code, uint16_t port_handle) {

static void bta_ag_port_cback_6(uint32_t code, uint16_t port_handle) {

  bta_ag_port_cback(code, port_handle, 6);

}
@@ -212,7 +209,7 @@ void bta_ag_port_cback_6(uint32_t code, uint16_t port_handle) { 
 * Returns          void

 *

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

void bta_ag_setup_port(tBTA_AG_SCB* p_scb, uint16_t handle) {

static void bta_ag_setup_port(tBTA_AG_SCB* p_scb, uint16_t handle) {

  int port_callback_index = bta_ag_scb_to_idx(p_scb) - 1;

  log::assert_that(port_callback_index >= 0, "invalid callback index, handle={}, bd_addr={}",

                   handle, ADDRESS_TO_LOGGABLE_STR(p_scb->peer_addr));

system/bta/ar/bta_ar.cc

+1 −3
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


#include <cstdint>



#include "bta/include/bta_ar_api.h"

#include "bta/ar/bta_ar_int.h"

#include "bta/sys/bta_sys.h"

#include "profile/avrcp/avrcp_sdp_service.h"
@@ -37,9 +38,6 @@ 
#include "stack/include/sdp_api.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::avrcp;

using namespace bluetooth;