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

Commit 0e7c3d42 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Merge "legacy: Remove unused bta/pan:: functions" am: 6193b979 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1853867

Change-Id: I89c551364df3ff6e895ded50c162ef0f4e14a27b
parents 219332ad 6193b979

system/bta/include/bta_pan_ci.h

+0 −28
Original line number Diff line number Diff line
@@ -116,32 +116,4 @@ extern BT_HDR* bta_pan_ci_readbuf(uint16_t handle, RawAddress& src, 
                                  RawAddress& dst, uint16_t* p_protocol,

                                  bool* p_ext, bool* p_forward);



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

 *

 * Function         bta_pan_ci_set_pfilters

 *

 * Description      This function is called to set protocol filters

 *

 *

 * Returns          void

 *

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

extern void bta_pan_ci_set_pfilters(uint16_t handle, uint16_t num_filters,

                                    uint16_t* p_start_array,

                                    uint16_t* p_end_array);



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

 *

 * Function         bta_pan_ci_set_mfilters

 *

 * Description      This function is called to set multicast filters

 *

 *

 * Returns          void

 *

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

extern void bta_pan_ci_set_mfilters(uint16_t handle, uint16_t num_mcast_filters,

                                    uint8_t* p_start_array,

                                    uint8_t* p_end_array);



#endif /* BTA_PAN_CI_H */

system/bta/pan/bta_pan_ci.cc

+0 −30
Original line number Diff line number Diff line
@@ -193,36 +193,6 @@ BT_HDR* bta_pan_ci_readbuf(uint16_t handle, RawAddress& src, RawAddress& dst, 
  return p_buf;

}



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

 *

 * Function         bta_pan_ci_set_mfilters

 *

 * Description      This function is called to set multicast filters

 *

 *

 * Returns          void

 *

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

void bta_pan_ci_set_mfilters(uint16_t handle, uint16_t num_mcast_filters,

                             uint8_t* p_start_array, uint8_t* p_end_array) {

  PAN_SetMulticastFilters(handle, num_mcast_filters, p_start_array,

                          p_end_array);

}



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

 *

 * Function         bta_pan_ci_set_mfilters

 *

 * Description      This function is called to set protocol filters

 *

 *

 * Returns          void

 *

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

void bta_pan_ci_set_pfilters(uint16_t handle, uint16_t num_filters,

                             uint16_t* p_start_array, uint16_t* p_end_array) {

  PAN_SetProtocolFilters(handle, num_filters, p_start_array, p_end_array);

}

#else

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

system/test/mock/mock_bta_pan_ci.cc

+0 −8
Original line number Diff line number Diff line
@@ -52,14 +52,6 @@ void bta_pan_ci_rx_writebuf(uint16_t handle, const RawAddress& dst, 
                            BT_HDR* p_buf, bool ext) {

  mock_function_count_map[__func__]++;

}

void bta_pan_ci_set_mfilters(uint16_t handle, uint16_t num_mcast_filters,

                             uint8_t* p_start_array, uint8_t* p_end_array) {

  mock_function_count_map[__func__]++;

}

void bta_pan_ci_set_pfilters(uint16_t handle, uint16_t num_filters,

                             uint16_t* p_start_array, uint16_t* p_end_array) {

  mock_function_count_map[__func__]++;

}

void bta_pan_ci_tx_flow(uint16_t handle, bool enable) {

  mock_function_count_map[__func__]++;

}