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

Commit 038087c6 authored by Chris Manton's avatar Chris Manton
Browse files

legacy: Remove #BTA_PAN_INCLUDED 

Always include PAN profile

Bug: 191555414
Tag: #refactor
Test: gd/cert/run

Change-Id: Iea03d9fd546b87b843e823d994d063b6b0331d37
parent e7823bf3

system/bta/pan/bta_pan_api.cc

+0 −21
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <cstdint>



#include "bt_target.h"  // Must be first to define build configuration

#if (BTA_PAN_INCLUDED == TRUE)



#include "bta/pan/bta_pan_int.h"

#include "osi/include/allocator.h"
@@ -165,23 +164,3 @@ void BTA_PanClose(uint16_t handle) { 


  bta_sys_sendmsg(p_buf);

}
 
#else

#include "bta/pan/bta_pan_int.h"

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



void BTA_PanEnable(UNUSED_ATTR tBTA_PAN_CBACK p_cback) {}



void BTA_PanDisable(void) {}



void BTA_PanSetRole(UNUSED_ATTR tBTA_PAN_ROLE role,

                    UNUSED_ATTR tBTA_PAN_ROLE_INFO* p_user_info,

                    UNUSED_ATTR tBTA_PAN_ROLE_INFO* p_gn_info,

                    UNUSED_ATTR tBTA_PAN_ROLE_INFO* p_nap_info) {}



void BTA_PanOpen(UNUSED_ATTR const RawAddress& bd_addr,

                 UNUSED_ATTR tBTA_PAN_ROLE local_role,

                 UNUSED_ATTR tBTA_PAN_ROLE peer_role) {}



void BTA_PanClose(UNUSED_ATTR uint16_t handle) {}



#endif /* BTA_PAN_INCLUDED */

system/bta/pan/bta_pan_ci.cc

+0 −38
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 
#include "stack/include/bt_hdr.h"

#include "types/raw_address.h"



#if (BTA_PAN_INCLUDED == TRUE)



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

 *

 * Function         bta_pan_ci_tx_ready
@@ -192,39 +190,3 @@ BT_HDR* bta_pan_ci_readbuf(uint16_t handle, RawAddress& src, RawAddress& dst, 


  return p_buf;

}
 


#else

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



void bta_pan_ci_tx_ready(UNUSED_ATTR uint16_t handle) {}



void bta_pan_ci_rx_ready(UNUSED_ATTR uint16_t handle) {}



void bta_pan_ci_tx_flow(UNUSED_ATTR uint16_t handle, UNUSED_ATTR bool enable) {}



void bta_pan_ci_rx_writebuf(UNUSED_ATTR uint16_t handle,

                            UNUSED_ATTR const RawAddress& src,

                            UNUSED_ATTR const RawAddress& dst,

                            UNUSED_ATTR uint16_t protocol,

                            UNUSED_ATTR BT_HDR* p_buf, UNUSED_ATTR bool ext) {}



BT_HDR* bta_pan_ci_readbuf(UNUSED_ATTR uint16_t handle,

                           UNUSED_ATTR RawAddress& src,

                           UNUSED_ATTR RawAddress& dst,

                           UNUSED_ATTR uint16_t* p_protocol,

                           UNUSED_ATTR bool* p_ext,

                           UNUSED_ATTR bool* p_forward) {

  return NULL;

}



void bta_pan_ci_set_pfilters(UNUSED_ATTR uint16_t handle,

                             UNUSED_ATTR uint16_t num_filters,

                             UNUSED_ATTR uint16_t* p_start_array,

                             UNUSED_ATTR uint16_t* p_end_array) {}



void bta_pan_ci_set_mfilters(UNUSED_ATTR uint16_t handle,

                             UNUSED_ATTR uint16_t num_mcast_filters,

                             UNUSED_ATTR uint8_t* p_start_array,

                             UNUSED_ATTR uint8_t* p_end_array) {}



#endif /* BTA_PAN_API */

system/bta/pan/bta_pan_main.cc

+0 −3
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 


#include "bt_target.h"  // Must be first to define build configuration



#if (BTA_PAN_INCLUDED == TRUE)



#include "bta/pan/bta_pan_int.h"

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

#include "stack/include/bt_hdr.h"
@@ -352,4 +350,3 @@ bool bta_pan_hdl_event(BT_HDR_RIGID* p_msg) { 
  }

  return freebuf;

}
 
#endif /* BTA_PAN_INCLUDED */

system/btif/src/btif_pan.cc

+0 −6
Original line number Diff line number Diff line
@@ -182,21 +182,15 @@ static inline int btpan_role_to_bta(int btpan_role) { 
}



static volatile int btpan_dev_local_role;

#if (BTA_PAN_INCLUDED == TRUE)

static tBTA_PAN_ROLE_INFO bta_panu_info = {PANU_SERVICE_NAME, 0};

static tBTA_PAN_ROLE_INFO bta_pan_nap_info = {PAN_NAP_SERVICE_NAME, 1};

#endif



static bt_status_t btpan_enable(int local_role) {

#if (BTA_PAN_INCLUDED == TRUE)

  BTIF_TRACE_DEBUG("%s - local_role: %d", __func__, local_role);

  int bta_pan_role = btpan_role_to_bta(local_role);

  BTA_PanSetRole(bta_pan_role, &bta_panu_info, &bta_pan_nap_info);

  btpan_dev_local_role = local_role;

  return BT_STATUS_SUCCESS;

#else

  return BT_STATUS_FAIL;

#endif

}



static int btpan_get_local_role() {

system/btif/src/stack_manager.cc

+8 −0
Original line number Diff line number Diff line
@@ -92,6 +92,14 @@ 
#error "*** Conditional Compilation Directive error"

#endif



// Once BTA_PAN_INCLUDED is no longer exposed via bt_target.h

// this check and error statement may be removed.

static_assert(

    BTA_PAN_INCLUDED,

    "#define BTA_PAN_INCLUDED preprocessor compilation flag is unsupported"

    "  Pan profile is always included in the bluetooth stack"

    "*** Conditional Compilation Directive error");



void main_thread_shut_down();

void main_thread_start_up();

void BTA_dm_on_hw_on();