Merge "DO NOT MERGE Add ability to add interop entries dynamically (2/2)" into mnc...

[android-x86/system-bt.git] / bta / hl / bta_hl_ci.c

diff --git a/bta/hl/bta_hl_ci.c b/bta/hl/bta_hl_ci.c
index 524b116..9aaa963 100644 (file)
--- a/bta/hl/bta_hl_ci.c
+++ b/bta/hl/bta_hl_ci.c
@@ -50,20 +50,19 @@ extern void bta_hl_ci_get_tx_data(  tBTA_HL_MDL_HANDLE mdl_handle,
                                     tBTA_HL_STATUS status,
                                     UINT16 evt )
 {
-    tBTA_HL_CI_GET_PUT_DATA  *p_evt;
+    tBTA_HL_CI_GET_PUT_DATA *p_evt =
+        (tBTA_HL_CI_GET_PUT_DATA *)osi_malloc(sizeof(tBTA_HL_CI_GET_PUT_DATA));
 
 #if  (BTA_HL_DEBUG == TRUE)
-    APPL_TRACE_DEBUG("bta_hl_ci_get_tx_data mdl_handle=%d status=%d evt=%d\n",
-                      mdl_handle, status, evt);
+    APPL_TRACE_DEBUG("%s mdl_handle=%d status=%d evt=%d\n", __func__,
+                     mdl_handle, status, evt);
 #endif
 
-    if ((p_evt = (tBTA_HL_CI_GET_PUT_DATA *)osi_getbuf(sizeof(tBTA_HL_CI_GET_PUT_DATA))) != NULL)
-    {
-        p_evt->hdr.event = evt;
-        p_evt->mdl_handle =  mdl_handle;
-        p_evt->status = status;
-        bta_sys_sendmsg(p_evt);
-    }
+    p_evt->hdr.event = evt;
+    p_evt->mdl_handle = mdl_handle;
+    p_evt->status = status;
+
+    bta_sys_sendmsg(p_evt);
 }
 
 /*******************************************************************************
@@ -85,21 +84,20 @@ extern void bta_hl_ci_put_rx_data(  tBTA_HL_MDL_HANDLE mdl_handle,
                                     tBTA_HL_STATUS status,
                                     UINT16 evt )
 {
-    tBTA_HL_CI_GET_PUT_DATA  *p_evt;
+    tBTA_HL_CI_GET_PUT_DATA *p_evt =
+        (tBTA_HL_CI_GET_PUT_DATA *)osi_malloc(sizeof(tBTA_HL_CI_GET_PUT_DATA));
+
 #if  (BTA_HL_DEBUG == TRUE)
-    APPL_TRACE_DEBUG("bta_hl_ci_put_rx_data mdl_handle=%d status=%d evt=%d\n",
-                      mdl_handle, status, evt);
+    APPL_TRACE_DEBUG("%s mdl_handle=%d status=%d evt=%d\n", __func__,
+                     mdl_handle, status, evt);
 #endif
 
-    if ((p_evt = (tBTA_HL_CI_GET_PUT_DATA *)osi_getbuf(sizeof(tBTA_HL_CI_GET_PUT_DATA))) != NULL)
-    {
-        p_evt->hdr.event = evt;
-        p_evt->mdl_handle =  mdl_handle;
-        p_evt->status = status;
-        bta_sys_sendmsg(p_evt);
-    }
-}
+    p_evt->hdr.event = evt;
+    p_evt->mdl_handle =  mdl_handle;
+    p_evt->status = status;
 
+    bta_sys_sendmsg(p_evt);
+}
 
 /*******************************************************************************
 **
@@ -120,20 +118,19 @@ extern void bta_hl_ci_get_echo_data(  tBTA_HL_MCL_HANDLE mcl_handle,
                                       tBTA_HL_STATUS status,
                                       UINT16 evt )
 {
-    tBTA_HL_CI_ECHO_DATA  *p_evt;
+    tBTA_HL_CI_ECHO_DATA *p_evt =
+        (tBTA_HL_CI_ECHO_DATA *)osi_malloc(sizeof(tBTA_HL_CI_ECHO_DATA));
 
 #if  (BTA_HL_DEBUG == TRUE)
-    APPL_TRACE_DEBUG("bta_hl_ci_get_echo_data mcl_handle=%d status=%d evt=%d\n",
-                      mcl_handle, status, evt);
+    APPL_TRACE_DEBUG("%s mcl_handle=%d status=%d evt=%d\n", __func__,
+                     mcl_handle, status, evt);
 #endif
 
-    if ((p_evt = (tBTA_HL_CI_ECHO_DATA *)osi_getbuf(sizeof(tBTA_HL_CI_ECHO_DATA))) != NULL)
-    {
-        p_evt->hdr.event = evt;
-        p_evt->mcl_handle =  mcl_handle;
-        p_evt->status = status;
-        bta_sys_sendmsg(p_evt);
-    }
+    p_evt->hdr.event = evt;
+    p_evt->mcl_handle =  mcl_handle;
+    p_evt->status = status;
+
+    bta_sys_sendmsg(p_evt);
 }
 
 /*******************************************************************************
@@ -155,18 +152,17 @@ extern void bta_hl_ci_put_echo_data(  tBTA_HL_MCL_HANDLE mcl_handle,
                                       tBTA_HL_STATUS status,
                                       UINT16 evt )
 {
-    tBTA_HL_CI_ECHO_DATA  *p_evt;
+    tBTA_HL_CI_ECHO_DATA *p_evt =
+        (tBTA_HL_CI_ECHO_DATA *)osi_malloc(sizeof(tBTA_HL_CI_ECHO_DATA));
 
 #if  (BTA_HL_DEBUG == TRUE)
-    APPL_TRACE_DEBUG("bta_hl_ci_put_echo_data mcl_handle=%d status=%d evt=%d\n",
+    APPL_TRACE_DEBUG("%s mcl_handle=%d status=%d evt=%d\n", __func__,
                       mcl_handle, status, evt);
 #endif
 
-    if ((p_evt = (tBTA_HL_CI_ECHO_DATA *)osi_getbuf(sizeof(tBTA_HL_CI_ECHO_DATA))) != NULL)
-    {
-        p_evt->hdr.event = evt;
-        p_evt->mcl_handle =  mcl_handle;
-        p_evt->status = status;
-        bta_sys_sendmsg(p_evt);
-    }
+    p_evt->hdr.event = evt;
+    p_evt->mcl_handle =  mcl_handle;
+    p_evt->status = status;
+
+    bta_sys_sendmsg(p_evt);
 }