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

Commit 9df7f260 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

stack::rfcomm Include what you use am: 4d8813ba 

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



Change-Id: Ib548afa2051c53ec020931a5ad32e36cf2cc0b89
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b830711a 4d8813ba

system/stack/rfcomm/port_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


#include "internal_include/bt_target.h"

#include "internal_include/bt_trace.h"

#include "os/log.h"

#include "os/logging/log_adapter.h"

#include "osi/include/allocator.h"

#include "osi/include/mutex.h"

#include "stack/include/bt_hdr.h"

system/stack/rfcomm/port_rfc.cc

+4 −7
Original line number Diff line number Diff line
@@ -31,16 +31,14 @@ 
#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>



#include <cstdint>

#include <string>



#include "hal/snoop_logger.h"

#include "internal_include/bt_target.h"

#include "internal_include/bt_trace.h"

#include "main/shim/entry.h"

#include "os/log.h"

#include "os/logging/log_adapter.h"

#include "osi/include/allocator.h"

#include "osi/include/mutex.h"

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

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_uuid16.h"

#include "stack/include/stack_metrics_logging.h"
@@ -552,8 +550,8 @@ void PORT_PortNegInd(tRFC_MCB* p_mcb, uint8_t dlci, tPORT_STATE* p_pars, 
 *                  state for the port.  Propagate change to the user.

 *

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

void PORT_PortNegCnf(tRFC_MCB* p_mcb, uint8_t dlci,

                     UNUSED_ATTR tPORT_STATE* p_pars, uint16_t result) {

void PORT_PortNegCnf(tRFC_MCB* p_mcb, uint8_t dlci, tPORT_STATE* /* p_pars */,

                     uint16_t result) {

  tPORT* p_port = port_find_mcb_dlci_port(p_mcb, dlci);



  log::verbose("PORT_PortNegCnf");
@@ -640,8 +638,7 @@ void PORT_ControlInd(tRFC_MCB* p_mcb, uint8_t dlci, tPORT_CTRL* p_pars) { 
 *                  peer acknowleges change of the modem signals.

 *

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

void PORT_ControlCnf(tRFC_MCB* p_mcb, uint8_t dlci,

                     UNUSED_ATTR tPORT_CTRL* p_pars) {

void PORT_ControlCnf(tRFC_MCB* p_mcb, uint8_t dlci, tPORT_CTRL* /* p_pars */) {

  tPORT* p_port = port_find_mcb_dlci_port(p_mcb, dlci);

  uint32_t event = 0;

system/stack/rfcomm/port_utils.cc

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


#include "internal_include/bt_target.h"

#include "internal_include/bt_trace.h"

#include "os/log.h"

#include "os/logging/log_adapter.h"

#include "osi/include/allocator.h"

#include "osi/include/mutex.h"

#include "stack/include/bt_hdr.h"

system/stack/rfcomm/rfc_l2cap_if.cc

+3 −4
Original line number Diff line number Diff line
@@ -31,9 +31,8 @@ 
#include "common/time_util.h"

#include "internal_include/bt_target.h"

#include "internal_include/bt_trace.h"

#include "os/log.h"

#include "os/logging/log_adapter.h"

#include "osi/include/allocator.h"

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

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_psm_types.h"

#include "stack/include/l2c_api.h"
@@ -91,7 +90,7 @@ void rfcomm_l2cap_if_init(void) { 
 *

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

void RFCOMM_ConnectInd(const RawAddress& bd_addr, uint16_t lcid,

                       UNUSED_ATTR uint16_t psm, uint8_t id) {

                       uint16_t /* psm */, uint8_t id) {

  tRFC_MCB* p_mcb = rfc_alloc_multiplexer_channel(bd_addr, false);



  if ((p_mcb) && (p_mcb->state != RFC_MX_STATE_IDLE)) {
@@ -214,7 +213,7 @@ void RFCOMM_ConfigInd(uint16_t lcid, tL2CAP_CFG_INFO* p_cfg) { 
 *                  event to the FSM.

 *

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

void RFCOMM_ConfigCnf(uint16_t lcid, UNUSED_ATTR uint16_t initiator,

void RFCOMM_ConfigCnf(uint16_t lcid, uint16_t /* initiator */,

                      tL2CAP_CFG_INFO* p_cfg) {

  RFCOMM_ConfigInd(lcid, p_cfg);

system/stack/rfcomm/rfc_mx_fsm.cc

+4 −5
Original line number Diff line number Diff line
@@ -29,9 +29,8 @@ 
#include <cstdint>



#include "include/check.h"

#include "os/log.h"

#include "os/logging/log_adapter.h"

#include "osi/include/allocator.h"

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

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_psm_types.h"

#include "stack/include/l2c_api.h"
@@ -57,7 +56,7 @@ static void rfc_mx_sm_sabme_wait_ua(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, 
static void rfc_mx_sm_state_wait_sabme(tRFC_MCB* p_mcb, tRFC_MX_EVENT event,

                                       void* p_data);

static void rfc_mx_sm_state_connected(tRFC_MCB* p_mcb, tRFC_MX_EVENT event,

                                      UNUSED_ATTR void* p_data);

                                      void* p_data);

static void rfc_mx_sm_state_disc_wait_ua(tRFC_MCB* p_mcb, tRFC_MX_EVENT event,

                                         void* p_data);
@@ -322,7 +321,7 @@ void rfc_mx_sm_state_configure(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, 
 *

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

void rfc_mx_sm_sabme_wait_ua(tRFC_MCB* p_mcb, tRFC_MX_EVENT event,

                             UNUSED_ATTR void* p_data) {

                             void* /* p_data */) {

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

  switch (event) {

    case RFC_MX_EVENT_START_REQ:
@@ -450,7 +449,7 @@ void rfc_mx_sm_state_wait_sabme(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, 
 *

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

void rfc_mx_sm_state_connected(tRFC_MCB* p_mcb, tRFC_MX_EVENT event,

                               UNUSED_ATTR void* p_data) {

                               void* /* p_data */) {

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



  switch (event) {