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

Commit 00418c27 authored by Chris Manton's avatar Chris Manton
Browse files

Proper types tBTM_STATUS 

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

Change-Id: I079f97be62228a31cd8df3eef869efe2b6c79ea7
parent dcc1283a

system/main/shim/btm_api.cc

+3 −2
Original line number Diff line number Diff line
@@ -1351,8 +1351,9 @@ bool bluetooth::shim::BTM_SecDeleteRmtNameNotifyCallback( 
  return true;

}



void bluetooth::shim::BTM_PINCodeReply(const RawAddress& bd_addr, uint8_t res,

                                       uint8_t pin_len, uint8_t* p_pin) {

void bluetooth::shim::BTM_PINCodeReply(const RawAddress& bd_addr,

                                       tBTM_STATUS res, uint8_t pin_len,

                                       uint8_t* p_pin) {

  ASSERT_LOG(!bluetooth::shim::is_gd_shim_enabled(), "Unreachable code path");

}

system/main/shim/btm_api.h

+2 −2
Original line number Diff line number Diff line
@@ -1536,8 +1536,8 @@ tBTM_LINK_KEY_TYPE BTM_SecGetDeviceLinkKeyType(const RawAddress& bd_addr); 
 * Returns          void

 *

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

void BTM_PINCodeReply(const RawAddress& bd_addr, uint8_t res, uint8_t pin_len,

                      uint8_t* p_pin);

void BTM_PINCodeReply(const RawAddress& bd_addr, tBTM_STATUS res,

                      uint8_t pin_len, uint8_t* p_pin);



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

 *

system/stack/btm/btm_sec.cc

+2 −2
Original line number Diff line number Diff line
@@ -612,8 +612,8 @@ uint8_t BTM_SecClrServiceByPsm(uint16_t psm) { 
 *                  p_pin        - pointer to array with the PIN Code

 *

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

void BTM_PINCodeReply(const RawAddress& bd_addr, uint8_t res, uint8_t pin_len,

                      uint8_t* p_pin) {

void BTM_PINCodeReply(const RawAddress& bd_addr, tBTM_STATUS res,

                      uint8_t pin_len, uint8_t* p_pin) {

  tBTM_SEC_DEV_REC* p_dev_rec;



  BTM_TRACE_API(

system/stack/btm/btm_sec.h

+2 −2
Original line number Diff line number Diff line
@@ -194,8 +194,8 @@ uint8_t BTM_SecClrServiceByPsm(uint16_t psm); 
 *                  p_pin        - pointer to array with the PIN Code

 *

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

void BTM_PINCodeReply(const RawAddress& bd_addr, uint8_t res, uint8_t pin_len,

                      uint8_t* p_pin);

void BTM_PINCodeReply(const RawAddress& bd_addr, tBTM_STATUS res,

                      uint8_t pin_len, uint8_t* p_pin);



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

 *

system/stack/btm/security_device_record.h

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ struct tBTM_SEC_DEV_REC { 
                               BD_NAME bd_name, uint8_t* features,

                               LinkKey* p_link_key, uint8_t key_type,

                               uint8_t pin_length);

  friend void BTM_PINCodeReply(const RawAddress& bd_addr, uint8_t res,

  friend void BTM_PINCodeReply(const RawAddress& bd_addr, tBTM_STATUS res,

                               uint8_t pin_len, uint8_t* p_pin);

  friend void btm_sec_auth_complete(uint16_t handle, tHCI_STATUS status);

  friend void btm_sec_connected(const RawAddress& bda, uint16_t handle,