From ee988d1348d82cbe4d5a5bfea5dfbb60e3f230ea Mon Sep 17 00:00:00 2001 From: Chris Manton Date: Fri, 29 Jan 2021 15:59:48 -0800 Subject: [PATCH] Remove useless #def indirection bta/dm/bta_dm_act Towards meaningful code Bug: 163134718 Tag: #refactor Test: gd/cert/run Change-Id: I3cde2343803de17c17425e4fbe1b4474b19f5ea6 --- bta/dm/bta_dm_act.cc | 2 +- stack/include/btm_api_types.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bta/dm/bta_dm_act.cc b/bta/dm/bta_dm_act.cc index ad02be312..0282bc7af 100644 --- a/bta/dm/bta_dm_act.cc +++ b/bta/dm/bta_dm_act.cc @@ -2941,7 +2941,7 @@ static void bta_dm_set_eir(char* local_name) { p_length = p; UINT8_TO_STREAM(p, p_bta_dm_eir_cfg->bta_dm_eir_manufac_spec_len + 1); - UINT8_TO_STREAM(p, BTM_EIR_MANUFACTURER_SPECIFIC_TYPE); + UINT8_TO_STREAM(p, HCI_EIR_MANUFACTURER_SPECIFIC_TYPE); memcpy(p, p_bta_dm_eir_cfg->bta_dm_eir_manufac_spec, p_bta_dm_eir_cfg->bta_dm_eir_manufac_spec_len); p += p_bta_dm_eir_cfg->bta_dm_eir_manufac_spec_len; diff --git a/stack/include/btm_api_types.h b/stack/include/btm_api_types.h index a9ae91c45..12cf5afc8 100644 --- a/stack/include/btm_api_types.h +++ b/stack/include/btm_api_types.h @@ -269,8 +269,6 @@ typedef uint8_t tBTM_EIR_SEARCH_RESULT; #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 -/* 0xFF */ -#define BTM_EIR_MANUFACTURER_SPECIFIC_TYPE HCI_EIR_MANUFACTURER_SPECIFIC_TYPE #define BTM_BLE_SEC_NONE 0 /* encrypt the link using current key */ -- 2.11.0