commit 4c94c5f9fc2c3102c52706fd5bb4cd8d065e5716
author Prerepa Viswanadham <dham@google.com> Fri Jul 18 15:20:54 2014 -0700
committer Prerepa Viswanadham <dham@google.com> Sat Jul 19 00:10:08 2014 +0000
tree 8e2485e417cd602612fd0846cf04fcf231d4e376
parent 1ef4ba488d259f6523b6e650fb80820d3a363302

Fix build: Revert the reversion done due to build failure.
original commit id: 347a1d64c7a9c345793c61b03bdcaa31ad8e5678
revert commit id: 571c81ed119833b5e5cbd6bedffd7409a10be21d

Fix builds: Revert "Added code to publish ble adv tx power in dBm""

This reverts commit 571c81ed119833b5e5cbd6bedffd7409a10be21d.

Change-Id: I2afeeaa4b52aa449e54115fd5f816a7a949d2ea8

main/bte_main.c

diff --git a/main/bte_main.c b/main/bte_main.c
index 2b604a8..0719ebe 100755
--- a/main/bte_main.c
+++ b/main/bte_main.c
@@ -46,6 +46,10 @@
 #ifndef BTE_STACK_CONF_FILE
 #define BTE_STACK_CONF_FILE "/etc/bluetooth/bt_stack.conf"
 #endif
+/* Run-time configuration file for BLE*/
+#ifndef BTE_BLE_STACK_CONF_FILE
+#define BTE_BLE_STACK_CONF_FILE "/etc/bluetooth/ble_stack.conf"
+#endif
 
 /* if not specified in .txt file then use this as default  */
 #ifndef HCI_LOGGING_FILENAME
@@ -107,6 +111,7 @@
 BT_API void BTE_UnloadStack(void);
 extern void scru_flip_bda (BD_ADDR dst, const BD_ADDR src);
 extern void bte_load_conf(const char *p_path);
+extern void bte_load_ble_conf(const char *p_path);
 extern bt_bdaddr_t btif_local_bd_addr;
 
 
@@ -158,6 +163,9 @@
     bte_main_in_hw_init();
 
     bte_load_conf(BTE_STACK_CONF_FILE);
+#if (defined(BLE_INCLUDED) && (BLE_INCLUDED == TRUE))
+    bte_load_ble_conf(BTE_BLE_STACK_CONF_FILE);
+#endif
 
 #if (BTTRC_INCLUDED == TRUE)
     /* Initialize trace feature */