fix btc_dm.c/h and replace the functions which are originally in btif_core.c and...

diff --git a/components/bt/bluedroid/btc/core/btc_dm.c b/components/bt/bluedroid/btc/core/btc_dm.c
index 13a0424c357ce7dc2f69e0932d2096bd168e4c7d..2bfebe1eebe8752cb794cd8ca90f444bc4db4db0 100644 (file)
--- a/components/bt/bluedroid/btc/core/btc_dm.c
+++ b/components/bt/bluedroid/btc/core/btc_dm.c
@@ -1,13 +1,35 @@
 #include <stdlib.h>
 #include <string.h>
+#include "btc_common.h"
 #include "btc_dm.h"
 #include "btc_main.h"
 #include "bt_trace.h"
 #include "bt_target.h"
 #include "btif_storage.h" // TODO: replace with "btc"
+#include "bta_api.h"
 
-extern void btif_dm_auth_cmpl_evt (tBTA_DM_AUTH_CMPL *p_auth_cmpl); // todo: replace with "btc_xx"
 
+/******************************************************************************
+**  Constants & Macros
+******************************************************************************/
+#define BTA_SERVICE_ID_TO_SERVICE_MASK(id)       (1 << (id))
+
+/******************************************************************************
+**  Static variables
+******************************************************************************/
+static tBTA_SERVICE_MASK btc_enabled_services = 0;
+/******************************************************************************
+**  Static functions
+******************************************************************************/
+/******************************************************************************
+**  Externs
+******************************************************************************/
+extern bt_status_t btif_av_execute_service(BOOLEAN b_enable);
+extern bt_status_t btif_av_sink_execute_service(BOOLEAN b_enable);
+
+/******************************************************************************
+**  Functions
+******************************************************************************/
 static void btc_dm_sec_arg_deep_free(btc_msg_t *msg)
 {
     btc_dm_sec_args_t *arg = (btc_dm_sec_args_t *)(msg->arg);
@@ -36,7 +58,6 @@ void btc_dm_sec_arg_deep_copy(btc_msg_t *msg, void *dst, void *src)
     }
 }
 
-
 /*******************************************************************************
 **
 ** Function         btc_dm_evt
@@ -74,6 +95,144 @@ static void btc_disable_bluetooth_evt(void)
     future_ready(*btc_main_get_future_p(BTC_MAIN_DISABLE_FUTURE), FUTURE_SUCCESS);
 }
 
+static void btc_dm_auth_cmpl_evt (tBTA_DM_AUTH_CMPL *p_auth_cmpl)
+{
+    /* Save link key, if not temporary */
+    bt_bdaddr_t bd_addr;
+    bt_status_t status;
+    LOG_DEBUG("%s: bond state success %d, present %d, type%d\n", __func__, p_auth_cmpl->success,
+               p_auth_cmpl->key_present, p_auth_cmpl->key_type);
+
+    bdcpy(bd_addr.address, p_auth_cmpl->bd_addr);
+    if ( (p_auth_cmpl->success == TRUE) && (p_auth_cmpl->key_present) )
+    {
+       #if 0
+        if ((p_auth_cmpl->key_type < HCI_LKEY_TYPE_DEBUG_COMB) ||
+            (p_auth_cmpl->key_type == HCI_LKEY_TYPE_AUTH_COMB) ||
+            (p_auth_cmpl->key_type == HCI_LKEY_TYPE_CHANGED_COMB) ||
+            (p_auth_cmpl->key_type == HCI_LKEY_TYPE_AUTH_COMB_P_256)
+            )
+        #endif
+       if (1)
+        {
+            bt_status_t ret;
+            LOG_DEBUG("%s: Storing link key. key_type=0x%x",
+                            __FUNCTION__, p_auth_cmpl->key_type);
+            ret = btif_storage_add_bonded_device(&bd_addr,
+                                p_auth_cmpl->key, p_auth_cmpl->key_type,
+                                16);
+            BTC_ASSERTC(ret == BT_STATUS_SUCCESS, "storing link key failed", ret);
+        }
+        else
+        {
+            LOG_DEBUG("%s: Temporary key. Not storing. key_type=0x%x",
+                __FUNCTION__, p_auth_cmpl->key_type);
+        }
+    }
+
+    // Skip SDP for certain  HID Devices
+    if (p_auth_cmpl->success)
+    {
+    }
+    else
+    {
+        // Map the HCI fail reason  to  bt status
+        switch(p_auth_cmpl->fail_reason)
+        {
+            case HCI_ERR_PAGE_TIMEOUT:
+               LOG_WARN("%s() - Pairing timeout; retrying () ...", __FUNCTION__);
+               return;
+                /* Fall-through */
+            case HCI_ERR_CONNECTION_TOUT:
+                status =  BT_STATUS_RMT_DEV_DOWN;
+                break;
+
+            case HCI_ERR_PAIRING_NOT_ALLOWED:
+                status = BT_STATUS_AUTH_REJECTED;
+                break;
+
+            case HCI_ERR_LMP_RESPONSE_TIMEOUT:
+                status =  BT_STATUS_AUTH_FAILURE;
+                break;
+
+            /* map the auth failure codes, so we can retry pairing if necessary */
+            case HCI_ERR_AUTH_FAILURE:
+            case HCI_ERR_KEY_MISSING:
+                btif_storage_remove_bonded_device(&bd_addr);
+            case HCI_ERR_HOST_REJECT_SECURITY:
+            case HCI_ERR_ENCRY_MODE_NOT_ACCEPTABLE:
+            case HCI_ERR_UNIT_KEY_USED:
+            case HCI_ERR_PAIRING_WITH_UNIT_KEY_NOT_SUPPORTED:
+            case HCI_ERR_INSUFFCIENT_SECURITY:
+            case HCI_ERR_PEER_USER:
+            case HCI_ERR_UNSPECIFIED:
+                LOG_DEBUG(" %s() Authentication fail reason %d",
+                    __FUNCTION__, p_auth_cmpl->fail_reason);
+                    /* if autopair attempts are more than 1, or not attempted */
+                    status =  BT_STATUS_AUTH_FAILURE;
+                break;
+            default:
+                status =  BT_STATUS_FAIL;
+        }
+    }
+    (void) status;
+}
+
+tBTA_SERVICE_MASK btc_get_enabled_services_mask(void)
+{
+    return btc_enabled_services;
+}
+
+static bt_status_t btc_in_execute_service_request(tBTA_SERVICE_ID service_id,
+        BOOLEAN b_enable)
+{
+    LOG_DEBUG("%s service_id: %d\n", __FUNCTION__, service_id);
+    /* Check the service_ID and invoke the profile's BT state changed API */
+    switch (service_id) {
+    case BTA_A2DP_SOURCE_SERVICE_ID:
+        btif_av_execute_service(b_enable);
+        break;
+    case BTA_A2DP_SINK_SERVICE_ID:
+        btif_av_sink_execute_service(b_enable);
+        break;
+    default:
+        LOG_ERROR("%s: Unknown service being enabled\n", __FUNCTION__);
+        return BT_STATUS_FAIL;
+    }
+    return BT_STATUS_SUCCESS;
+}
+
+void btc_dm_execute_service_request(BOOLEAN enable, char *p_param)
+{
+    btc_in_execute_service_request(*((tBTA_SERVICE_ID *)p_param), enable);
+}
+
+bt_status_t btc_dm_enable_service(tBTA_SERVICE_ID service_id)
+{
+    tBTA_SERVICE_ID *p_id = &service_id;
+
+    btc_enabled_services |= (1 << service_id);
+
+    LOG_DEBUG("%s: current services:0x%x", __FUNCTION__, btc_enabled_services);
+
+    btc_dm_execute_service_request(TRUE, (char *)p_id);
+
+    return BT_STATUS_SUCCESS;
+}
+
+bt_status_t btc_dm_disable_service(tBTA_SERVICE_ID service_id)
+{
+    tBTA_SERVICE_ID *p_id = &service_id;
+
+    btc_enabled_services &= (tBTA_SERVICE_MASK)(~(1 << service_id));
+
+    LOG_DEBUG("%s: Current Services:0x%x", __FUNCTION__, btc_enabled_services);
+
+    btc_dm_execute_service_request(FALSE, (char *)p_id);
+
+    return BT_STATUS_SUCCESS;
+}
+
 void btc_dm_sec_cb_handler(btc_msg_t *msg)
 {
     btc_dm_sec_args_t *arg = (btc_dm_sec_args_t *)(msg->arg);
@@ -116,7 +275,7 @@ void btc_dm_sec_cb_handler(btc_msg_t *msg)
     case BTA_DM_PIN_REQ_EVT:
        break;
     case BTA_DM_AUTH_CMPL_EVT:
-       btif_dm_auth_cmpl_evt(&p_data->auth_cmpl);
+       btc_dm_auth_cmpl_evt(&p_data->auth_cmpl);
        break;
     case BTA_DM_BOND_CANCEL_CMPL_EVT:
     case BTA_DM_SP_CFM_REQ_EVT:

diff --git a/components/bt/bluedroid/btc/include/btc_common.h b/components/bt/bluedroid/btc/include/btc_common.h
new file mode 100644 (file)
index 0000000..82f3006
--- /dev/null
+++ b/components/bt/bluedroid/btc/include/btc_common.h
@@ -0,0 +1,24 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+#ifndef __BTC_COMMON_H__
+#define __BTC_COMMON_H__
+
+#include "bt_trace.h"
+
+#define BTC_ASSERTC(cond, msg, val) if (!(cond)) { LOG_ERROR( \
+    "### ASSERT : %s line %d %s (%d) ###", __FILE__, __LINE__, msg, val);}
+
+#endif /* __BTC_COMMON_H__ */

diff --git a/components/bt/bluedroid/btc/include/btc_dm.h b/components/bt/bluedroid/btc/include/btc_dm.h
index 28dcd08b50fb07187c82a8c953f55295efb1bc2d..839dae60567267a5b618e8c2ed19b9f4db4fb8e2 100644 (file)
--- a/components/bt/bluedroid/btc/include/btc_dm.h
+++ b/components/bt/bluedroid/btc/include/btc_dm.h
@@ -34,4 +34,7 @@ void btc_dm_sec_evt(tBTA_DM_SEC_EVT event, tBTA_DM_SEC *data);
 void btc_dm_sec_cb_handler(btc_msg_t *msg);
 void btc_dm_sec_arg_deep_copy(btc_msg_t *msg, void *dst, void *src);
 
+bt_status_t btc_dm_enable_service(tBTA_SERVICE_ID service_id); // todo: replace bt_status_t
+bt_status_t btc_dm_disable_service(tBTA_SERVICE_ID service_id);
+
 #endif /* __BTC_DM_H__ */