Replace BTM_EIR__ => HCI_EIR__
Reduce obfuscation
Bug: 188297862
Tag: #refactor
Test: gd/cert/run
Change-Id: I21a3451df300cbbb944a28d5fe5d8d16c84720dc
diff --git a/system/bta/dm/bta_dm_act.cc b/system/bta/dm/bta_dm_act.cc
index 8137dc6..95ab950 100644
--- a/system/bta/dm/bta_dm_act.cc
+++ b/system/bta/dm/bta_dm_act.cc
@@ -2849,7 +2849,7 @@
else
local_name_len = 0;
- data_type = BTM_EIR_COMPLETE_LOCAL_NAME_TYPE;
+ data_type = HCI_EIR_COMPLETE_LOCAL_NAME_TYPE;
/* if local name is longer than minimum length of shortened name */
/* check whether it needs to be shortened or not */
if (local_name_len > p_bta_dm_eir_cfg->bta_dm_eir_min_name_len) {
@@ -2869,9 +2869,9 @@
local_name, p_bta_dm_eir_cfg->bta_dm_eir_min_name_len);
APPL_TRACE_WARNING("%s local name is shortened (%d)", __func__,
local_name_len);
- data_type = BTM_EIR_SHORTENED_LOCAL_NAME_TYPE;
+ data_type = HCI_EIR_SHORTENED_LOCAL_NAME_TYPE;
} else {
- data_type = BTM_EIR_COMPLETE_LOCAL_NAME_TYPE;
+ data_type = HCI_EIR_COMPLETE_LOCAL_NAME_TYPE;
}
}
@@ -2893,12 +2893,12 @@
if (free_eir_length >= p_bta_dm_eir_cfg->bta_dm_eir_uuid16_len) {
num_uuid = p_bta_dm_eir_cfg->bta_dm_eir_uuid16_len / Uuid::kNumBytes16;
- data_type = BTM_EIR_COMPLETE_16BITS_UUID_TYPE;
+ data_type = HCI_EIR_COMPLETE_16BITS_UUID_TYPE;
} else /* not enough room for all UUIDs */
{
APPL_TRACE_WARNING("BTA EIR: UUID 16-bit list is truncated");
num_uuid = free_eir_length / Uuid::kNumBytes16;
- data_type = BTM_EIR_MORE_16BITS_UUID_TYPE;
+ data_type = HCI_EIR_MORE_16BITS_UUID_TYPE;
}
UINT8_TO_STREAM(p, num_uuid * Uuid::kNumBytes16 + 1);
UINT8_TO_STREAM(p, data_type);
@@ -2919,7 +2919,7 @@
data_type = BTM_GetEirSupportedServices(bta_dm_cb.eir_uuid, &p,
max_num_uuid, &num_uuid);
- if (data_type == BTM_EIR_MORE_16BITS_UUID_TYPE) {
+ if (data_type == HCI_EIR_MORE_16BITS_UUID_TYPE) {
APPL_TRACE_WARNING("BTA EIR: UUID 16-bit list is truncated");
}
#if (BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
@@ -2933,7 +2933,7 @@
UINT16_TO_STREAM(p, curr.As16Bit());
num_uuid++;
} else {
- data_type = BTM_EIR_MORE_16BITS_UUID_TYPE;
+ data_type = HCI_EIR_MORE_16BITS_UUID_TYPE;
APPL_TRACE_WARNING("BTA EIR: UUID 16-bit list is truncated");
break;
}
@@ -2954,7 +2954,7 @@
p_length = p++;
p_type = p++;
num_uuid = 0;
- data_type = BTM_EIR_COMPLETE_32BITS_UUID_TYPE;
+ data_type = HCI_EIR_COMPLETE_32BITS_UUID_TYPE;
max_num_uuid = (free_eir_length - 2) / Uuid::kNumBytes32;
@@ -2966,7 +2966,7 @@
UINT32_TO_STREAM(p, curr.As32Bit());
num_uuid++;
} else {
- data_type = BTM_EIR_MORE_32BITS_UUID_TYPE;
+ data_type = HCI_EIR_MORE_32BITS_UUID_TYPE;
APPL_TRACE_WARNING("BTA EIR: UUID 32-bit list is truncated");
break;
}
@@ -2983,7 +2983,7 @@
p_length = p++;
p_type = p++;
num_uuid = 0;
- data_type = BTM_EIR_COMPLETE_128BITS_UUID_TYPE;
+ data_type = HCI_EIR_COMPLETE_128BITS_UUID_TYPE;
max_num_uuid = (free_eir_length - 2) / Uuid::kNumBytes128;
@@ -2995,7 +2995,7 @@
ARRAY16_TO_STREAM(p, curr.To128BitBE().data());
num_uuid++;
} else {
- data_type = BTM_EIR_MORE_128BITS_UUID_TYPE;
+ data_type = HCI_EIR_MORE_128BITS_UUID_TYPE;
APPL_TRACE_WARNING("BTA EIR: UUID 128-bit list is truncated");
break;
}
@@ -3014,7 +3014,7 @@
(p_bta_dm_eir_cfg->bta_dm_eir_flags) &&
(free_eir_length >= p_bta_dm_eir_cfg->bta_dm_eir_flag_len + 2)) {
UINT8_TO_STREAM(p, p_bta_dm_eir_cfg->bta_dm_eir_flag_len + 1);
- UINT8_TO_STREAM(p, BTM_EIR_FLAGS_TYPE);
+ UINT8_TO_STREAM(p, HCI_EIR_FLAGS_TYPE);
memcpy(p, p_bta_dm_eir_cfg->bta_dm_eir_flags,
p_bta_dm_eir_cfg->bta_dm_eir_flag_len);
p += p_bta_dm_eir_cfg->bta_dm_eir_flag_len;
@@ -3041,7 +3041,7 @@
/* if Inquiry Tx Resp Power compiled */
if ((p_bta_dm_eir_cfg->bta_dm_eir_inq_tx_power) && (free_eir_length >= 3)) {
UINT8_TO_STREAM(p, 2); /* Length field */
- UINT8_TO_STREAM(p, BTM_EIR_TX_POWER_LEVEL_TYPE);
+ UINT8_TO_STREAM(p, HCI_EIR_TX_POWER_LEVEL_TYPE);
UINT8_TO_STREAM(p, *(p_bta_dm_eir_cfg->bta_dm_eir_inq_tx_power));
free_eir_length -= 3;
}
diff --git a/system/btif/src/btif_ble_scanner.cc b/system/btif/src/btif_ble_scanner.cc
index 313d7e1..816739c 100644
--- a/system/btif/src/btif_ble_scanner.cc
+++ b/system/btif/src/btif_ble_scanner.cc
@@ -115,7 +115,7 @@
bt_property_t properties;
const uint8_t* p_eir_remote_name = AdvertiseDataParser::GetFieldByType(
- value, BTM_EIR_COMPLETE_LOCAL_NAME_TYPE, &remote_name_len);
+ value, HCI_EIR_COMPLETE_LOCAL_NAME_TYPE, &remote_name_len);
if (p_eir_remote_name == NULL) {
p_eir_remote_name = AdvertiseDataParser::GetFieldByType(
@@ -178,7 +178,7 @@
p_data->inq_res.p_eir + p_data->inq_res.eir_len);
if (AdvertiseDataParser::GetFieldByType(
- value, BTM_EIR_COMPLETE_LOCAL_NAME_TYPE, &len)) {
+ value, HCI_EIR_COMPLETE_LOCAL_NAME_TYPE, &len)) {
p_data->inq_res.remt_name_not_required = true;
}
}
diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc
index 127ed91..dd9fcdf 100644
--- a/system/btif/src/btif_dm.cc
+++ b/system/btif/src/btif_dm.cc
@@ -315,11 +315,11 @@
if (p_search_data->inq_res.p_eir) {
p_eir_remote_name = AdvertiseDataParser::GetFieldByType(
p_search_data->inq_res.p_eir, p_search_data->inq_res.eir_len,
- BTM_EIR_COMPLETE_LOCAL_NAME_TYPE, &remote_name_len);
+ HCI_EIR_COMPLETE_LOCAL_NAME_TYPE, &remote_name_len);
if (!p_eir_remote_name) {
p_eir_remote_name = AdvertiseDataParser::GetFieldByType(
p_search_data->inq_res.p_eir, p_search_data->inq_res.eir_len,
- BTM_EIR_SHORTENED_LOCAL_NAME_TYPE, &remote_name_len);
+ HCI_EIR_SHORTENED_LOCAL_NAME_TYPE, &remote_name_len);
}
if (p_eir_remote_name) {
diff --git a/system/main/shim/btm_api.h b/system/main/shim/btm_api.h
index bf8bcf3..82dcc5f 100644
--- a/system/main/shim/btm_api.h
+++ b/system/main/shim/btm_api.h
@@ -371,8 +371,8 @@
* max_num_uuid16 - max number of UUID can be written in EIR
* num_uuid16 - number of UUID have been written in EIR
*
- * Returns BTM_EIR_MORE_16BITS_UUID_TYPE, if it has more than max
- * BTM_EIR_COMPLETE_16BITS_UUID_TYPE, otherwise
+ * Returns HCI_EIR_MORE_16BITS_UUID_TYPE, if it has more than max
+ * HCI_EIR_COMPLETE_16BITS_UUID_TYPE, otherwise
*
******************************************************************************/
uint8_t BTM_GetEirSupportedServices(uint32_t* p_eir_uuid, uint8_t** p,
@@ -394,12 +394,12 @@
* max_num_uuid - maximum number of UUID to be returned
*
* Returns 0 - if not found
- * BTM_EIR_COMPLETE_16BITS_UUID_TYPE
- * BTM_EIR_MORE_16BITS_UUID_TYPE
- * BTM_EIR_COMPLETE_32BITS_UUID_TYPE
- * BTM_EIR_MORE_32BITS_UUID_TYPE
- * BTM_EIR_COMPLETE_128BITS_UUID_TYPE
- * BTM_EIR_MORE_128BITS_UUID_TYPE
+ * HCI_EIR_COMPLETE_16BITS_UUID_TYPE
+ * HCI_EIR_MORE_16BITS_UUID_TYPE
+ * HCI_EIR_COMPLETE_32BITS_UUID_TYPE
+ * HCI_EIR_MORE_32BITS_UUID_TYPE
+ * HCI_EIR_COMPLETE_128BITS_UUID_TYPE
+ * HCI_EIR_MORE_128BITS_UUID_TYPE
*
******************************************************************************/
uint8_t BTM_GetEirUuidList(uint8_t* p_eir, size_t eir_len, uint8_t uuid_size,
diff --git a/system/main/shim/le_scanning_manager.cc b/system/main/shim/le_scanning_manager.cc
index 13023bd..f6792e3 100644
--- a/system/main/shim/le_scanning_manager.cc
+++ b/system/main/shim/le_scanning_manager.cc
@@ -428,7 +428,7 @@
uint8_t remote_name_len;
const uint8_t* p_eir_remote_name = AdvertiseDataParser::GetFieldByType(
- advertising_data, BTM_EIR_COMPLETE_LOCAL_NAME_TYPE, &remote_name_len);
+ advertising_data, HCI_EIR_COMPLETE_LOCAL_NAME_TYPE, &remote_name_len);
if (p_eir_remote_name == NULL) {
p_eir_remote_name = AdvertiseDataParser::GetFieldByType(
diff --git a/system/stack/btm/btm_inq.cc b/system/stack/btm/btm_inq.cc
index 8bb416b..9ff56f4 100644
--- a/system/stack/btm/btm_inq.cc
+++ b/system/stack/btm/btm_inq.cc
@@ -1635,8 +1635,8 @@
* max_num_uuid16 - max number of UUID can be written in EIR
* num_uuid16 - number of UUID have been written in EIR
*
- * Returns BTM_EIR_MORE_16BITS_UUID_TYPE, if it has more than max
- * BTM_EIR_COMPLETE_16BITS_UUID_TYPE, otherwise
+ * Returns HCI_EIR_MORE_16BITS_UUID_TYPE, if it has more than max
+ * HCI_EIR_COMPLETE_16BITS_UUID_TYPE, otherwise
*
******************************************************************************/
uint8_t BTM_GetEirSupportedServices(uint32_t* p_eir_uuid, uint8_t** p,
@@ -1655,11 +1655,11 @@
}
/* if max number of UUIDs are stored and found one more */
else {
- return BTM_EIR_MORE_16BITS_UUID_TYPE;
+ return HCI_EIR_MORE_16BITS_UUID_TYPE;
}
}
}
- return BTM_EIR_COMPLETE_16BITS_UUID_TYPE;
+ return HCI_EIR_COMPLETE_16BITS_UUID_TYPE;
}
/*******************************************************************************
@@ -1677,12 +1677,12 @@
* max_num_uuid - maximum number of UUID to be returned
*
* Returns 0 - if not found
- * BTM_EIR_COMPLETE_16BITS_UUID_TYPE
- * BTM_EIR_MORE_16BITS_UUID_TYPE
- * BTM_EIR_COMPLETE_32BITS_UUID_TYPE
- * BTM_EIR_MORE_32BITS_UUID_TYPE
- * BTM_EIR_COMPLETE_128BITS_UUID_TYPE
- * BTM_EIR_MORE_128BITS_UUID_TYPE
+ * HCI_EIR_COMPLETE_16BITS_UUID_TYPE
+ * HCI_EIR_MORE_16BITS_UUID_TYPE
+ * HCI_EIR_COMPLETE_32BITS_UUID_TYPE
+ * HCI_EIR_MORE_32BITS_UUID_TYPE
+ * HCI_EIR_COMPLETE_128BITS_UUID_TYPE
+ * HCI_EIR_MORE_128BITS_UUID_TYPE
*
******************************************************************************/
uint8_t BTM_GetEirUuidList(uint8_t* p_eir, size_t eir_len, uint8_t uuid_size,
@@ -1759,16 +1759,16 @@
switch (uuid_size) {
case Uuid::kNumBytes16:
- complete_type = BTM_EIR_COMPLETE_16BITS_UUID_TYPE;
- more_type = BTM_EIR_MORE_16BITS_UUID_TYPE;
+ complete_type = HCI_EIR_COMPLETE_16BITS_UUID_TYPE;
+ more_type = HCI_EIR_MORE_16BITS_UUID_TYPE;
break;
case Uuid::kNumBytes32:
- complete_type = BTM_EIR_COMPLETE_32BITS_UUID_TYPE;
- more_type = BTM_EIR_MORE_32BITS_UUID_TYPE;
+ complete_type = HCI_EIR_COMPLETE_32BITS_UUID_TYPE;
+ more_type = HCI_EIR_MORE_32BITS_UUID_TYPE;
break;
case Uuid::kNumBytes128:
- complete_type = BTM_EIR_COMPLETE_128BITS_UUID_TYPE;
- more_type = BTM_EIR_MORE_128BITS_UUID_TYPE;
+ complete_type = HCI_EIR_COMPLETE_128BITS_UUID_TYPE;
+ more_type = HCI_EIR_MORE_128BITS_UUID_TYPE;
break;
default:
*p_num_uuid = 0;
@@ -1864,12 +1864,12 @@
uint8_t num_uuid;
uint16_t uuid16;
uint8_t yy;
- uint8_t type = BTM_EIR_MORE_16BITS_UUID_TYPE;
+ uint8_t type = HCI_EIR_MORE_16BITS_UUID_TYPE;
p_uuid_data = btm_eir_get_uuid_list(p_eir, HCI_EXT_INQ_RESPONSE_LEN,
Uuid::kNumBytes16, &num_uuid, &type);
- if (type == BTM_EIR_COMPLETE_16BITS_UUID_TYPE) {
+ if (type == HCI_EIR_COMPLETE_16BITS_UUID_TYPE) {
p_results->eir_complete_list = true;
} else {
p_results->eir_complete_list = false;
diff --git a/system/stack/include/btm_api.h b/system/stack/include/btm_api.h
index eaac9c9..8cf6ac8 100644
--- a/system/stack/include/btm_api.h
+++ b/system/stack/include/btm_api.h
@@ -908,8 +908,8 @@
* max_num_uuid16 - max number of UUID can be written in EIR
* num_uuid16 - number of UUID have been written in EIR
*
- * Returns BTM_EIR_MORE_16BITS_UUID_TYPE, if it has more than max
- * BTM_EIR_COMPLETE_16BITS_UUID_TYPE, otherwise
+ * Returns HCI_EIR_MORE_16BITS_UUID_TYPE, if it has more than max
+ * HCI_EIR_COMPLETE_16BITS_UUID_TYPE, otherwise
*
******************************************************************************/
uint8_t BTM_GetEirSupportedServices(uint32_t* p_eir_uuid, uint8_t** p,
@@ -931,12 +931,12 @@
* max_num_uuid - maximum number of UUID to be returned
*
* Returns 0 - if not found
- * BTM_EIR_COMPLETE_16BITS_UUID_TYPE
- * BTM_EIR_MORE_16BITS_UUID_TYPE
- * BTM_EIR_COMPLETE_32BITS_UUID_TYPE
- * BTM_EIR_MORE_32BITS_UUID_TYPE
- * BTM_EIR_COMPLETE_128BITS_UUID_TYPE
- * BTM_EIR_MORE_128BITS_UUID_TYPE
+ * HCI_EIR_COMPLETE_16BITS_UUID_TYPE
+ * HCI_EIR_MORE_16BITS_UUID_TYPE
+ * HCI_EIR_COMPLETE_32BITS_UUID_TYPE
+ * HCI_EIR_MORE_32BITS_UUID_TYPE
+ * HCI_EIR_COMPLETE_128BITS_UUID_TYPE
+ * HCI_EIR_MORE_128BITS_UUID_TYPE
*
******************************************************************************/
uint8_t BTM_GetEirUuidList(uint8_t* p_eir, size_t eir_len, uint8_t uuid_size,
diff --git a/system/stack/include/btm_api_types.h b/system/stack/include/btm_api_types.h
index 82a1824..257f592 100644
--- a/system/stack/include/btm_api_types.h
+++ b/system/stack/include/btm_api_types.h
@@ -250,27 +250,6 @@
typedef uint8_t tBTM_EIR_SEARCH_RESULT;
-/* 0x01 */
-#define BTM_EIR_FLAGS_TYPE HCI_EIR_FLAGS_TYPE
-/* 0x02 */
-#define BTM_EIR_MORE_16BITS_UUID_TYPE HCI_EIR_MORE_16BITS_UUID_TYPE
-/* 0x03 */
-#define BTM_EIR_COMPLETE_16BITS_UUID_TYPE HCI_EIR_COMPLETE_16BITS_UUID_TYPE
-/* 0x04 */
-#define BTM_EIR_MORE_32BITS_UUID_TYPE HCI_EIR_MORE_32BITS_UUID_TYPE
-/* 0x05 */
-#define BTM_EIR_COMPLETE_32BITS_UUID_TYPE HCI_EIR_COMPLETE_32BITS_UUID_TYPE
-/* 0x06 */
-#define BTM_EIR_MORE_128BITS_UUID_TYPE HCI_EIR_MORE_128BITS_UUID_TYPE
-/* 0x07 */
-#define BTM_EIR_COMPLETE_128BITS_UUID_TYPE HCI_EIR_COMPLETE_128BITS_UUID_TYPE
-/* 0x08 */
-#define BTM_EIR_SHORTENED_LOCAL_NAME_TYPE HCI_EIR_SHORTENED_LOCAL_NAME_TYPE
-/* 0x09 */
-#define BTM_EIR_COMPLETE_LOCAL_NAME_TYPE HCI_EIR_COMPLETE_LOCAL_NAME_TYPE
-/* 0x0A */
-#define BTM_EIR_TX_POWER_LEVEL_TYPE HCI_EIR_TX_POWER_LEVEL_TYPE
-
typedef enum : uint8_t {
BTM_BLE_SEC_NONE = 0,
/* encrypt the link using current key */
