Added reconnect and NV support; bug fixes: service mask setting for HDP during discovery and TX/RX ADPU size for echo test

Change-Id: Ic44fe0a852036c3e973b79f4ef6362a59c76a1c0

   bta/dm/bta_dm_api.c
   btif/co/bta_hl_co.c
   btif/include/btif_hl.h
   btif/include/btif_storage.h
   btif/src/btif_hl.c
   btif/src/btif_storage.c
   stack/sdp/sdp_api.c
   udrv/include/unv.h
   udrv/ulinux/unv_linux.c

1 files changed, 17 insertions, 17 deletions

diff --git a/btif/co/bta_hl_co.c b/btif/co/bta_hl_co.c
index c851807..1cfbc81 100644
--- a/btif/co/bta_hl_co.c
+++ b/btif/co/bta_hl_co.c
@@ -258,35 +258,35 @@ void bta_hl_co_delete_mdl(UINT8 app_id, UINT8 item_idx)
 BOOLEAN bta_hl_co_load_mdl_config (UINT8 app_id, UINT8 buffer_size,
                                    tBTA_HL_MDL_CFG *p_mdl_buf )
 {
-    tBTA_HL_MDL_CFG *p;
-    BOOLEAN success = TRUE;
+    BOOLEAN result = TRUE;
     UINT8 i;
+    tBTA_HL_MDL_CFG *p;
 
-
-    BTIF_TRACE_DEBUG3("%s app_id=%d, buffer_size=%d",
+    BTIF_TRACE_DEBUG3("%s app_id=%d, num_items=%d",
                       __FUNCTION__, app_id, buffer_size);
 
-
     if (buffer_size > BTA_HL_NUM_MDL_CFGS)
     {
-        success= FALSE;
-        return success;
+        result = FALSE;
+        return result;
     }
+    result = btif_hl_load_mdl_config(app_id, buffer_size, p_mdl_buf);
 
-    p = p_mdl_buf;
-
-    for (i=0; i < buffer_size; i++, p++)
+    if (result)
     {
-        memset(p, 0, sizeof(tBTA_HL_MDL_CFG));
-        /* todo load from NV */
+        for (i=0, p=p_mdl_buf; i<buffer_size; i++, p++ )
+        {
+            if (p->active)
+            {
+                BTIF_TRACE_DEBUG6("i=%d mdl_id=0x%x dch_mode=%d local mdep_role=%d mdep_id=%d mtu=%d",
+                                  i, p->mdl_id, p->dch_mode, p->local_mdep_role, p->local_mdep_role, p->mtu);
+            }
+        }
     }
 
+    BTIF_TRACE_DEBUG3("%s success=%d num_items=%d", __FUNCTION__, result, buffer_size);
 
-    BTIF_TRACE_DEBUG3("%s success=%d num_items=%d",
-                      __FUNCTION__, success, buffer_size);
-
-
-    return success;
+    return result;
 }
 
 /*******************************************************************************