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

Commit 99b3fbce authored by Chris Manton's avatar Chris Manton
Browse files

Remove unnecessary type definitions tBTA_IO_CAP 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working

Change-Id: I3a3f6326ba77265bfb384002f7d9456021f1d893
parent 26fd57f5

system/bta/dm/bta_dm_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -922,7 +922,7 @@ 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,

void bta_dm_ci_io_req_act(const RawAddress& bd_addr, tBTM_IO_CAP io_cap,

                          tBTA_OOB_DATA oob_data, tBTA_AUTH_REQ auth_req) {

  BTM_IoCapRsp(bd_addr, io_cap, oob_data,

               auth_req ? BTM_AUTH_AP_YES : BTM_AUTH_AP_NO);

system/bta/dm/bta_dm_api.cc

+1 −1
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>();

system/bta/dm/bta_dm_ci.cc

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
 * Returns          void

 *

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

void bta_dm_ci_io_req(const RawAddress& bd_addr, tBTA_IO_CAP io_cap,

void bta_dm_ci_io_req(const RawAddress& bd_addr, tBTM_IO_CAP io_cap,

                      tBTA_OOB_DATA oob_data, tBTA_AUTH_REQ auth_req)



{

system/bta/dm/bta_dm_int.h

+5 −5
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ typedef struct { 
typedef struct {

  BT_HDR hdr;

  RawAddress bd_addr;

  tBTA_IO_CAP io_cap;

  tBTM_IO_CAP io_cap;

  tBTA_OOB_DATA oob_data;

  tBTA_AUTH_REQ auth_req;

} tBTA_DM_CI_IO_REQ;
@@ -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,8 +314,8 @@ 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 */

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

  tBTM_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;

  uint32_t num_val; /* the numeric value for comparison. If just_works, do not
@@ -517,7 +517,7 @@ 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);

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,

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

                                 tBTA_OOB_DATA oob_data,

                                 tBTA_AUTH_REQ auth_req);

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

system/bta/include/bta_api.h

+2 −3
Original line number Diff line number Diff line
@@ -510,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 \
@@ -576,7 +575,7 @@ typedef struct { 
  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 */

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

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

} tBTA_DM_SP_CFM_REQ;
@@ -1214,7 +1213,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);



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