2 files changed, 56 insertions, 3 deletions
diff --git a/lib/bt/host/bluedroid/main/bte_init.c b/lib/bt/host/bluedroid/main/bte_init.c
index 80c4357b..c60f6f7b 100644
--- a/lib/bt/host/bluedroid/main/bte_init.c
+++ b/lib/bt/host/bluedroid/main/bte_init.c
@@ -27,8 +27,8 @@
 #include <string.h>
 
 
-/* Stack Configuation Related Init Definaton
- * TODO: Now Just Unmask these defination until stack layer is OK
+/* Stack Configuration Related Init Definaton
+ * TODO: Now Just Unmask these definition until stack layer is OK
  */
 
 #ifndef BTA_INCLUDED
@@ -91,6 +91,15 @@
 #endif
 #endif
 
+#if (defined(OBEX_INCLUDED) && OBEX_INCLUDED == TRUE)
+#include "stack/obex_api.h"
+#endif
+
+#if (defined(GOEPC_INCLUDED) && GOEPC_INCLUDED == TRUE)
+#include "stack/goep_common.h"
+#include "stack/goepc_api.h"
+#endif
+
 //BTA Modules
 #if BTA_INCLUDED == TRUE && BTA_DYNAMIC_MEMORY == TRUE
 #include "bta/bta_api.h"
@@ -147,6 +156,10 @@
 #include "bta_pan_int.h"
 #endif
 
+#if BTA_PBA_CLIENT_INCLUDED == TRUE
+#include "bta_pba_client_int.h"
+#endif
+
 #include "bta_sys_int.h"
 
 // control block for patch ram downloading
@@ -175,6 +188,12 @@ void BTE_DeinitStack(void)
 {
     //BTA Modules
 #if (BTA_INCLUDED == TRUE && BTA_DYNAMIC_MEMORY == TRUE)
+#if BTA_PBA_CLIENT_INCLUDED == TRUE
+    if (bta_pba_client_cb_ptr) {
+        osi_free(bta_pba_client_cb_ptr);
+        bta_pba_client_cb_ptr = NULL;
+    }
+#endif
 #if GATTS_INCLUDED == TRUE
     if (bta_gatts_cb_ptr){
         osi_free(bta_gatts_cb_ptr);
@@ -267,6 +286,14 @@ void BTE_DeinitStack(void)
     }
 #endif // BTA_INCLUDED == TRUE
 
+#if (defined(GOEPC_INCLUDED) && GOEPC_INCLUDED == TRUE)
+    GOEPC_Deinit();
+#endif
+
+#if (defined(OBEX_INCLUDED) && OBEX_INCLUDED == TRUE)
+    OBEX_Deinit();
+#endif
+
 #if (defined(HID_DEV_INCLUDED) && HID_DEV_INCLUDED == TRUE)
     HID_DevDeinit();
 #endif
@@ -388,6 +415,18 @@ bt_status_t BTE_InitStack(void)
     MCA_Init();
 #endif
 
+#if (defined(OBEX_INCLUDED) && OBEX_INCLUDED == TRUE)
+    if (OBEX_Init() != OBEX_SUCCESS) {
+        goto error_exit;
+    }
+#endif
+
+#if (defined(GOEPC_INCLUDED) && GOEPC_INCLUDED == TRUE)
+    if (GOEPC_Init() != GOEP_SUCCESS) {
+        goto error_exit;
+    }
+#endif
+
     //BTA Modules
 #if (BTA_INCLUDED == TRUE && BTA_DYNAMIC_MEMORY == TRUE)
     if ((bta_sys_cb_ptr = (tBTA_SYS_CB *)osi_malloc(sizeof(tBTA_SYS_CB))) == NULL) {
@@ -492,6 +531,12 @@ bt_status_t BTE_InitStack(void)
 #if BTA_PAN_INCLUDED==TRUE
     memset((void *)bta_pan_cb_ptr, 0, sizeof(tBTA_PAN_CB));
 #endif
+#if BTA_PBA_CLIENT_INCLUDED == TRUE
+    if ((bta_pba_client_cb_ptr = (tBTA_PBA_CLIENT_CB *)osi_malloc(sizeof(tBTA_PBA_CLIENT_CB))) == NULL) {
+        goto error_exit;
+    }
+    memset((void *)bta_pba_client_cb_ptr, 0, sizeof(tBTA_PBA_CLIENT_CB));
+#endif
 
 #endif // BTA_INCLUDED == TRUE
     return BT_STATUS_SUCCESS;
diff --git a/lib/bt/host/bluedroid/main/bte_main.c b/lib/bt/host/bluedroid/main/bte_main.c
index c47bdc15..c974037e 100644
--- a/lib/bt/host/bluedroid/main/bte_main.c
+++ b/lib/bt/host/bluedroid/main/bte_main.c
@@ -64,6 +64,9 @@ static void bte_main_enable(void);
 bluedroid_init_done_cb_t bluedroid_init_done_cb;
 
 extern void osi_mem_dbg_init(void);
+#if (BT_BLE_DYNAMIC_ENV_MEMORY == TRUE)
+extern void free_controller_param(void);
+#endif
 /******************************************************************************
 **
 ** Function         bte_main_boot_entry
@@ -85,7 +88,7 @@ int bte_main_boot_entry(bluedroid_init_done_cb_t cb)
 
     osi_init();
 
-    //Enbale HCI
+    //Enable HCI
     bte_main_enable();
 
     return 0;
@@ -105,6 +108,11 @@ void bte_main_shutdown(void)
 #if (BLE_INCLUDED == TRUE)
     BTA_VendorCleanup();
 #endif
+
+#if (BT_BLE_DYNAMIC_ENV_MEMORY == TRUE)
+    free_controller_param();
+#endif
+
     bte_main_disable();
 
     osi_deinit();