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

Commit 21cd454a authored by Chris Manton's avatar Chris Manton
Browse files

Untangle HCI_STATUS/BTM_STATUS bta/dm/bta_dm_act 

Toward readable code

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

Change-Id: Ib02cba5dd1a47085bb7842236a66e9c71384eada
parent 854d0609

system/bta/dm/bta_dm_act.cc

+10 −9
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ void BTA_dm_update_policy(tBTA_SYS_CONN_STATUS status, uint8_t id, 
                          uint8_t app_id, const RawAddress& peer_addr);



/* Extended Inquiry Response */

static uint8_t bta_dm_sp_cback(tBTM_SP_EVT event, tBTM_SP_EVT_DATA* p_data);

static tBTM_STATUS bta_dm_sp_cback(tBTM_SP_EVT event, tBTM_SP_EVT_DATA* p_data);



static void bta_dm_set_eir(char* local_name);
@@ -113,7 +113,7 @@ static void bta_dm_cancel_gatt_discovery(const RawAddress& bd_addr); 
static void bta_dm_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data);

extern tBTA_DM_CONTRL_STATE bta_dm_pm_obtain_controller_state(void);

#if (BLE_VND_INCLUDED == TRUE)

static void bta_dm_ctrl_features_rd_cmpl_cback(tBTM_STATUS result);

static void bta_dm_ctrl_features_rd_cmpl_cback(tHCI_STATUS result);

#endif



#ifndef BTA_DM_BLE_ADV_CHNL_MAP
@@ -2108,7 +2108,8 @@ static void bta_dm_authentication_complete_cback( 
 * Returns          void

 *

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

static uint8_t bta_dm_sp_cback(tBTM_SP_EVT event, tBTM_SP_EVT_DATA* p_data) {

static tBTM_STATUS bta_dm_sp_cback(tBTM_SP_EVT event,

                                   tBTM_SP_EVT_DATA* p_data) {

  tBTM_STATUS status = BTM_CMD_STARTED;

  tBTA_DM_SEC sec_event;

  tBTA_DM_SEC_EVT pin_evt = BTA_DM_SP_KEY_NOTIF_EVT;
@@ -3674,8 +3675,8 @@ static void bta_ble_energy_info_cmpl(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,

                                     tBTM_STATUS status) {

  tBTA_STATUS st = (status == BTM_SUCCESS) ? BTA_SUCCESS : BTA_FAILURE;

                                     tHCI_STATUS status) {

  tBTA_STATUS st = (status == HCI_SUCCESS) ? BTA_SUCCESS : BTA_FAILURE;

  tBTA_DM_CONTRL_STATE ctrl_state = 0;



  if (BTA_SUCCESS == st) ctrl_state = bta_dm_pm_obtain_controller_state();
@@ -3690,8 +3691,8 @@ void bta_dm_ble_get_energy_info( 
    tBTA_BLE_ENERGY_INFO_CBACK* p_energy_info_cback) {

  bta_dm_cb.p_energy_info_cback = p_energy_info_cback;

  tBTM_STATUS btm_status = BTM_BleGetEnergyInfo(bta_ble_energy_info_cmpl);

  if (BTM_CMD_STARTED != btm_status)

    bta_ble_energy_info_cmpl(0, 0, 0, 0, btm_status);

  if (btm_status != BTM_CMD_STARTED)

    bta_ble_energy_info_cmpl(0, 0, 0, 0, HCI_ERR_UNSPECIFIED);

}



#ifndef BTA_DM_GATT_CLOSE_DELAY_TOUT
@@ -3902,9 +3903,9 @@ static void bta_dm_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) { 
 * Parameters:

 *

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

static void bta_dm_ctrl_features_rd_cmpl_cback(tBTM_STATUS result) {

static void bta_dm_ctrl_features_rd_cmpl_cback(tHCI_STATUS result) {

  APPL_TRACE_DEBUG("%s  status = %d ", __func__, result);

  if (result == BTM_SUCCESS) {

  if (result == HCI_SUCCESS) {

    if (bta_dm_cb.p_sec_cback)

      bta_dm_cb.p_sec_cback(BTA_DM_LE_FEATURES_READ, NULL);

  } else {

system/stack/btm/btm_ble_cont_energy.cc

+3 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ tBTM_BLE_ENERGY_INFO_CB ble_energy_info_cb; 
static void btm_ble_cont_energy_cmpl_cback(tBTM_VSC_CMPL* p_params) {

  uint8_t* p = p_params->p_param_buf;

  uint16_t len = p_params->param_len;

  uint8_t status = 0;

  uint32_t total_tx_time = 0, total_rx_time = 0, total_idle_time = 0,

           total_energy_used = 0;
@@ -55,7 +54,9 @@ static void btm_ble_cont_energy_cmpl_cback(tBTM_VSC_CMPL* p_params) { 
    return;

  }



  STREAM_TO_UINT8(status, p);

  uint8_t raw_status;

  STREAM_TO_UINT8(raw_status, p);

  tHCI_STATUS status = to_hci_status_code(raw_status);

  STREAM_TO_UINT32(total_tx_time, p);

  STREAM_TO_UINT32(total_rx_time, p);

  STREAM_TO_UINT32(total_idle_time, p);

system/stack/btm/btm_ble_gap.cc

+4 −4
Original line number Diff line number Diff line
@@ -522,8 +522,6 @@ static void btm_get_dynamic_audio_buffer_vsc_cmpl_cback( 
 ******************************************************************************/

static void btm_ble_vendor_capability_vsc_cmpl_cback(

    tBTM_VSC_CMPL* p_vcs_cplt_params) {

  uint8_t status = 0xFF;

  uint8_t* p;



  BTM_TRACE_DEBUG("%s", __func__);
@@ -531,8 +529,10 @@ static void btm_ble_vendor_capability_vsc_cmpl_cback( 
  CHECK(p_vcs_cplt_params->opcode == HCI_BLE_VENDOR_CAP);

  CHECK(p_vcs_cplt_params->param_len > 0);



  p = p_vcs_cplt_params->p_param_buf;

  STREAM_TO_UINT8(status, p);

  const uint8_t* p = p_vcs_cplt_params->p_param_buf;

  uint8_t raw_status;

  STREAM_TO_UINT8(raw_status, p);

  tHCI_STATUS status = to_hci_status_code(raw_status);



  if (status != HCI_SUCCESS) {

    BTM_TRACE_DEBUG("%s: Status = 0x%02x (0 is success)", __func__, status);

system/stack/include/btm_ble_api_types.h

+3 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include "stack/include/btm_api_types.h"

#include "stack/include/btm_status.h"

#include "stack/include/hci_error_code.h"

#include "types/ble_address_with_type.h"



#define CHNL_MAP_LEN 5
@@ -485,13 +486,13 @@ typedef void(tBTM_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,

                                         tBTM_STATUS status);

                                         tHCI_STATUS status);



typedef struct {

  tBTM_BLE_ENERGY_INFO_CBACK* p_ener_cback;

} tBTM_BLE_ENERGY_INFO_CB;



typedef void(tBTM_BLE_CTRL_FEATURES_CBACK)(tBTM_STATUS status);

typedef void(tBTM_BLE_CTRL_FEATURES_CBACK)(tHCI_STATUS status);



/* BLE encryption keys */

typedef struct {