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

Commit 2e47fee9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I77fada83,Icfd17bc7,Ib8d50fe5,Ib865235a,Ib34521cb, ... 

* changes:
  Remove unnecessary type definition tBTA_DM_BLE_IDLE_TIME_MS
  Remove unnecessary type definition tBTA_DM_BLE_RX_TIME_MS
  Remove unnecessary type definition tBTA_DM_BLE_TX_TIME_MS
  Remove unnecessary type definition tBTA_DM_BLE_SEC_ACT
  Remove unnecessary type definition tBTA_OOB_DATA
  Remove unnecessary type definition tBTA_LE_AUTH_REQ
  Remove unnecessary type definitions tBTA_DM_BLE_ENERGY_USED
  Remove unnecessary type definitions tBTA_AUTH_REQ
  Remove unnecessary type definitions tBTA_IO_CAP
  Remove unnecessary type definitions tBTA_LE_*
parents 11cd0041 39c23beb

system/bta/dm/bta_dm_act.cc

+3 −3
Original line number Diff line number Diff line
@@ -922,8 +922,8 @@ void bta_dm_confirm(const RawAddress& bd_addr, bool accept) { 
}



/** respond to the IO capabilities request from BTM */

void bta_dm_ci_io_req_act(const RawAddress& bd_addr, tBTA_IO_CAP io_cap,

                          tBTA_OOB_DATA oob_data, tBTA_AUTH_REQ auth_req) {

void bta_dm_ci_io_req_act(const RawAddress& bd_addr, tBTM_IO_CAP io_cap,

                          tBTM_OOB_DATA oob_data, tBTM_AUTH_REQ auth_req) {

  BTM_IoCapRsp(bd_addr, io_cap, oob_data,

               auth_req ? BTM_AUTH_AP_YES : BTM_AUTH_AP_NO);

}
@@ -3544,7 +3544,7 @@ void bta_dm_encrypt_cback(const RawAddress* bd_addr, tBT_TRANSPORT transport, 
/**This function to encrypt the link */

void bta_dm_set_encryption(const RawAddress& bd_addr, tBTA_TRANSPORT transport,

                           tBTA_DM_ENCRYPT_CBACK* p_callback,

                           tBTA_DM_BLE_SEC_ACT sec_act) {

                           tBTM_BLE_SEC_ACT sec_act) {

  uint8_t i;



  APPL_TRACE_DEBUG("bta_dm_set_encryption");  // todo

system/bta/dm/bta_dm_api.cc

+2 −2
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ void BTA_DmConfirm(const RawAddress& bd_addr, bool accept) { 
 ******************************************************************************/

void BTA_DmAddDevice(const RawAddress& bd_addr, DEV_CLASS dev_class,

                     const LinkKey& link_key, tBTA_SERVICE_MASK trusted_mask,

                     bool is_trusted, uint8_t key_type, tBTA_IO_CAP io_cap,

                     bool is_trusted, uint8_t key_type, tBTM_IO_CAP io_cap,

                     uint8_t pin_length) {

  std::unique_ptr<tBTA_DM_API_ADD_DEVICE> msg =

      std::make_unique<tBTA_DM_API_ADD_DEVICE>();
@@ -700,7 +700,7 @@ void BTA_DmBleSetDataLength(const RawAddress& remote_device, 
 ******************************************************************************/

void BTA_DmSetEncryption(const RawAddress& bd_addr, tBTA_TRANSPORT transport,

                         tBTA_DM_ENCRYPT_CBACK* p_callback,

                         tBTA_DM_BLE_SEC_ACT sec_act) {

                         tBTM_BLE_SEC_ACT sec_act) {

  APPL_TRACE_API("%s", __func__);

  do_in_main_thread(FROM_HERE, base::Bind(bta_dm_set_encryption, bd_addr,

                                          transport, p_callback, sec_act));

system/bta/dm/bta_dm_ci.cc

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ 
 * Returns          void

 *

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

void bta_dm_ci_io_req(const RawAddress& bd_addr, tBTA_IO_CAP io_cap,

                      tBTA_OOB_DATA oob_data, tBTA_AUTH_REQ auth_req)

void bta_dm_ci_io_req(const RawAddress& bd_addr, tBTM_IO_CAP io_cap,

                      tBTM_OOB_DATA oob_data, tBTM_AUTH_REQ auth_req)



{

  do_in_main_thread(FROM_HERE, base::Bind(bta_dm_ci_io_req_act, bd_addr, io_cap,

system/bta/dm/bta_dm_int.h

+12 −12
Original line number Diff line number Diff line
@@ -111,9 +111,9 @@ typedef struct { 
typedef struct {

  BT_HDR hdr;

  RawAddress bd_addr;

  tBTA_IO_CAP io_cap;

  tBTA_OOB_DATA oob_data;

  tBTA_AUTH_REQ auth_req;

  tBTM_IO_CAP io_cap;

  tBTM_OOB_DATA oob_data;

  tBTM_AUTH_REQ auth_req;

} tBTA_DM_CI_IO_REQ;



typedef struct {
@@ -154,7 +154,7 @@ typedef struct { 
  tBTA_SERVICE_MASK tm;

  bool is_trusted;

  uint8_t key_type;

  tBTA_IO_CAP io_cap;

  tBTM_IO_CAP io_cap;

  bool link_key_known;

  bool dc_known;

  BD_NAME bd_name;
@@ -314,10 +314,10 @@ typedef struct { 
  RawAddress pin_bd_addr;

  DEV_CLASS pin_dev_class;

  tBTA_DM_SEC_EVT pin_evt;

  tBTA_IO_CAP loc_io_caps;    /* IO Capabilities of local device */

  tBTA_IO_CAP rmt_io_caps;    /* IO Capabilities of remote device */

  tBTA_AUTH_REQ loc_auth_req; /* Authentication required for local device */

  tBTA_AUTH_REQ rmt_auth_req;

  tBTM_IO_CAP loc_io_caps;    /* IO Capabilities of local device */

  tBTM_IO_CAP rmt_io_caps;    /* IO Capabilities of remote device */

  tBTM_AUTH_REQ loc_auth_req; /* Authentication required for local device */

  tBTM_AUTH_REQ rmt_auth_req;

  uint32_t num_val; /* the numeric value for comparison. If just_works, do not

                       show this number to UI */

  bool just_works;  /* true, if "Just Works" association model */
@@ -515,11 +515,11 @@ extern void bta_dm_ble_set_data_length(const RawAddress&, uint16_t); 
extern void bta_dm_ble_get_energy_info(tBTA_BLE_ENERGY_INFO_CBACK*);



extern void bta_dm_set_encryption(const RawAddress&, tBTA_TRANSPORT,

                                  tBTA_DM_ENCRYPT_CBACK*, tBTA_DM_BLE_SEC_ACT);

                                  tBTA_DM_ENCRYPT_CBACK*, tBTM_BLE_SEC_ACT);

extern void bta_dm_confirm(const RawAddress&, bool);

extern void bta_dm_ci_io_req_act(const RawAddress& bd_addr, tBTA_IO_CAP io_cap,

                                 tBTA_OOB_DATA oob_data,

                                 tBTA_AUTH_REQ auth_req);

extern void bta_dm_ci_io_req_act(const RawAddress& bd_addr, tBTM_IO_CAP io_cap,

                                 tBTM_OOB_DATA oob_data,

                                 tBTM_AUTH_REQ auth_req);

extern void bta_dm_ci_rmt_oob_act(std::unique_ptr<tBTA_DM_CI_RMT_OOB> msg);



extern void bta_dm_init_pm(void);

system/bta/include/bta_api.h

+16 −37
Original line number Diff line number Diff line
@@ -303,9 +303,6 @@ typedef struct { 
  uint8_t* bta_dm_eir_additional;      /* additional data */

} tBTA_DM_EIR_CONF;



/* advertising filter policy */

typedef tBTM_BLE_AFP tBTA_BLE_AFP;



enum {

  BTA_BLE_BATCH_SCAN_MODE_PASS = 1,

  BTA_BLE_BATCH_SCAN_MODE_ACTI = 2,
@@ -448,20 +445,14 @@ typedef struct { 
  BTM_LE_KEY_LCSRK                /* local CSRK has been deliver to peer */

typedef uint8_t tBTA_LE_KEY_TYPE; /* can be used as a bit mask */



typedef tBTM_LE_PENC_KEYS tBTA_LE_PENC_KEYS;

typedef tBTM_LE_PCSRK_KEYS tBTA_LE_PCSRK_KEYS;

typedef tBTM_LE_LENC_KEYS tBTA_LE_LENC_KEYS;

typedef tBTM_LE_LCSRK_KEYS tBTA_LE_LCSRK_KEYS;

typedef tBTM_LE_PID_KEYS tBTA_LE_PID_KEYS;



typedef union {

  tBTA_LE_PENC_KEYS penc_key;  /* received peer encryption key */

  tBTA_LE_PCSRK_KEYS psrk_key; /* received peer device SRK */

  tBTA_LE_PID_KEYS pid_key;    /* peer device ID key */

  tBTA_LE_LENC_KEYS

  tBTM_LE_PENC_KEYS penc_key;  /* received peer encryption key */

  tBTM_LE_PCSRK_KEYS psrk_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)*/

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

  tBTA_LE_PID_KEYS lid_key; /* local device ID key for the particular remote */

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

  tBTM_LE_PID_KEYS lid_key; /* local device ID key for the particular remote */

} tBTA_LE_KEY_VALUE;



#define BTA_BLE_LOCAL_KEY_TYPE_ID 1
@@ -519,7 +510,6 @@ typedef struct { 
#define BTA_IO_CAP_IN BTM_IO_CAP_IN         /* 2 KeyboardOnly */

#define BTA_IO_CAP_NONE BTM_IO_CAP_NONE     /* 3 NoInputNoOutput */

#define BTA_IO_CAP_KBDISP BTM_IO_CAP_KBDISP /* 4 Keyboard display */

typedef tBTM_IO_CAP tBTA_IO_CAP;



#define BTA_AUTH_SP_NO                                      \

  BTM_AUTH_SP_NO /* 0 MITM Protection Not Required - Single \
@@ -547,7 +537,6 @@ typedef tBTM_IO_CAP tBTA_IO_CAP; 
                      bonding                                               \

                      Use IO Capabilities to determine authentication       \

                      procedure */

typedef tBTM_AUTH_REQ tBTA_AUTH_REQ;



#define BTA_AUTH_DD_BOND \

  BTM_AUTH_DD_BOND /* 2 this bit is set for dedicated bonding */
@@ -564,15 +553,11 @@ typedef tBTM_AUTH_REQ tBTA_AUTH_REQ; 
#define BTA_LE_AUTH_REQ_SC_BOND BTM_LE_AUTH_REQ_SC_BOND           /* 1001 */

#define BTA_LE_AUTH_REQ_SC_MITM BTM_LE_AUTH_REQ_SC_MITM           /* 1100 */

#define BTA_LE_AUTH_REQ_SC_MITM_BOND BTM_LE_AUTH_REQ_SC_MITM_BOND /* 1101 */

typedef tBTM_LE_AUTH_REQ

    tBTA_LE_AUTH_REQ; /* combination of the above bit pattern */



#define BTA_OOB_NONE BTM_OOB_NONE

#define BTA_OOB_PRESENT BTM_OOB_PRESENT

#define BTA_OOB_UNKNOWN BTM_OOB_UNKNOWN



typedef tBTM_OOB_DATA tBTA_OOB_DATA;



/* Structure associated with BTA_DM_SP_CFM_REQ_EVT */

typedef struct {

  /* Note: First 3 data members must be, bd_addr, dev_class, and bd_name in
@@ -583,10 +568,10 @@ typedef struct { 
  uint32_t num_val; /* the numeric value for comparison. If just_works, do not

                       show this number to UI */

  bool just_works;  /* true, if "Just Works" association model */

  tBTA_AUTH_REQ loc_auth_req; /* Authentication required for local device */

  tBTA_AUTH_REQ rmt_auth_req; /* Authentication required for peer device */

  tBTA_IO_CAP loc_io_caps;    /* IO Capabilities of local device */

  tBTA_AUTH_REQ rmt_io_caps;  /* IO Capabilities of remote device */

  tBTM_AUTH_REQ loc_auth_req; /* Authentication required for local device */

  tBTM_AUTH_REQ rmt_auth_req; /* Authentication required for peer device */

  tBTM_IO_CAP loc_io_caps;    /* IO Capabilities of local device */

  tBTM_AUTH_REQ rmt_io_caps;  /* IO Capabilities of remote device */

} tBTA_DM_SP_CFM_REQ;



enum {
@@ -745,12 +730,6 @@ typedef void(tBTA_DM_ENCRYPT_CBACK)(const RawAddress& bd_addr, 
#define BTA_DM_BLE_SEC_ENCRYPT BTM_BLE_SEC_ENCRYPT

#define BTA_DM_BLE_SEC_NO_MITM BTM_BLE_SEC_ENCRYPT_NO_MITM

#define BTA_DM_BLE_SEC_MITM BTM_BLE_SEC_ENCRYPT_MITM

typedef tBTM_BLE_SEC_ACT tBTA_DM_BLE_SEC_ACT;



typedef tBTM_BLE_TX_TIME_MS tBTA_DM_BLE_TX_TIME_MS;

typedef tBTM_BLE_RX_TIME_MS tBTA_DM_BLE_RX_TIME_MS;

typedef tBTM_BLE_IDLE_TIME_MS tBTA_DM_BLE_IDLE_TIME_MS;

typedef tBTM_BLE_ENERGY_USED tBTA_DM_BLE_ENERGY_USED;



#define BTA_DM_CONTRL_UNKNOWN 0 /* Unknown state */

#define BTA_DM_CONTRL_ACTIVE 1  /* ACL link on, SCO link ongoing, sniff mode */
@@ -768,10 +747,10 @@ typedef uint8_t tBTA_DM_BLE_ADV_INFO_PRESENT; 
typedef uint8_t tBTA_DM_BLE_RSSI_VALUE;

typedef uint16_t tBTA_DM_BLE_ADV_INFO_TIMESTAMP;



typedef void(tBTA_BLE_ENERGY_INFO_CBACK)(tBTA_DM_BLE_TX_TIME_MS tx_time,

                                         tBTA_DM_BLE_RX_TIME_MS rx_time,

                                         tBTA_DM_BLE_IDLE_TIME_MS idle_time,

                                         tBTA_DM_BLE_ENERGY_USED energy_used,

typedef void(tBTA_BLE_ENERGY_INFO_CBACK)(tBTM_BLE_TX_TIME_MS tx_time,

                                         tBTM_BLE_RX_TIME_MS rx_time,

                                         tBTM_BLE_IDLE_TIME_MS idle_time,

                                         tBTM_BLE_ENERGY_USED energy_used,

                                         tBTA_DM_CONTRL_STATE ctrl_state,

                                         tBTA_STATUS status);
@@ -1223,7 +1202,7 @@ extern void BTA_DmConfirm(const RawAddress& bd_addr, bool accept); 
extern void BTA_DmAddDevice(const RawAddress& bd_addr, DEV_CLASS dev_class,

                            const LinkKey& link_key,

                            tBTA_SERVICE_MASK trusted_mask, bool is_trusted,

                            uint8_t key_type, tBTA_IO_CAP io_cap,

                            uint8_t key_type, tBTM_IO_CAP io_cap,

                            uint8_t pin_length);



/*******************************************************************************
@@ -1457,7 +1436,7 @@ extern void BTA_DmDiscoverByTransport(const RawAddress& bd_addr, 
extern void BTA_DmSetEncryption(const RawAddress& bd_addr,

                                tBTA_TRANSPORT transport,

                                tBTA_DM_ENCRYPT_CBACK* p_callback,

                                tBTA_DM_BLE_SEC_ACT sec_act);

                                tBTM_BLE_SEC_ACT sec_act);



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

 *