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

Commit d9b7bcc2 authored by Chris Manton's avatar Chris Manton
Browse files

legacy: Move BTM_SEC_ #defs to compilation unit 

Toward modularized code

Bug: 163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Iac5bc9821127bc95d71384eb2a02555540ddb0dc
parent f8865269

system/stack/btm/btm_int_types.h

+0 −9
Original line number Diff line number Diff line
@@ -34,15 +34,6 @@ 
#include "stack/include/btm_ble_api_types.h"

#include "stack/include/security_client_callbacks.h"



#define BTM_SEC_IS_SM4(sm) ((bool)(BTM_SM4_TRUE == ((sm)&BTM_SM4_TRUE)))

#define BTM_SEC_IS_SM4_LEGACY(sm) ((bool)(BTM_SM4_KNOWN == ((sm)&BTM_SM4_TRUE)))

#define BTM_SEC_IS_SM4_UNKNOWN(sm) \

  ((bool)(BTM_SM4_UNKNOWN == ((sm)&BTM_SM4_TRUE)))



#define BTM_SEC_LE_MASK                              \

  (BTM_SEC_LE_AUTHENTICATED | BTM_SEC_LE_ENCRYPTED | \

   BTM_SEC_LE_LINK_KEY_KNOWN | BTM_SEC_LE_LINK_KEY_AUTHED)



#define BTM_MAX_SCN_ 31  // PORT_MAX_RFC_PORTS packages/modules/Bluetooth/system/stack/include/rfcdefs.h



constexpr size_t kMaxLogSize = 255;

system/stack/btm/btm_sec.cc

+9 −0
Original line number Diff line number Diff line
@@ -61,6 +61,15 @@ extern tBTM_CB btm_cb; 


#define BTM_SEC_MAX_COLLISION_DELAY (5000)



#define BTM_SEC_IS_SM4(sm) ((bool)(BTM_SM4_TRUE == ((sm)&BTM_SM4_TRUE)))

#define BTM_SEC_IS_SM4_LEGACY(sm) ((bool)(BTM_SM4_KNOWN == ((sm)&BTM_SM4_TRUE)))

#define BTM_SEC_IS_SM4_UNKNOWN(sm) \

  ((bool)(BTM_SM4_UNKNOWN == ((sm)&BTM_SM4_TRUE)))



#define BTM_SEC_LE_MASK                              \

  (BTM_SEC_LE_AUTHENTICATED | BTM_SEC_LE_ENCRYPTED | \

   BTM_SEC_LE_LINK_KEY_KNOWN | BTM_SEC_LE_LINK_KEY_AUTHED)



void btm_inq_stop_on_ssp(void);

extern void btm_ble_advertiser_notify_terminated_legacy(

    uint8_t status, uint16_t connection_handle);