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

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

Re-organize stack/btm/security_device_record.h 

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I8bc27f43da6f2a9a0812df6e44dc97933e31d2da
parent 862e7a2c

system/stack/btm/btm_ble_int_types.h

+0 −8
Original line number Diff line number Diff line
@@ -157,14 +157,6 @@ typedef struct { 
  alarm_t* refresh_raddr_timer;

} tBTM_LE_RANDOM_CB;



typedef struct {

  uint16_t min_conn_int;

  uint16_t max_conn_int;

  uint16_t slave_latency;

  uint16_t supervision_tout;



} tBTM_LE_CONN_PRAMS;



/* white list using state as a bit mask */

constexpr uint8_t BTM_BLE_WL_IDLE = 0;

constexpr uint8_t BTM_BLE_WL_INIT = 1;

system/stack/btm/btm_int_types.h

+3 −7
Original line number Diff line number Diff line
@@ -18,15 +18,11 @@ 
#ifndef BTM_INT_TYPES_H

#define BTM_INT_TYPES_H



#include "btif/include/btif_bqr.h"

#include "btm_api_types.h"

#include "btm_ble_api_types.h"

#include "btm_ble_int_types.h"

#include "hcidefs.h"

#include "osi/include/alarm.h"

#include <cstdint>



#include "osi/include/list.h"

#include "rfcdefs.h"

#include "stack/acl/acl.h"

#include "stack/btm/btm_ble_int_types.h"

#include "stack/btm/security_device_record.h"



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

system/stack/btm/security_device_record.h

+13 −8
Original line number Diff line number Diff line
@@ -18,15 +18,12 @@ 


#pragma once



#include "btif/include/btif_bqr.h"

#include "btm_api_types.h"

#include "btm_ble_api_types.h"

#include "btm_ble_int_types.h"

#include "hcidefs.h"

#include <cstdint>



#include "gd/crypto_toolbox/crypto_toolbox.h"

#include "osi/include/alarm.h"

#include "osi/include/list.h"

#include "rfcdefs.h"

#include "stack/acl/acl.h"

#include "stack/include/btm_api_types.h"

#include "types/raw_address.h"



typedef char tBTM_LOC_BD_NAME[BTM_MAX_LOC_BD_NAME_LEN + 1];
@@ -55,6 +52,14 @@ typedef char tBTM_LOC_BD_NAME[BTM_MAX_LOC_BD_NAME_LEN + 1]; 
  (controller_get_interface()->get_bt_version()->manufacturer == \

   LMP_COMPID_BROADCOM)



typedef struct {

  uint16_t min_conn_int;

  uint16_t max_conn_int;

  uint16_t slave_latency;

  uint16_t supervision_tout;



} tBTM_LE_CONN_PRAMS;



/* Define the Device Management control structure

 */

typedef struct {