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

Commit 7c0ca537 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

legacy: Use proper hci status types tHCI_STATUS am: 72714fbc 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1978167

Change-Id: I0b4cecb0935b484f0f07acec718ce733e83ac021
parents 76fbc2d1 72714fbc

system/main/shim/btm.cc

+2 −2
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ static constexpr bool kPassiveScanning = false; 


using BtmRemoteDeviceName = tBTM_REMOTE_DEV_NAME;



extern void btm_process_cancel_complete(uint8_t status, uint8_t mode);

extern void btm_process_inq_complete(uint8_t status, uint8_t result_type);

extern void btm_process_cancel_complete(tHCI_STATUS status, uint8_t mode);

extern void btm_process_inq_complete(tHCI_STATUS status, uint8_t result_type);

extern void btm_ble_process_adv_addr(RawAddress& raw_address,

                                     tBLE_ADDR_TYPE* address_type);

extern void btm_ble_process_adv_pkt_cont(

system/main/shim/btm_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ extern void btm_clear_all_pending_le_entry(void); 
extern void btm_clr_inq_result_flt(void);

extern void btm_set_eir_uuid(const uint8_t* p_eir, tBTM_INQ_RESULTS* p_results);

extern void btm_sort_inq_result(void);

extern void btm_process_inq_complete(uint8_t status, uint8_t result_type);

extern void btm_process_inq_complete(tHCI_STATUS status, uint8_t result_type);



static bool is_classic_device(tBT_DEVICE_TYPE device_type) {

  return device_type == BT_DEVICE_TYPE_BREDR;

system/stack/btm/btm_inq.cc

+5 −4
Original line number Diff line number Diff line
@@ -545,7 +545,8 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, 
  btm_acl_update_inquiry_status(BTM_INQUIRY_STARTED);



  if (p_inq->inq_active & BTM_SSP_INQUIRY_ACTIVE) {

    btm_process_inq_complete(BTM_NO_RESOURCES, BTM_GENERAL_INQUIRY);

    btm_process_inq_complete(HCI_ERR_MAX_NUM_OF_CONNECTIONS,

                             BTM_GENERAL_INQUIRY);

    return BTM_CMD_STARTED;

  }
@@ -1261,7 +1262,7 @@ void btm_sort_inq_result(void) { 
 * Returns          void

 *

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

void btm_process_inq_complete(uint8_t status, uint8_t mode) {

void btm_process_inq_complete(tHCI_STATUS status, uint8_t mode) {

  tBTM_CMPL_CB* p_inq_cb = btm_cb.btm_inq_vars.p_inq_cmpl_cb;

  tBTM_INQUIRY_VAR_ST* p_inq = &btm_cb.btm_inq_vars;
@@ -1324,7 +1325,7 @@ void btm_process_inq_complete(uint8_t status, uint8_t mode) { 
 * Returns          void

 *

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

void btm_process_cancel_complete(uint8_t status, uint8_t mode) {

void btm_process_cancel_complete(tHCI_STATUS status, uint8_t mode) {

  btm_acl_update_inquiry_status(BTM_INQUIRY_CANCELLED);

  btm_process_inq_complete(status, mode);

}
@@ -1401,7 +1402,7 @@ tBTM_STATUS btm_initiate_rem_name(const RawAddress& remote_bda, uint8_t origin, 
 *

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

void btm_process_remote_name(const RawAddress* bda, const BD_NAME bdn,

                             uint16_t evt_len, uint8_t hci_status) {

                             uint16_t evt_len, tHCI_STATUS hci_status) {

  tBTM_REMOTE_DEV_NAME rem_name;

  tBTM_INQUIRY_VAR_ST* p_inq = &btm_cb.btm_inq_vars;

  tBTM_CMPL_CB* p_cb = p_inq->p_remname_cmpl_cb;

system/stack/btu/btu_hcif.cc

+8 −7
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ static void btu_hcif_inquiry_comp_evt(uint8_t* p) { 
  STREAM_TO_UINT8(status, p);



  /* Tell inquiry processing that we are done */

  btm_process_inq_complete(status, BTM_BR_INQUIRY_MASK);

  btm_process_inq_complete(to_hci_status_code(status), BTM_BR_INQUIRY_MASK);

}



/*******************************************************************************
@@ -784,10 +784,9 @@ static void btu_hcif_rmt_name_request_comp_evt(const uint8_t* p, 


  evt_len -= (1 + BD_ADDR_LEN);



  btm_process_remote_name(&bd_addr, p, evt_len, status);

  btm_process_remote_name(&bd_addr, p, evt_len, to_hci_status_code(status));



  btm_sec_rmt_name_request_complete(&bd_addr, p,

                                    static_cast<tHCI_STATUS>(status));

  btm_sec_rmt_name_request_complete(&bd_addr, p, to_hci_status_code(status));

}



constexpr uint8_t MIN_KEY_SIZE = 7;
@@ -1091,7 +1090,8 @@ static void btu_hcif_hdl_command_status(uint16_t opcode, uint8_t status, 
    case HCI_INQUIRY:

      if (status != HCI_SUCCESS) {

        // Tell inquiry processing that we are done

        btm_process_inq_complete(status, BTM_BR_INQUIRY_MASK);

        btm_process_inq_complete(to_hci_status_code(status),

                                 BTM_BR_INQUIRY_MASK);

      }

      break;

    case HCI_SWITCH_ROLE:
@@ -1128,9 +1128,10 @@ static void btu_hcif_hdl_command_status(uint16_t opcode, uint8_t status, 
    case HCI_RMT_NAME_REQUEST:

      if (status != HCI_SUCCESS) {

        // Tell inquiry processing that we are done

        btm_process_remote_name(nullptr, nullptr, 0, status);

        btm_process_remote_name(nullptr, nullptr, 0,

                                to_hci_status_code(status));

        btm_sec_rmt_name_request_complete(nullptr, nullptr,

                                          static_cast<tHCI_STATUS>(status));

                                          to_hci_status_code(status));

      }

      break;

    case HCI_READ_RMT_EXT_FEATURES:

system/stack/include/inq_hci_link_interface.h

+3 −3
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ 
#include "types/raw_address.h"



extern void btm_process_remote_name(const RawAddress* bda, const BD_NAME name,

                                    uint16_t evt_len, uint8_t hci_status);

                                    uint16_t evt_len, tHCI_STATUS hci_status);



extern void btm_process_inq_results(const uint8_t* p, uint8_t hci_evt_len,

                                    uint8_t inq_res_mode);



extern void btm_process_inq_complete(uint8_t status, uint8_t mode);

extern void btm_process_cancel_complete(uint8_t status, uint8_t mode);

extern void btm_process_inq_complete(tHCI_STATUS status, uint8_t mode);

extern void btm_process_cancel_complete(tHCI_STATUS status, uint8_t mode);



extern void btm_acl_process_sca_cmpl_pkt(uint8_t len, uint8_t* data);

extern tINQ_DB_ENT* btm_inq_db_new(const RawAddress& p_bda);