Remove always true definition BTM_EIR_SERVER_INCLUDED

5 files changed, 20 insertions, 46 deletions

diff --git a/bta/dm/bta_dm_act.c b/bta/dm/bta_dm_act.c
index 665ddb1f1..80e728f6d 100644
--- a/bta/dm/bta_dm_act.c
+++ b/bta/dm/bta_dm_act.c
@@ -64,9 +64,7 @@ static void bta_dm_policy_cback(tBTA_SYS_CONN_STATUS status, UINT8 id, UINT8 app
 /* Extended Inquiry Response */
 static UINT8 bta_dm_sp_cback (tBTM_SP_EVT event, tBTM_SP_EVT_DATA *p_data);
 
-#if (BTM_EIR_SERVER_INCLUDED == TRUE)
 static void bta_dm_set_eir (char *local_name);
-#endif /* BTM_EIR_SERVER_INCLUDED */
 
 static void bta_dm_eir_search_services( tBTM_INQ_RESULTS  *p_result,
                                         tBTA_SERVICE_MASK *p_services_to_search,
@@ -527,9 +525,7 @@ void bta_dm_set_dev_name (tBTA_DM_MSG *p_data)
 {
 
     BTM_SetLocalDeviceName((char*)p_data->set_name.name);
-#if (BTM_EIR_SERVER_INCLUDED == TRUE)
     bta_dm_set_eir ((char*)p_data->set_name.name);
-#endif
 }
 
 /*******************************************************************************
@@ -4003,7 +3999,6 @@ static void bta_dm_bond_cancel_complete_cback(tBTM_STATUS result)
     }
 }
 
-#if ( BTM_EIR_SERVER_INCLUDED == TRUE )
     #if ( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
 /*******************************************************************************
 **
@@ -4071,7 +4066,7 @@ void bta_dm_update_eir_uuid (tBTA_DM_MSG *p_data)
 
     bta_dm_set_eir (NULL);
 }
-    #endif
+    #endif  // BTA_EIR_CANNED_UUID_LIST
 
 /*******************************************************************************
 **
@@ -4116,13 +4111,13 @@ static void bta_dm_set_eir (char *local_name)
     UINT8    max_num_uuid;
 #if (BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
     UINT8    custom_uuid_idx;
-#endif
-#endif
+#endif  // BTA_EIR_SERVER_NUM_CUSTOM_UUID
+#endif  // BTA_EIR_CANNED_UUID_LIST
 #if (BTM_EIR_DEFAULT_FEC_REQUIRED == FALSE)
     UINT8    free_eir_length = HCI_EXT_INQ_RESPONSE_LEN;
-#else
+#else  // BTM_EIR_DEFAULT_FEC_REQUIRED
     UINT8    free_eir_length = HCI_DM5_PACKET_SIZE;
-#endif
+#endif  // BTM_EIR_DEFAULT_FEC_REQUIRED 
     UINT8    num_uuid;
     UINT8    data_type;
     UINT8    local_name_len;
@@ -4144,7 +4139,7 @@ static void bta_dm_set_eir (char *local_name)
             APPL_TRACE_ERROR("Fail to read local device name for EIR");
         }
     }
-#endif
+#endif  // BTA_EIR_CANNED_UUID_LIST
 
     /* Allocate a buffer to hold HCI command */
     if ((p_buf = (BT_HDR *)GKI_getpoolbuf(BTM_CMD_POOL_ID)) == NULL)
@@ -4171,12 +4166,12 @@ static void bta_dm_set_eir (char *local_name)
         /* get number of UUID 16-bit list */
 #if (BTA_EIR_CANNED_UUID_LIST == TRUE)
         num_uuid = p_bta_dm_eir_cfg->bta_dm_eir_uuid16_len/LEN_UUID_16;
-#else
+#else  // BTA_EIR_CANNED_UUID_LIST
         max_num_uuid = (free_eir_length - 2)/LEN_UUID_16;
         data_type = BTM_GetEirSupportedServices( bta_dm_cb.eir_uuid, &p,
                                                  max_num_uuid, &num_uuid );
         p = (UINT8 *)p_buf + BTM_HCI_EIR_OFFSET; /* reset p */
-#endif
+#endif  // BTA_EIR_CANNED_UUID_LIST
 
         /* if UUID doesn't fit remaing space, shorten local name */
         if ( local_name_len > (free_eir_length - 4 - num_uuid*LEN_UUID_16))
@@ -4387,7 +4382,6 @@ static void bta_dm_set_eir (char *local_name)
     BTM_WriteEIR( p_buf );
 
 }
-#endif
 
 /*******************************************************************************
 **
@@ -4463,7 +4457,7 @@ static void bta_dm_eir_search_services( tBTM_INQ_RESULTS  *p_result,
                         *p_services_to_search, *p_services_found);
 }
 
-#if ( BTM_EIR_SERVER_INCLUDED == TRUE )&&(BTA_EIR_CANNED_UUID_LIST != TRUE)
+#if (BTA_EIR_CANNED_UUID_LIST != TRUE)
 /*******************************************************************************
 **
 ** Function         bta_dm_eir_update_uuid
diff --git a/bta/dm/bta_dm_api.c b/bta/dm/bta_dm_api.c
index da33a3879..0a4b67626 100644
--- a/bta/dm/bta_dm_api.c
+++ b/bta/dm/bta_dm_api.c
@@ -908,7 +908,7 @@ void BTA_DmWriteInqTxPower(INT8 tx_power)
 *******************************************************************************/
 void BTA_DmEirAddUUID (tBT_UUID *p_uuid)
 {
-#if ( BTM_EIR_SERVER_INCLUDED == TRUE )&&( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
+#if ( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
     tBTA_DM_API_UPDATE_EIR_UUID    *p_msg;
 
     if ((p_msg = (tBTA_DM_API_UPDATE_EIR_UUID *) GKI_getbuf(sizeof(tBTA_DM_API_UPDATE_EIR_UUID))) != NULL)
@@ -935,7 +935,7 @@ void BTA_DmEirAddUUID (tBT_UUID *p_uuid)
 *******************************************************************************/
 void BTA_DmEirRemoveUUID (tBT_UUID *p_uuid)
 {
-#if ( BTM_EIR_SERVER_INCLUDED == TRUE )&&( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
+#if ( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
     tBTA_DM_API_UPDATE_EIR_UUID    *p_msg;
 
     if ((p_msg = (tBTA_DM_API_UPDATE_EIR_UUID *) GKI_getbuf(sizeof(tBTA_DM_API_UPDATE_EIR_UUID))) != NULL)
@@ -964,7 +964,6 @@ void BTA_DmEirRemoveUUID (tBT_UUID *p_uuid)
 *******************************************************************************/
 void BTA_DmSetEIRConfig (tBTA_DM_EIR_CONF *p_eir_cfg)
 {
-#if (BTM_EIR_SERVER_INCLUDED == TRUE)
     tBTA_DM_API_SET_EIR_CONFIG  *p_msg;
 
     if ((p_msg = (tBTA_DM_API_SET_EIR_CONFIG *) GKI_getbuf(sizeof(tBTA_DM_API_SET_EIR_CONFIG))) != NULL)
@@ -974,7 +973,6 @@ void BTA_DmSetEIRConfig (tBTA_DM_EIR_CONF *p_eir_cfg)
 
         bta_sys_sendmsg(p_msg);
     }
-#endif
 }
 
 /*******************************************************************************
diff --git a/bta/dm/bta_dm_cfg.c b/bta/dm/bta_dm_cfg.c
index 62ce9c6e2..02f29e6cd 100644
--- a/bta/dm/bta_dm_cfg.c
+++ b/bta/dm/bta_dm_cfg.c
@@ -511,7 +511,6 @@ tBTM_PM_PWR_MD *p_bta_dm_pm_md = (tBTM_PM_PWR_MD *)&bta_dm_pm_md;
 ** 184 to 240 bytes, DH5 is used but it not recommended.
 */
 
-#if ( BTM_EIR_SERVER_INCLUDED == TRUE )
 #if (BTA_EIR_CANNED_UUID_LIST == TRUE)
                                             /* for example */
 const UINT8 bta_dm_eir_uuid16_list[] = {    0x08, 0x11, /* Headset */
@@ -519,7 +518,7 @@ const UINT8 bta_dm_eir_uuid16_list[] = {    0x08, 0x11, /* Headset */
                                             0x0E, 0x11, /* AV Remote Control */
                                             0x0B, 0x11, /* Audio Sink */
 };
-#endif
+#endif  // BTA_EIR_CANNED_UUID_LIST
 
 /* Extended Inquiry Response */
 const tBTA_DM_EIR_CONF bta_dm_eir_cfg =
@@ -530,13 +529,13 @@ const tBTA_DM_EIR_CONF bta_dm_eir_cfg =
 #if (BTA_EIR_CANNED_UUID_LIST == TRUE)
     8,
     (UINT8 *)bta_dm_eir_uuid16_list,
-#else
+#else // BTA_EIR_CANNED_UUID_LIST
     {   /* mask of UUID list in EIR */
         0xFFFFFFFF, /* LSB is the first UUID of the first 32 UUIDs in BTM_EIR_UUID_LKUP_TBL */
         0xFFFFFFFF  /* LSB is the first UUID of the next 32 UUIDs in BTM_EIR_UUID_LKUP_TBL */
         /* BTM_EIR_UUID_LKUP_TBL can be overrided */
     },
-#endif
+#endif  // BTA_EIR_CANNED_UUID_LIST
     NULL,   /* Inquiry TX power         */
     0,      /* length of flags in bytes */
     NULL,   /* flags for EIR */
@@ -546,4 +545,3 @@ const tBTA_DM_EIR_CONF bta_dm_eir_cfg =
     NULL    /* additional data */
 };
 tBTA_DM_EIR_CONF *p_bta_dm_eir_cfg = (tBTA_DM_EIR_CONF*)&bta_dm_eir_cfg;
-#endif
diff --git a/bta/dm/bta_dm_int.h b/bta/dm/bta_dm_int.h
index e54dcff03..1b779a5f3 100644
--- a/bta/dm/bta_dm_int.h
+++ b/bta/dm/bta_dm_int.h
@@ -125,12 +125,10 @@ enum
     BTA_DM_API_BLE_ENERGY_INFO_EVT,
 #endif
 
-#if ( BTM_EIR_SERVER_INCLUDED == TRUE )&&( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
+#if ( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
     BTA_DM_API_UPDATE_EIR_UUID_EVT,
 #endif
-#if (BTM_EIR_SERVER_INCLUDED == TRUE)
     BTA_DM_API_SET_EIR_CONFIG_EVT,
-#endif
 
     BTA_DM_API_ENABLE_TEST_MODE_EVT,
     BTA_DM_API_DISABLE_TEST_MODE_EVT,
@@ -654,7 +652,7 @@ typedef struct
     BOOLEAN                 enable_or_disable;
 }tBTA_DM_API_SET_AFH_CHANNEL_ASSESSMENT;
 
-#if ( BTM_EIR_SERVER_INCLUDED == TRUE )&&( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
+#if ( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
 /* data type for BTA_DM_API_UPDATE_EIR_UUID_EVT */
 typedef struct
 {
@@ -664,14 +662,12 @@ typedef struct
 }tBTA_DM_API_UPDATE_EIR_UUID;
 #endif
 
-#if (BTM_EIR_SERVER_INCLUDED == TRUE)
 /* data type for BTA_DM_API_SET_EIR_CONFIG_EVT */
 typedef struct
 {
     BT_HDR              hdr;
     tBTA_DM_EIR_CONF    *p_eir_cfg;
 }tBTA_DM_API_SET_EIR_CONFIG;
-#endif
 
 /* data type for BTA_DM_API_REMOVE_ACL_EVT */
 typedef struct
@@ -820,12 +816,10 @@ typedef union
 
     tBTA_DM_API_SET_AFH_CHANNEL_ASSESSMENT set_afh_channel_assessment;
 
-#if ( BTM_EIR_SERVER_INCLUDED == TRUE )&&( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
+#if ( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
     tBTA_DM_API_UPDATE_EIR_UUID     update_eir_uuid;
 #endif
-#if (BTM_EIR_SERVER_INCLUDED == TRUE)
     tBTA_DM_API_SET_EIR_CONFIG          set_eir_cfg;
-#endif
     tBTA_DM_API_REMOVE_ACL              remove_acl;
 
 } tBTA_DM_MSG;
@@ -955,7 +949,7 @@ typedef struct
     tBTA_DM_SEC_EVT             pin_evt;
     UINT32          num_val;        /* the numeric value for comparison. If just_works, do not show this number to UI */
     BOOLEAN         just_works;     /* TRUE, if "Just Works" association model */
-#if ( BTM_EIR_SERVER_INCLUDED == TRUE )&&( BTA_EIR_CANNED_UUID_LIST != TRUE )
+#if ( BTA_EIR_CANNED_UUID_LIST != TRUE )
     /* store UUID list for EIR */
     TIMER_LIST_ENT              app_ready_timer;
     UINT32                      eir_uuid[BTM_EIR_SERVICE_ARRAY_SIZE];
@@ -1113,11 +1107,9 @@ extern tBTM_PM_PWR_MD *p_bta_dm_pm_md;
 extern tBTA_DM_SSR_SPEC *p_bta_dm_ssr_spec;
 #endif
 
-#if ( BTM_EIR_SERVER_INCLUDED == TRUE )
 /* update dynamic BRCM Aware EIR data */
 extern const tBTA_DM_EIR_CONF bta_dm_eir_cfg;
 extern tBTA_DM_EIR_CONF *p_bta_dm_eir_cfg;
-#endif
 
 /* DM control block */
 #if BTA_DYNAMIC_MEMORY == FALSE
@@ -1244,18 +1236,12 @@ extern void bta_dm_ble_config_local_privacy (tBTA_DM_MSG *p_data);
 
 extern void bta_dm_pm_active(BD_ADDR peer_addr);
 
-#if ( BTM_EIR_SERVER_INCLUDED == TRUE )
 void bta_dm_eir_update_uuid(UINT16 uuid16, BOOLEAN adding);
-#else
-#define bta_dm_eir_update_uuid(x, y)
-#endif
 
-#if ( BTM_EIR_SERVER_INCLUDED == TRUE )&&( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
+#if ( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
 extern void bta_dm_update_eir_uuid (tBTA_DM_MSG *p_data);
 #endif
-#if (BTM_EIR_SERVER_INCLUDED == TRUE)
 extern void bta_dm_set_eir_config (tBTA_DM_MSG *p_data);
-#endif
 extern void bta_dm_enable_test_mode(tBTA_DM_MSG *p_data);
 extern void bta_dm_disable_test_mode(tBTA_DM_MSG *p_data);
 extern void bta_dm_execute_callback(tBTA_DM_MSG *p_data);
diff --git a/bta/dm/bta_dm_main.c b/bta/dm/bta_dm_main.c
index 35835c7c7..53a5c132c 100644
--- a/bta/dm/bta_dm_main.c
+++ b/bta/dm/bta_dm_main.c
@@ -121,12 +121,10 @@ const tBTA_DM_ACTION bta_dm_action[] =
     bta_dm_ble_get_energy_info,    /* BTA_DM_API_BLE_ENERGY_INFO_EVT */
 #endif
 
-#if ( BTM_EIR_SERVER_INCLUDED == TRUE )&&( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
+#if ( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
     bta_dm_update_eir_uuid,     /*  BTA_DM_API_UPDATE_EIR_UUID_EVT      */
 #endif
-#if (BTM_EIR_SERVER_INCLUDED == TRUE)
     bta_dm_set_eir_config,      /*  BTA_DM_API_SET_EIR_CONFIG_EVT       */
-#endif
 
     bta_dm_enable_test_mode,    /*  BTA_DM_API_ENABLE_TEST_MODE_EVT     */
     bta_dm_disable_test_mode,   /*  BTA_DM_API_DISABLE_TEST_MODE_EVT    */