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

Commit 34e37678 authored by Chris Manton's avatar Chris Manton
Browse files

Remove unnecessary type definitions tBTA_DM_BLE_ENERGY_USED 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I79598380407b445f4c000aaaed39d3f4d9ea5533
parent 14e5073e

system/bta/include/bta_api.h

+1 −2
Original line number Diff line number Diff line
@@ -739,7 +739,6 @@ typedef tBTM_BLE_SEC_ACT tBTA_DM_BLE_SEC_ACT; 
typedef tBTM_BLE_TX_TIME_MS tBTA_DM_BLE_TX_TIME_MS;

typedef tBTM_BLE_RX_TIME_MS tBTA_DM_BLE_RX_TIME_MS;

typedef tBTM_BLE_IDLE_TIME_MS tBTA_DM_BLE_IDLE_TIME_MS;

typedef tBTM_BLE_ENERGY_USED tBTA_DM_BLE_ENERGY_USED;



#define BTA_DM_CONTRL_UNKNOWN 0 /* Unknown state */

#define BTA_DM_CONTRL_ACTIVE 1  /* ACL link on, SCO link ongoing, sniff mode */
@@ -760,7 +759,7 @@ typedef uint16_t tBTA_DM_BLE_ADV_INFO_TIMESTAMP; 
typedef void(tBTA_BLE_ENERGY_INFO_CBACK)(tBTA_DM_BLE_TX_TIME_MS tx_time,

                                         tBTA_DM_BLE_RX_TIME_MS rx_time,

                                         tBTA_DM_BLE_IDLE_TIME_MS idle_time,

                                         tBTA_DM_BLE_ENERGY_USED energy_used,

                                         tBTM_BLE_ENERGY_USED energy_used,

                                         tBTA_DM_CONTRL_STATE ctrl_state,

                                         tBTA_STATUS status);

system/btif/src/btif_dm.cc

+1 −1
Original line number Diff line number Diff line
@@ -2169,7 +2169,7 @@ static void bte_dm_remote_service_record_evt(tBTA_DM_SEARCH_EVT event, 
static void bta_energy_info_cb(tBTA_DM_BLE_TX_TIME_MS tx_time,

                               tBTA_DM_BLE_RX_TIME_MS rx_time,

                               tBTA_DM_BLE_IDLE_TIME_MS idle_time,

                               tBTA_DM_BLE_ENERGY_USED energy_used,

                               tBTM_BLE_ENERGY_USED energy_used,

                               tBTA_DM_CONTRL_STATE ctrl_state,

                               tBTA_STATUS status) {

  BTIF_TRACE_DEBUG(