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

Commit 6be91044 authored by Chris Manton's avatar Chris Manton
Browse files

Move stack/include/::btm_api into btm_ble_api 

Towards functional aggregation

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

Change-Id: I070cc0c031fbf5ecdf6b444faf167a540e0ac1e2
parent f200d746

system/stack/include/btm_api_types.h

+0 −96
Original line number Diff line number Diff line
@@ -880,102 +880,6 @@ typedef struct { 
  bool smp_over_br;

} tBTM_LE_COMPLT;



/* BLE encryption keys */

typedef struct {

  Octet16 ltk;

  BT_OCTET8 rand;

  uint16_t ediv;

  uint8_t sec_level;

  uint8_t key_size;

} tBTM_LE_PENC_KEYS;



/* BLE CSRK keys */

typedef struct {

  uint32_t counter;

  Octet16 csrk;

  uint8_t sec_level;

} tBTM_LE_PCSRK_KEYS;



/* BLE Encryption reproduction keys */

typedef struct {

  Octet16 ltk;

  uint16_t div;

  uint8_t key_size;

  uint8_t sec_level;

} tBTM_LE_LENC_KEYS;



/* BLE SRK keys */

typedef struct {

  uint32_t counter;

  uint16_t div;

  uint8_t sec_level;

  Octet16 csrk;

} tBTM_LE_LCSRK_KEYS;



typedef struct {

  Octet16 irk;

  tBLE_ADDR_TYPE identity_addr_type;

  RawAddress identity_addr;

} tBTM_LE_PID_KEYS;



typedef union {

  tBTM_LE_PENC_KEYS penc_key;   /* received peer encryption key */

  tBTM_LE_PCSRK_KEYS pcsrk_key; /* received peer device SRK */

  tBTM_LE_PID_KEYS pid_key;     /* peer device ID key */

  tBTM_LE_LENC_KEYS lenc_key;   /* local encryption reproduction keys

                                 * LTK = = d1(ER,DIV,0) */

  tBTM_LE_LCSRK_KEYS lcsrk_key; /* local device CSRK = d1(ER,DIV,1)*/

} tBTM_LE_KEY_VALUE;



typedef struct {

  tBTM_LE_KEY_TYPE key_type;

  tBTM_LE_KEY_VALUE* p_key_value;

} tBTM_LE_KEY;



typedef union {

  tBTM_LE_IO_REQ io_req; /* BTM_LE_IO_REQ_EVT      */

  uint32_t key_notif;    /* BTM_LE_KEY_NOTIF_EVT   */

                         /* BTM_LE_NC_REQ_EVT */

                         /* no callback data for

                          * BTM_LE_KEY_REQ_EVT

                          * and BTM_LE_OOB_REQ_EVT  */

  tBTM_LE_COMPLT complt; /* BTM_LE_COMPLT_EVT      */

  tSMP_OOB_DATA_TYPE req_oob_type;

  tBTM_LE_KEY key;

} tBTM_LE_EVT_DATA;



/* Simple Pairing Events.  Called by the stack when Simple Pairing related

 * events occur.

*/

typedef uint8_t(tBTM_LE_CALLBACK)(tBTM_LE_EVT event, const RawAddress& bda,

                                  tBTM_LE_EVT_DATA* p_data);



#define BTM_BLE_KEY_TYPE_ID 1

#define BTM_BLE_KEY_TYPE_ER 2

#define BTM_BLE_KEY_TYPE_COUNTER 3  // tobe obsolete



typedef struct {

  Octet16 ir;

  Octet16 irk;

  Octet16 dhk;



} tBTM_BLE_LOCAL_ID_KEYS;



typedef union {

  tBTM_BLE_LOCAL_ID_KEYS id_keys;

  Octet16 er;

} tBTM_BLE_LOCAL_KEYS;



/* New LE identity key for local device.

*/

typedef void(tBTM_LE_KEY_CALLBACK)(uint8_t key_type,

                                   tBTM_BLE_LOCAL_KEYS* p_key);



/* Callback function for when a link supervision timeout event occurs.

 * This asynchronous event is enabled/disabled by calling BTM_RegForLstoEvt().

*/

typedef void(tBTM_LSTO_CBACK)(const RawAddress& remote_bda, uint16_t timeout);



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

 *  POWER MANAGEMENT

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

system/stack/include/btm_ble_api_types.h

+95 −0
Original line number Diff line number Diff line
@@ -21,7 +21,11 @@ 


#include <base/callback_forward.h>

#include <hardware/bt_common_types.h>

#include <cstdint>

#include <vector>



#include "stack/include/btm_api_types.h"

#include "stack/include/btm_status.h"

#include "types/ble_address_with_type.h"



#define CHNL_MAP_LEN 5
@@ -489,4 +493,95 @@ typedef struct { 


typedef void(tBTM_BLE_CTRL_FEATURES_CBACK)(tBTM_STATUS status);



/* BLE encryption keys */

typedef struct {

  Octet16 ltk;

  BT_OCTET8 rand;

  uint16_t ediv;

  uint8_t sec_level;

  uint8_t key_size;

} tBTM_LE_PENC_KEYS;



/* BLE CSRK keys */

typedef struct {

  uint32_t counter;

  Octet16 csrk;

  uint8_t sec_level;

} tBTM_LE_PCSRK_KEYS;



/* BLE Encryption reproduction keys */

typedef struct {

  Octet16 ltk;

  uint16_t div;

  uint8_t key_size;

  uint8_t sec_level;

} tBTM_LE_LENC_KEYS;



/* BLE SRK keys */

typedef struct {

  uint32_t counter;

  uint16_t div;

  uint8_t sec_level;

  Octet16 csrk;

} tBTM_LE_LCSRK_KEYS;



typedef struct {

  Octet16 irk;

  tBLE_ADDR_TYPE identity_addr_type;

  RawAddress identity_addr;

} tBTM_LE_PID_KEYS;



typedef union {

  tBTM_LE_PENC_KEYS penc_key;   /* received peer encryption key */

  tBTM_LE_PCSRK_KEYS pcsrk_key; /* received peer device SRK */

  tBTM_LE_PID_KEYS pid_key;     /* peer device ID key */

  tBTM_LE_LENC_KEYS lenc_key;   /* local encryption reproduction keys

                                 * LTK = = d1(ER,DIV,0) */

  tBTM_LE_LCSRK_KEYS lcsrk_key; /* local device CSRK = d1(ER,DIV,1)*/

} tBTM_LE_KEY_VALUE;



typedef struct {

  tBTM_LE_KEY_TYPE key_type;

  tBTM_LE_KEY_VALUE* p_key_value;

} tBTM_LE_KEY;



typedef union {

  tBTM_LE_IO_REQ io_req; /* BTM_LE_IO_REQ_EVT      */

  uint32_t key_notif;    /* BTM_LE_KEY_NOTIF_EVT   */

                         /* BTM_LE_NC_REQ_EVT */

                         /* no callback data for

                          * BTM_LE_KEY_REQ_EVT

                          * and BTM_LE_OOB_REQ_EVT  */

  tBTM_LE_COMPLT complt; /* BTM_LE_COMPLT_EVT      */

  tSMP_OOB_DATA_TYPE req_oob_type;

  tBTM_LE_KEY key;

} tBTM_LE_EVT_DATA;



/* Simple Pairing Events.  Called by the stack when Simple Pairing related

 * events occur.

 */

typedef uint8_t(tBTM_LE_CALLBACK)(tBTM_LE_EVT event, const RawAddress& bda,

                                  tBTM_LE_EVT_DATA* p_data);



#define BTM_BLE_KEY_TYPE_ID 1

#define BTM_BLE_KEY_TYPE_ER 2

#define BTM_BLE_KEY_TYPE_COUNTER 3  // tobe obsolete



typedef struct {

  Octet16 ir;

  Octet16 irk;

  Octet16 dhk;



} tBTM_BLE_LOCAL_ID_KEYS;



typedef union {

  tBTM_BLE_LOCAL_ID_KEYS id_keys;

  Octet16 er;

} tBTM_BLE_LOCAL_KEYS;



/* New LE identity key for local device.

 */

typedef void(tBTM_LE_KEY_CALLBACK)(uint8_t key_type,

                                   tBTM_BLE_LOCAL_KEYS* p_key);



#endif  // BTM_BLE_API_TYPES_H