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

Commit c16a21ed authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "system/stack/l2cap: Fix -Wmissing-prototype errors" into main am: e4ed3dec am: 80ef1a01 

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



Change-Id: I241bce91af76f2d36c768252f2a7a33776a8dbb0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2227c6b2 80ef1a01

system/stack/acl/btm_acl.cc

+1 −2
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ 
#include "stack/include/l2cap_acl_interface.h"

#include "stack/include/l2cdefs.h"

#include "stack/include/main_thread.h"

#include "stack/l2cap/l2c_int.h"

#include "types/hci_role.h"

#include "types/raw_address.h"
@@ -96,8 +97,6 @@ using bluetooth::legacy::hci::GetInterface; 
void BTM_update_version_info(const RawAddress& bd_addr,

                             const remote_version_info& remote_version_info);



void l2c_link_hci_conn_comp(tHCI_STATUS status, uint16_t handle, const RawAddress& p_bda);



void BTM_db_reset(void);



extern tBTM_CB btm_cb;

system/stack/fuzzers/l2cap_fuzzer.cc

+1 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "stack/include/l2cap_interface.h"

#include "stack/include/l2cap_module.h"

#include "stack/include/l2cdefs.h"

#include "stack/l2cap/l2c_int.h"

#include "test/fake/fake_osi.h"

#include "test/mock/mock_main_shim_entry.h"

#include "test/mock/mock_stack_acl.h"
@@ -161,8 +162,6 @@ constexpr uint16_t kSmpBrHndl = 0x0222; 
constexpr uint16_t kNumClassicAclBuffer = 100;

constexpr uint16_t kNumLeAclBuffer = 100;



void l2c_link_hci_conn_comp(tHCI_STATUS status, uint16_t handle, const RawAddress& p_bda);



static void Fuzz(const uint8_t* data, size_t size) {

  memset(&btm_cb, 0, sizeof(btm_cb));

system/stack/include/l2cap_acl_interface.h

+0 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ void acl_write_automatic_flush_timeout(const RawAddress& bd_addr, uint16_t flush 
// ACL data received from HCI-ACL

void l2c_rcv_acl_data(BT_HDR* p_msg);



// Segments is sent to HCI-ACL

void l2c_link_segments_xmitted(BT_HDR* p_msg);



void l2cu_resubmit_pending_sec_req(const RawAddress* p_bda);



void l2c_packets_completed(uint16_t handle, uint16_t num_sent);

system/stack/include/l2cap_hci_link_interface.h

+0 −3
Original line number Diff line number Diff line
@@ -47,9 +47,6 @@ void l2cble_notify_le_connection(const RawAddress& bda); 


void l2cble_use_preferred_conn_params(const RawAddress& bda);



void l2cble_process_rc_param_request_evt(uint16_t handle, uint16_t int_min, uint16_t int_max,

                                         uint16_t latency, uint16_t timeout);



// Invoked when HCI mode is changed to HCI_MODE_ACTIVE or HCI_MODE_SNIFF

void l2c_OnHciModeChangeSendPendingPackets(RawAddress remote);

system/stack/l2cap/l2c_api.cc

+1 −10
Original line number Diff line number Diff line
@@ -45,13 +45,11 @@ 
#include "stack/include/bt_hdr.h"

#include "stack/include/bt_psm_types.h"

#include "stack/include/btm_client_interface.h"

#include "stack/include/l2cap_module.h"

#include "stack/include/main_thread.h"

#include "stack/l2cap/l2c_int.h"

#include "types/raw_address.h"



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

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



using namespace bluetooth;



extern fixed_queue_t* btu_general_alarm_queue;
@@ -59,13 +57,6 @@ tL2C_AVDT_CHANNEL_INFO av_media_channels[MAX_ACTIVE_AVDT_CONN]; 


constexpr uint16_t L2CAP_LE_CREDIT_THRESHOLD = 64;



tBT_TRANSPORT l2c_get_transport_from_fixed_cid(uint16_t fixed_cid) {

  if (fixed_cid >= L2CAP_ATT_CID && fixed_cid <= L2CAP_SMP_CID) {

    return BT_TRANSPORT_LE;

  }

  return BT_TRANSPORT_BR_EDR;

}



uint16_t L2CA_RegisterWithSecurity(uint16_t psm, const tL2CAP_APPL_INFO& p_cb_info,

                                   bool enable_snoop, tL2CAP_ERTM_INFO* p_ertm_info,

                                   uint16_t my_mtu, uint16_t required_remote_mtu,