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

Commit 00247892 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "legacy: Replace tBTA_DM_CONTRL_STATE => tBTM_CONTRL_STATE" am: 6d6de6ed 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1870000

Change-Id: I141253383275637e03024de34911e26bfc1ba19a
parents b3d087dc 6d6de6ed

system/bta/dm/bta_dm_act.cc

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static void bta_dm_gattc_register(void); 
static void btm_dm_start_gatt_discovery(const RawAddress& bd_addr);

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

extern tBTM_CONTRL_STATE bta_dm_pm_obtain_controller_state(void);

#if (BLE_VND_INCLUDED == TRUE)

static void bta_dm_ctrl_features_rd_cmpl_cback(tHCI_STATUS result);

#endif
@@ -3830,7 +3830,7 @@ static void bta_ble_energy_info_cmpl(tBTM_BLE_TX_TIME_MS tx_time, 
                                     tBTM_BLE_ENERGY_USED energy_used,

                                     tHCI_STATUS status) {

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

  tBTA_DM_CONTRL_STATE ctrl_state = 0;

  tBTM_CONTRL_STATE ctrl_state = BTM_CONTRL_UNKNOWN;



  if (BTA_SUCCESS == st) ctrl_state = bta_dm_pm_obtain_controller_state();

system/bta/dm/bta_dm_pm.cc

+2 −2
Original line number Diff line number Diff line
@@ -1101,12 +1101,12 @@ static int bta_dm_get_sco_index() { 
 * Parameters:

 *

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

tBTA_DM_CONTRL_STATE bta_dm_pm_obtain_controller_state(void) {

tBTM_CONTRL_STATE bta_dm_pm_obtain_controller_state(void) {

  /*   Did not use counts as it is not sure, how accurate the count values are

   *in

   **  bta_dm_cb.device_list.count > 0 || bta_dm_cb.device_list.le_count > 0 */



  tBTA_DM_CONTRL_STATE cur_state = BTA_DM_CONTRL_UNKNOWN;

  tBTM_CONTRL_STATE cur_state = BTM_CONTRL_UNKNOWN;

  cur_state = BTM_PM_ReadControllerState();



  APPL_TRACE_DEBUG("bta_dm_pm_obtain_controller_state: %d", cur_state);

system/bta/include/bta_api.h

+1 −5
Original line number Diff line number Diff line
@@ -477,15 +477,11 @@ typedef void(tBTA_DM_ENCRYPT_CBACK)(const RawAddress& bd_addr, 
                                    tBT_TRANSPORT transport,

                                    tBTA_STATUS result);



#define BTA_DM_CONTRL_UNKNOWN 0 /* Unknown state */



typedef uint8_t tBTA_DM_CONTRL_STATE;



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,

                                         tBTM_CONTRL_STATE ctrl_state,

                                         tBTA_STATUS status);



/* Maximum service name length */

system/btif/src/btif_dm.cc

+1 −1
Original line number Diff line number Diff line
@@ -1800,7 +1800,7 @@ static void bta_energy_info_cb(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,

                               tBTM_CONTRL_STATE ctrl_state,

                               tBTA_STATUS status) {

  BTIF_TRACE_DEBUG(

      "energy_info_cb-Status:%d,state=%d,tx_t=%ld, rx_t=%ld, "

system/stack/include/btm_api_types.h

+1 −0
Original line number Diff line number Diff line
@@ -924,6 +924,7 @@ typedef struct { 


} tBTM_DELETE_STORED_LINK_KEY_COMPLETE;



#define BTM_CONTRL_UNKNOWN 0

/* ACL link on, SCO link ongoing, sniff mode */

#define BTM_CONTRL_ACTIVE 1

/* Scan state - paging/inquiry/trying to connect*/