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

Commit 6d511f3d authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Move EIR macros to compilation unit am: 1ecb9965 am: 0221dc96 

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



Change-Id: I16f2d48bd33d38532d9a9e6f3cbe5ad5de37947a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bda8976a 0221dc96

system/stack/btm/btm_inq.cc

+16 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
#include "osi/include/osi.h"

#include "osi/include/properties.h"

#include "osi/include/stack_power_telemetry.h"

#include "stack/btm/btm_dev.h"

#include "stack/btm/btm_int_types.h"

#include "stack/btm/btm_sec.h"

#include "stack/include/acl_api.h"
@@ -61,6 +60,22 @@ 
#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"



/* MACRO to set the service bit mask in a bit stream */

#define BTM_EIR_SET_SERVICE(p, service)                              \

  (((uint32_t*)(p))[(((uint32_t)(service)) / BTM_EIR_ARRAY_BITS)] |= \

   ((uint32_t)1 << (((uint32_t)(service)) % BTM_EIR_ARRAY_BITS)))



/* MACRO to clear the service bit mask in a bit stream */

#define BTM_EIR_CLR_SERVICE(p, service)                              \

  (((uint32_t*)(p))[(((uint32_t)(service)) / BTM_EIR_ARRAY_BITS)] &= \

   ~((uint32_t)1 << (((uint32_t)(service)) % BTM_EIR_ARRAY_BITS)))



/* MACRO to check the service bit mask in a bit stream */

#define BTM_EIR_HAS_SERVICE(p, service)                               \

  ((((uint32_t*)(p))[(((uint32_t)(service)) / BTM_EIR_ARRAY_BITS)] &  \

    ((uint32_t)1 << (((uint32_t)(service)) % BTM_EIR_ARRAY_BITS))) >> \

   (((uint32_t)(service)) % BTM_EIR_ARRAY_BITS))



namespace {

constexpr char kBtmLogTag[] = "SCAN";

system/stack/include/btm_api_types.h

+0 −16
Original line number Diff line number Diff line
@@ -82,22 +82,6 @@ typedef void(tBTM_VSC_CMPL_CB)(tBTM_VSC_CMPL* p1); 
  (((uint32_t)BTM_EIR_MAX_SERVICES / BTM_EIR_ARRAY_BITS) + \

   (((uint32_t)BTM_EIR_MAX_SERVICES % BTM_EIR_ARRAY_BITS) ? 1 : 0))



/* MACRO to set the service bit mask in a bit stream */

#define BTM_EIR_SET_SERVICE(p, service)                              \

  (((uint32_t*)(p))[(((uint32_t)(service)) / BTM_EIR_ARRAY_BITS)] |= \

   ((uint32_t)1 << (((uint32_t)(service)) % BTM_EIR_ARRAY_BITS)))



/* MACRO to clear the service bit mask in a bit stream */

#define BTM_EIR_CLR_SERVICE(p, service)                              \

  (((uint32_t*)(p))[(((uint32_t)(service)) / BTM_EIR_ARRAY_BITS)] &= \

   ~((uint32_t)1 << (((uint32_t)(service)) % BTM_EIR_ARRAY_BITS)))



/* MACRO to check the service bit mask in a bit stream */

#define BTM_EIR_HAS_SERVICE(p, service)                               \

  ((((uint32_t*)(p))[(((uint32_t)(service)) / BTM_EIR_ARRAY_BITS)] &  \

    ((uint32_t)1 << (((uint32_t)(service)) % BTM_EIR_ARRAY_BITS))) >> \

   (((uint32_t)(service)) % BTM_EIR_ARRAY_BITS))



/* start of EIR in HCI buffer, 4 bytes = HCI Command(2) + Length(1) + FEC_Req(1)

 */

#define BTM_HCI_EIR_OFFSET (BT_HDR_SIZE + 4)