Convert HID and Device Manager BTA code to C++

These are the only places that use BTA GATTC API. After this change it's
possible to change GATT API to use C++ types as arguments.

Bug: 28485365
Change-Id: Idf83396f4bc3a2cc8a9b41f69da5d033af1be678

diff --git a/bta/Android.mk b/bta/Android.mk
index 5282a64..982598a 100644 (file)
--- a/bta/Android.mk
+++ b/bta/Android.mk
@@ -6,13 +6,13 @@ include $(CLEAR_VARS)
 LOCAL_CPP_EXTENSION := .cc
 
 LOCAL_SRC_FILES:= \
-    ./dm/bta_dm_ci.c \
-    ./dm/bta_dm_act.c \
-    ./dm/bta_dm_pm.c \
-    ./dm/bta_dm_main.c \
-    ./dm/bta_dm_cfg.c \
-    ./dm/bta_dm_api.c \
-    ./dm/bta_dm_sco.c \
+    ./dm/bta_dm_ci.cc \
+    ./dm/bta_dm_act.cc \
+    ./dm/bta_dm_pm.cc \
+    ./dm/bta_dm_main.cc \
+    ./dm/bta_dm_cfg.cc \
+    ./dm/bta_dm_api.cc \
+    ./dm/bta_dm_sco.cc \
     ./gatt/bta_gattc_api.cc \
     ./gatt/bta_gatts_act.cc \
     ./gatt/bta_gatts_main.cc \
@@ -40,12 +40,12 @@ LOCAL_SRC_FILES:= \
     ./hf_client/bta_hf_client_sdp.c \
     ./hf_client/bta_hf_client_sco.c \
     ./hf_client/bta_hf_client_cmd.c \
-    ./hh/bta_hh_cfg.c \
-    ./hh/bta_hh_act.c \
-    ./hh/bta_hh_api.c \
-    ./hh/bta_hh_le.c \
-    ./hh/bta_hh_utils.c \
-    ./hh/bta_hh_main.c \
+    ./hh/bta_hh_cfg.cc \
+    ./hh/bta_hh_act.cc \
+    ./hh/bta_hh_api.cc \
+    ./hh/bta_hh_le.cc \
+    ./hh/bta_hh_utils.cc \
+    ./hh/bta_hh_main.cc \
     ./pan/bta_pan_main.c \
     ./pan/bta_pan_ci.c \
     ./pan/bta_pan_act.c \

diff --git a/bta/BUILD.gn b/bta/BUILD.gn
index 4351a5e..6eba724 100644 (file)
--- a/bta/BUILD.gn
+++ b/bta/BUILD.gn
@@ -35,13 +35,13 @@ static_library("bta") {
     "av/bta_av_main.c",
     "av/bta_av_sbc.c",
     "av/bta_av_ssm.c",
-    "dm/bta_dm_act.c",
-    "dm/bta_dm_api.c",
-    "dm/bta_dm_cfg.c",
-    "dm/bta_dm_ci.c",
-    "dm/bta_dm_main.c",
-    "dm/bta_dm_pm.c",
-    "dm/bta_dm_sco.c",
+    "dm/bta_dm_act.cc",
+    "dm/bta_dm_api.cc",
+    "dm/bta_dm_cfg.cc",
+    "dm/bta_dm_ci.cc",
+    "dm/bta_dm_main.cc",
+    "dm/bta_dm_pm.cc",
+    "dm/bta_dm_sco.cc",
     "gatt/bta_gattc_act.cc",
     "gatt/bta_gattc_api.cc",
     "gatt/bta_gattc_cache.cc",
@@ -59,12 +59,12 @@ static_library("bta") {
     "hf_client/bta_hf_client_rfc.c",
     "hf_client/bta_hf_client_sdp.c",
     "hf_client/bta_hf_client_sco.c",
-    "hh/bta_hh_act.c",
-    "hh/bta_hh_api.c",
-    "hh/bta_hh_cfg.c",
-    "hh/bta_hh_le.c",
-    "hh/bta_hh_main.c",
-    "hh/bta_hh_utils.c",
+    "hh/bta_hh_act.cc",
+    "hh/bta_hh_api.cc",
+    "hh/bta_hh_cfg.cc",
+    "hh/bta_hh_le.cc",
+    "hh/bta_hh_main.cc",
+    "hh/bta_hh_utils.cc",
     "hl/bta_hl_act.c",
     "hl/bta_hl_api.c",
     "hl/bta_hl_ci.c",

diff --git a/bta/ag/bta_ag_act.c b/bta/ag/bta_ag_act.c
index 3d52cef..f53ff72 100644 (file)
--- a/bta/ag/bta_ag_act.c
+++ b/bta/ag/bta_ag_act.c
@@ -30,9 +30,10 @@
 #include "port_api.h"
 #include "utl.h"
 #include <string.h>
-#include "bta_dm_int.h"
 #include "l2c_api.h"
 
+extern void bta_dm_pm_active(BD_ADDR peer_addr);
+
 /*****************************************************************************
 **  Constants
 *****************************************************************************/

diff --git a/bta/dm/bta_dm_act.c b/bta/dm/bta_dm_act.cc
similarity index 99%
rename from bta/dm/bta_dm_act.c
rename to bta/dm/bta_dm_act.cc
index 2fa9d01..58d427f 100644 (file)
--- a/bta/dm/bta_dm_act.c
+++ b/bta/dm/bta_dm_act.cc
@@ -135,7 +135,7 @@ static void bta_dm_remove_sec_dev_entry(BD_ADDR remote_bd_addr);
 static void bta_dm_observe_results_cb(tBTM_INQ_RESULTS *p_inq, UINT8 *p_eir);
 static void bta_dm_observe_cmpl_cb(void * p_result);
 static void bta_dm_delay_role_switch_cback(void *data);
-extern void sdpu_uuid16_to_uuid128(UINT16 uuid16, UINT8* p_uuid128);
+extern "C" void sdpu_uuid16_to_uuid128(UINT16 uuid16, UINT8* p_uuid128);
 static void bta_dm_disable_timer_cback(void *data);
 
 
@@ -1762,7 +1762,7 @@ void bta_dm_sdp_result (tBTA_DM_MSG *p_data)
                                  bta_dm_search_cb.p_sdp_db->raw_data);
 
                 p_msg->disc_result.result.disc_res.p_raw_data =
-                    osi_malloc(bta_dm_search_cb.p_sdp_db->raw_used);
+                    (uint8_t *) osi_malloc(bta_dm_search_cb.p_sdp_db->raw_used);
                 memcpy(p_msg->disc_result.result.disc_res.p_raw_data,
                        bta_dm_search_cb.p_sdp_db->raw_data,
                        bta_dm_search_cb.p_sdp_db->raw_used);
@@ -5440,7 +5440,7 @@ static void bta_dm_gatt_disc_complete(UINT16 conn_id, tBTA_GATT_STATUS status)
         p_msg->disc_result.result.disc_res.device_type |= BT_DEVICE_TYPE_BLE;
         if (bta_dm_search_cb.ble_raw_used > 0) {
             p_msg->disc_result.result.disc_res.p_raw_data =
-                osi_malloc(bta_dm_search_cb.ble_raw_used);
+                (uint8_t*) osi_malloc(bta_dm_search_cb.ble_raw_used);
 
             memcpy(p_msg->disc_result.result.disc_res.p_raw_data,
                    bta_dm_search_cb.p_ble_rawdata,

diff --git a/bta/dm/bta_dm_api.c b/bta/dm/bta_dm_api.cc
similarity index 99%
rename from bta/dm/bta_dm_api.c
rename to bta/dm/bta_dm_api.cc
index 1be030c..9b9dc5d 100644 (file)
--- a/bta/dm/bta_dm_api.c
+++ b/bta/dm/bta_dm_api.cc
@@ -924,7 +924,7 @@ void BTA_DmSetBleAdvParams (UINT16 adv_int_min, UINT16 adv_int_max,
 void BTA_DmBleSetAdvConfig (tBTA_BLE_AD_MASK data_mask, tBTA_BLE_ADV_DATA *p_adv_cfg,
                             tBTA_SET_ADV_DATA_CMPL_CBACK *p_adv_data_cback)
 {
-  tBTA_DM_API_SET_ADV_CONFIG *p_msg = osi_calloc(sizeof(*p_msg));
+  tBTA_DM_API_SET_ADV_CONFIG *p_msg = (tBTA_DM_API_SET_ADV_CONFIG*) osi_calloc(sizeof(*p_msg));
 
   p_msg->hdr.event = BTA_DM_API_BLE_SET_ADV_CONFIG_EVT;
   p_msg->data_mask = data_mask;
@@ -948,7 +948,7 @@ void BTA_DmBleSetAdvConfig (tBTA_BLE_AD_MASK data_mask, tBTA_BLE_ADV_DATA *p_adv
 extern void BTA_DmBleSetScanRsp (tBTA_BLE_AD_MASK data_mask, tBTA_BLE_ADV_DATA *p_adv_cfg,
                                  tBTA_SET_ADV_DATA_CMPL_CBACK *p_adv_data_cback)
 {
-  tBTA_DM_API_SET_ADV_CONFIG *p_msg = osi_calloc(sizeof(*p_msg));
+  tBTA_DM_API_SET_ADV_CONFIG *p_msg = (tBTA_DM_API_SET_ADV_CONFIG*) osi_calloc(sizeof(*p_msg));
 
   p_msg->hdr.event = BTA_DM_API_BLE_SET_SCAN_RSP_EVT;
   p_msg->data_mask = data_mask;
@@ -1398,9 +1398,9 @@ void BTA_BleEnableAdvInstance (tBTA_BLE_ADV_PARAMS *p_params,
     APPL_TRACE_API("%s", __func__);
 
     p_msg->hdr.event = BTA_DM_API_BLE_MULTI_ADV_ENB_EVT;
-    p_msg->p_cback = (void *)p_cback;
+    p_msg->p_cback = (tBTA_BLE_MULTI_ADV_CBACK *)p_cback;
     if (p_params != NULL) {
-        p_msg->p_params = (void *)(p_msg + 1);
+        p_msg->p_params = (tBTA_BLE_ADV_PARAMS *)(p_msg + 1);
         memcpy(p_msg->p_params, p_params, sizeof(tBTA_BLE_ADV_PARAMS));
     }
     p_msg->p_ref = p_ref;
@@ -1432,7 +1432,7 @@ void BTA_BleUpdateAdvInstParam (UINT8 inst_id, tBTA_BLE_ADV_PARAMS *p_params)
 
     p_msg->hdr.event = BTA_DM_API_BLE_MULTI_ADV_PARAM_UPD_EVT;
     p_msg->inst_id = inst_id;
-    p_msg->p_params = (void *)(p_msg + 1);
+    p_msg->p_params = (tBTA_BLE_ADV_PARAMS *)(p_msg + 1);
     memcpy(p_msg->p_params, p_params, sizeof(tBTA_BLE_ADV_PARAMS));
 
     bta_sys_sendmsg(p_msg);
@@ -1459,7 +1459,8 @@ void BTA_BleCfgAdvInstData (UINT8 inst_id, BOOLEAN is_scan_rsp,
                             tBTA_BLE_AD_MASK data_mask,
                             tBTA_BLE_ADV_DATA *p_data)
 {
-  tBTA_DM_API_BLE_MULTI_ADV_DATA *p_msg = osi_calloc(sizeof(*p_msg));
+  tBTA_DM_API_BLE_MULTI_ADV_DATA *p_msg =
+    (tBTA_DM_API_BLE_MULTI_ADV_DATA*) osi_calloc(sizeof(*p_msg));
 
   p_msg->hdr.event = BTA_DM_API_BLE_MULTI_ADV_DATA_EVT;
   p_msg->inst_id = inst_id;

diff --git a/bta/dm/bta_dm_cfg.c b/bta/dm/bta_dm_cfg.cc
similarity index 100%
rename from bta/dm/bta_dm_cfg.c
rename to bta/dm/bta_dm_cfg.cc

diff --git a/bta/dm/bta_dm_ci.c b/bta/dm/bta_dm_ci.cc
similarity index 100%
rename from bta/dm/bta_dm_ci.c
rename to bta/dm/bta_dm_ci.cc

diff --git a/bta/dm/bta_dm_int.h b/bta/dm/bta_dm_int.h
index 758ec6e..dfac16a 100644 (file)
--- a/bta/dm/bta_dm_int.h
+++ b/bta/dm/bta_dm_int.h
@@ -1034,6 +1034,8 @@ typedef struct
    UINT8 lmp_version;
 }tBTA_DM_LMP_VER_INFO;
 
+extern const UINT16 bta_service_id_to_uuid_lkup_tbl [];
+
 extern tBTA_DM_PM_CFG *p_bta_dm_pm_cfg;
 extern tBTA_DM_PM_SPEC *p_bta_dm_pm_spec;
 extern tBTM_PM_PWR_MD *p_bta_dm_pm_md;
@@ -1165,7 +1167,7 @@ extern void bta_dm_search_cancel_transac_cmpl(tBTA_DM_MSG *p_data);
 extern void bta_dm_disc_rmt_name (tBTA_DM_MSG *p_data);
 extern tBTA_DM_PEER_DEVICE * bta_dm_find_peer_device(const BD_ADDR peer_addr);
 
-extern void bta_dm_pm_active(BD_ADDR peer_addr);
+extern "C" void bta_dm_pm_active(BD_ADDR peer_addr);
 
 void bta_dm_eir_update_uuid(UINT16 uuid16, BOOLEAN adding);
 

diff --git a/bta/dm/bta_dm_main.c b/bta/dm/bta_dm_main.cc
similarity index 100%
rename from bta/dm/bta_dm_main.c
rename to bta/dm/bta_dm_main.cc

diff --git a/bta/dm/bta_dm_pm.c b/bta/dm/bta_dm_pm.cc
similarity index 100%
rename from bta/dm/bta_dm_pm.c
rename to bta/dm/bta_dm_pm.cc

diff --git a/bta/dm/bta_dm_sco.c b/bta/dm/bta_dm_sco.cc
similarity index 100%
rename from bta/dm/bta_dm_sco.c
rename to bta/dm/bta_dm_sco.cc

diff --git a/bta/hf_client/bta_hf_client_act.c b/bta/hf_client/bta_hf_client_act.c
index fe6a283..b70940d 100644 (file)
--- a/bta/hf_client/bta_hf_client_act.c
+++ b/bta/hf_client/bta_hf_client_act.c
@@ -26,7 +26,6 @@
 #include "bta_api.h"
 #include "bta_hf_client_api.h"
 #include "bta_hf_client_int.h"
-#include "bta_dm_int.h"
 #include "l2c_api.h"
 #include "port_api.h"
 #include "bta_sys.h"
@@ -35,6 +34,8 @@
 #include "osi/include/compat.h"
 #include <string.h>
 
+extern void bta_dm_pm_active(BD_ADDR peer_addr);
+
 /*****************************************************************************
 **  Constants
 *****************************************************************************/

diff --git a/bta/hh/bta_hh_act.c b/bta/hh/bta_hh_act.cc
similarity index 99%
rename from bta/hh/bta_hh_act.c
rename to bta/hh/bta_hh_act.cc
index e26915a..41c1e50 100644 (file)
--- a/bta/hh/bta_hh_act.c
+++ b/bta/hh/bta_hh_act.cc
@@ -48,8 +48,8 @@ static void bta_hh_cback (UINT8 dev_handle, BD_ADDR addr, UINT8 event,
 static tBTA_HH_STATUS bta_hh_get_trans_status(UINT32 result);
 
 #if BTA_HH_DEBUG
-static char* bta_hh_get_w4_event(UINT16 event);
-static char * bta_hh_hid_event_name(UINT16 event);
+static const char* bta_hh_get_w4_event(UINT16 event);
+static const char * bta_hh_hid_event_name(UINT16 event);
 #endif
 
 /*****************************************************************************
@@ -1283,7 +1283,7 @@ static tBTA_HH_STATUS bta_hh_get_trans_status(UINT32 result)
 *****************************************************************************/
 
 #if (defined BTA_HH_DEBUG && BTA_HH_DEBUG == TRUE)
-static char* bta_hh_get_w4_event(UINT16 event)
+static const char* bta_hh_get_w4_event(UINT16 event)
 {
     switch (event)
     {
@@ -1307,7 +1307,7 @@ static char* bta_hh_get_w4_event(UINT16 event)
 
 }
 
-static char * bta_hh_hid_event_name(UINT16 event)
+static const char * bta_hh_hid_event_name(UINT16 event)
 {
     switch (event)
     {

diff --git a/bta/hh/bta_hh_api.c b/bta/hh/bta_hh_api.cc
similarity index 100%
rename from bta/hh/bta_hh_api.c
rename to bta/hh/bta_hh_api.cc

diff --git a/bta/hh/bta_hh_cfg.c b/bta/hh/bta_hh_cfg.cc
similarity index 100%
rename from bta/hh/bta_hh_cfg.c
rename to bta/hh/bta_hh_cfg.cc

diff --git a/bta/hh/bta_hh_le.c b/bta/hh/bta_hh_le.cc
similarity index 98%
rename from bta/hh/bta_hh_le.c
rename to bta/hh/bta_hh_le.cc
index b2d9c51..673c52c 100644 (file)
--- a/bta/hh/bta_hh_le.c
+++ b/bta/hh/bta_hh_le.cc
@@ -86,7 +86,7 @@ static list_t *gatt_op_queue = NULL; // list of gatt_operation
 static list_t *gatt_op_queue_executing = NULL; // list of UINT16 connection ids that currently execute
 
 static void mark_as_executing(UINT16 conn_id) {
-    UINT16 *executing_conn_id = osi_malloc(sizeof(UINT16));
+    UINT16 *executing_conn_id = (UINT16*) osi_malloc(sizeof(UINT16));
     *executing_conn_id = conn_id;
     if (!gatt_op_queue_executing)
         gatt_op_queue_executing = list_new(osi_free);
@@ -95,8 +95,8 @@ static void mark_as_executing(UINT16 conn_id) {
 }
 
 static bool rm_exec_conn_id(void *data, void *context) {
-    UINT16 *conn_id = context;
-    UINT16 *conn_id2 = data;
+    UINT16 *conn_id = (UINT16*) context;
+    UINT16 *conn_id2 = (UINT16*) data;
     if (*conn_id == *conn_id2)
         list_remove(gatt_op_queue_executing, data);
 
@@ -109,8 +109,8 @@ static void mark_as_not_executing(UINT16 conn_id) {
 }
 
 static bool exec_list_contains(void *data, void *context) {
-    UINT16 *conn_id = context;
-    UINT16 *conn_id2 = data;
+    UINT16 *conn_id = (UINT16*) context;
+    UINT16 *conn_id2 = (UINT16*) data;
     if (*conn_id == *conn_id2)
         return FALSE;
 
@@ -118,8 +118,8 @@ static bool exec_list_contains(void *data, void *context) {
 }
 
 static bool rm_op_by_conn_id(void *data, void *context) {
-    UINT16 *conn_id = context;
-    gatt_operation *op = data;
+    UINT16 *conn_id = (UINT16*) context;
+    gatt_operation *op = (gatt_operation*) data;
     if(op->conn_id == *conn_id)
         list_remove(gatt_op_queue, data);
 
@@ -134,8 +134,8 @@ static void gatt_op_queue_clean(UINT16 conn_id) {
 }
 
 static bool find_op_by_conn_id(void *data, void *context) {
-    UINT16 *conn_id = context;
-    gatt_operation *op = data;
+    UINT16 *conn_id = (UINT16*) context;
+    gatt_operation *op = (gatt_operation*) data;
     if(op->conn_id == *conn_id)
         return FALSE;
 
@@ -154,7 +154,7 @@ static void gatt_execute_next_op(UINT16 conn_id) {
         APPL_TRACE_DEBUG("%s: no more operations queued for conn_id %d", __func__, conn_id);
         return;
     }
-    gatt_operation *op = list_node(op_node);
+    gatt_operation *op = (gatt_operation*) list_node(op_node);
 
     if (gatt_op_queue_executing && list_foreach(gatt_op_queue_executing, exec_list_contains, &conn_id)) {
         APPL_TRACE_DEBUG("%s: can't enqueue next op, already executing", __func__);
@@ -200,7 +200,7 @@ static void gatt_queue_read_op(UINT8 op_type, UINT16 conn_id, UINT16 handle) {
     gatt_op_queue = list_new(osi_free);
   }
 
-  gatt_operation *op = osi_malloc(sizeof(gatt_operation));
+  gatt_operation *op = (gatt_operation*) osi_malloc(sizeof(gatt_operation));
   op->type = op_type;
   op->conn_id = conn_id;
   op->handle = handle;
@@ -215,7 +215,7 @@ static void gatt_queue_write_op(UINT8 op_type, UINT16 conn_id, UINT16 handle, UI
     gatt_op_queue = list_new(osi_free);
   }
 
-  gatt_operation *op = osi_malloc(sizeof(gatt_operation));
+  gatt_operation *op = (gatt_operation*) osi_malloc(sizeof(gatt_operation));
   op->type = op_type;
   op->conn_id = conn_id;
   op->handle = handle;
@@ -257,7 +257,7 @@ static void bta_hh_le_hid_report_dbg(tBTA_HH_DEV_CB *p_cb)
 
     for (int j = 0; j < BTA_HH_LE_RPT_MAX; j ++, p_rpt++)
     {
-        char *  rpt_name = "Unknown";
+        const char * rpt_name = "Unknown";
 
         if (!p_rpt->in_use)
             break;
@@ -291,7 +291,7 @@ static void bta_hh_le_hid_report_dbg(tBTA_HH_DEV_CB *p_cb)
 ** Returns          void
 **
 *******************************************************************************/
-static char *bta_hh_uuid_to_str(UINT16 uuid)
+static const char *bta_hh_uuid_to_str(UINT16 uuid)
 {
     switch(uuid)
     {
@@ -660,7 +660,7 @@ static tBTA_GATTC_DESCRIPTOR *find_descriptor_by_short_uuid(UINT16 conn_id,
 
     for (list_node_t *dn = list_begin(p_char->descriptors);
          dn != list_end(p_char->descriptors); dn = list_next(dn)) {
-        tBTA_GATTC_DESCRIPTOR *p_desc = list_node(dn);
+        tBTA_GATTC_DESCRIPTOR *p_desc = (tBTA_GATTC_DESCRIPTOR*) list_node(dn);
 
         if (p_char->uuid.len == LEN_UUID_16 &&
             p_desc->uuid.uu.uuid16 == short_uuid)
@@ -1374,7 +1374,7 @@ void process_included(tBTA_HH_DEV_CB *p_dev_cb, tBTA_GATTC_SERVICE *service) {
 
     for (list_node_t *isn = list_begin(service->included_svc);
          isn != list_end(service->included_svc); isn = list_next(isn)) {
-        tBTA_GATTC_INCLUDED_SVC *p_isvc = list_node(isn);
+        tBTA_GATTC_INCLUDED_SVC *p_isvc = (tBTA_GATTC_INCLUDED_SVC*) list_node(isn);
         tBTA_GATTC_SERVICE *incl_svc = p_isvc->included_service;
         if (incl_svc->uuid.uu.uuid16 == UUID_SERVCLASS_BATTERY &&
             incl_svc->uuid.len == LEN_UUID_16) {
@@ -1384,7 +1384,7 @@ void process_included(tBTA_HH_DEV_CB *p_dev_cb, tBTA_GATTC_SERVICE *service) {
 
             for (list_node_t *cn = list_begin(incl_svc->characteristics);
                  cn != list_end(incl_svc->characteristics); cn = list_next(cn)) {
-                tBTA_GATTC_CHARACTERISTIC *p_char = list_node(cn);
+                tBTA_GATTC_CHARACTERISTIC *p_char = (tBTA_GATTC_CHARACTERISTIC*) list_node(cn);
                 if (p_char->uuid.uu.uuid16 == GATT_UUID_BATTERY_LEVEL &&
                     p_char->uuid.len == LEN_UUID_16) {
 
@@ -1420,7 +1420,7 @@ static void bta_hh_le_search_hid_chars(tBTA_HH_DEV_CB *p_dev_cb, tBTA_GATTC_SERV
 
     for (list_node_t *cn = list_begin(service->characteristics);
          cn != list_end(service->characteristics); cn = list_next(cn)) {
-        tBTA_GATTC_CHARACTERISTIC *p_char = list_node(cn);
+        tBTA_GATTC_CHARACTERISTIC *p_char = (tBTA_GATTC_CHARACTERISTIC*) list_node(cn);
 
         if(p_char->uuid.len != LEN_UUID_16)
             continue;
@@ -1480,7 +1480,7 @@ static void bta_hh_le_search_hid_chars(tBTA_HH_DEV_CB *p_dev_cb, tBTA_GATTC_SERV
     /* Make sure PROTO_MODE is processed as last */
     for (list_node_t *cn = list_begin(service->characteristics);
          cn != list_end(service->characteristics); cn = list_next(cn)) {
-        tBTA_GATTC_CHARACTERISTIC *p_char = list_node(cn);
+        tBTA_GATTC_CHARACTERISTIC *p_char = (tBTA_GATTC_CHARACTERISTIC*) list_node(cn);
 
         if(p_char->uuid.len != LEN_UUID_16 &&
            p_char->uuid.uu.uuid16 == GATT_UUID_HID_PROTO_MODE) {
@@ -1521,7 +1521,7 @@ void bta_hh_le_srvc_search_cmpl(tBTA_GATTC_SEARCH_CMPL *p_data)
     bool have_hid = false;
     for (list_node_t *sn = list_begin(services);
          sn != list_end(services); sn = list_next(sn)) {
-        tBTA_GATTC_SERVICE *service = list_node(sn);
+        tBTA_GATTC_SERVICE *service = (tBTA_GATTC_SERVICE*) list_node(sn);
 
         if (service->uuid.uu.uuid16 == UUID_SERVCLASS_LE_HID &&
             service->is_primary && !have_hid) {
@@ -1542,7 +1542,7 @@ void bta_hh_le_srvc_search_cmpl(tBTA_GATTC_SEARCH_CMPL *p_data)
 
             for (list_node_t *cn = list_begin(service->characteristics);
                  cn != list_end(service->characteristics); cn = list_next(cn)) {
-                tBTA_GATTC_CHARACTERISTIC *p_char = list_node(cn);
+                tBTA_GATTC_CHARACTERISTIC *p_char = (tBTA_GATTC_CHARACTERISTIC*) list_node(cn);
                 if (p_char->uuid.len == LEN_UUID_16 &&
                     p_char->uuid.uu.uuid16 == GATT_UUID_SCAN_REFRESH) {
 
@@ -1560,7 +1560,7 @@ void bta_hh_le_srvc_search_cmpl(tBTA_GATTC_SEARCH_CMPL *p_data)
             //TODO(jpawlowski): this should be done by GAP profile, remove when GAP is fixed.
             for (list_node_t *cn = list_begin(service->characteristics);
                  cn != list_end(service->characteristics); cn = list_next(cn)) {
-                tBTA_GATTC_CHARACTERISTIC *p_char = list_node(cn);
+                tBTA_GATTC_CHARACTERISTIC *p_char = (tBTA_GATTC_CHARACTERISTIC*) list_node(cn);
                 if (p_char->uuid.len == LEN_UUID_16 &&
                     p_char->uuid.uu.uuid16 == GATT_UUID_GAP_PREF_CONN_PARAM) {
 

diff --git a/bta/hh/bta_hh_main.c b/bta/hh/bta_hh_main.cc
similarity index 98%
rename from bta/hh/bta_hh_main.c
rename to bta/hh/bta_hh_main.cc
index 222ccf6..bd19659 100644 (file)
--- a/bta/hh/bta_hh_main.c
+++ b/bta/hh/bta_hh_main.cc
@@ -252,8 +252,8 @@ tBTA_HH_CB  bta_hh_cb;
 ** Static functions
 *****************************************************************************/
 #if BTA_HH_DEBUG == TRUE
-static char *bta_hh_evt_code(tBTA_HH_INT_EVT evt_code);
-static char *bta_hh_state_code(tBTA_HH_STATE state_code);
+static const char *bta_hh_evt_code(tBTA_HH_INT_EVT evt_code);
+static const char *bta_hh_state_code(tBTA_HH_STATE state_code);
 #endif
 
 /*******************************************************************************
@@ -487,7 +487,7 @@ BOOLEAN bta_hh_hdl_event(BT_HDR *p_msg)
 ** Returns          void
 **
 *******************************************************************************/
-static char *bta_hh_evt_code(tBTA_HH_INT_EVT evt_code)
+static const char *bta_hh_evt_code(tBTA_HH_INT_EVT evt_code)
 {
   switch(evt_code)
     {
@@ -553,7 +553,7 @@ static char *bta_hh_evt_code(tBTA_HH_INT_EVT evt_code)
 ** Returns          void
 **
 *******************************************************************************/
-static char *bta_hh_state_code(tBTA_HH_STATE state_code)
+static const char *bta_hh_state_code(tBTA_HH_STATE state_code)
 {
     switch (state_code)
     {

diff --git a/bta/hh/bta_hh_utils.c b/bta/hh/bta_hh_utils.cc
similarity index 100%
rename from bta/hh/bta_hh_utils.c
rename to bta/hh/bta_hh_utils.cc

diff --git a/btif/src/btif_dm.cc b/btif/src/btif_dm.cc
index 7b6e385..8da015f 100644 (file)
--- a/btif/src/btif_dm.cc
+++ b/btif/src/btif_dm.cc
@@ -249,7 +249,6 @@ static void btif_stats_add_bond_event(const bt_bdaddr_t *bd_addr,
 /******************************************************************************
 **  Externs
 ******************************************************************************/
-extern UINT16 bta_service_id_to_uuid_lkup_tbl [BTA_MAX_SERVICE_ID];
 extern bt_status_t btif_hf_execute_service(BOOLEAN b_enable);
 extern bt_status_t btif_av_execute_service(BOOLEAN b_enable);
 extern bt_status_t btif_av_sink_execute_service(BOOLEAN b_enable);

diff --git a/btif/src/btif_storage.cc b/btif/src/btif_storage.cc
index 8e208ad..108aa62 100644 (file)
--- a/btif/src/btif_storage.cc
+++ b/btif/src/btif_storage.cc
@@ -145,7 +145,6 @@ typedef struct
 /************************************************************************************
 **  External variables
 ************************************************************************************/
-extern UINT16 bta_service_id_to_uuid_lkup_tbl [BTA_MAX_SERVICE_ID];
 extern bt_bdaddr_t btif_local_bd_addr;
 
 /************************************************************************************

diff --git a/stack/btm/btm_sec.c b/stack/btm/btm_sec.c
index f967e98..81829de 100644 (file)
--- a/stack/btm/btm_sec.c
+++ b/stack/btm/btm_sec.c
@@ -93,9 +93,9 @@ static tBTM_STATUS btm_sec_send_hci_disconnect (tBTM_SEC_DEV_REC *p_dev_rec, UIN
 UINT8           btm_sec_start_role_switch (tBTM_SEC_DEV_REC *p_dev_rec);
 tBTM_SEC_DEV_REC *btm_sec_find_dev_by_sec_state (UINT8 state);
 
-static BOOLEAN  btm_sec_set_security_level ( CONNECTION_TYPE conn_type, char *p_name, UINT8 service_id,
-                                            UINT16 sec_level, UINT16 psm, UINT32 mx_proto_id,
-                                            UINT32 mx_chan_id);
+static BOOLEAN  btm_sec_set_security_level ( CONNECTION_TYPE conn_type, const char *p_name,
+                                            UINT8 service_id, UINT16 sec_level, UINT16 psm,
+                                            UINT32 mx_proto_id, UINT32 mx_chan_id);
 
 static BOOLEAN btm_dev_authenticated(tBTM_SEC_DEV_REC *p_dev_rec);
 static BOOLEAN btm_dev_encrypted(tBTM_SEC_DEV_REC *p_dev_rec);
@@ -475,7 +475,7 @@ void BTM_SetSecureConnectionsOnly (BOOLEAN secure_connections_only_mode)
 ** Returns          TRUE if registered OK, else FALSE
 **
 *******************************************************************************/
-BOOLEAN BTM_SetSecurityLevel (BOOLEAN is_originator, char *p_name, UINT8 service_id,
+BOOLEAN BTM_SetSecurityLevel (BOOLEAN is_originator, const char *p_name, UINT8 service_id,
                               UINT16 sec_level, UINT16 psm, UINT32 mx_proto_id,
                               UINT32 mx_chan_id)
 {
@@ -514,9 +514,9 @@ BOOLEAN BTM_SetSecurityLevel (BOOLEAN is_originator, char *p_name, UINT8 service
 ** Returns          TRUE if registered OK, else FALSE
 **
 *******************************************************************************/
-static BOOLEAN btm_sec_set_security_level (CONNECTION_TYPE conn_type, char *p_name, UINT8 service_id,
-                                           UINT16 sec_level, UINT16 psm, UINT32 mx_proto_id,
-                                           UINT32 mx_chan_id)
+static BOOLEAN btm_sec_set_security_level (CONNECTION_TYPE conn_type, const char *p_name,
+                                           UINT8 service_id, UINT16 sec_level, UINT16 psm,
+                                           UINT32 mx_proto_id, UINT32 mx_chan_id)
 {
     tBTM_SEC_SERV_REC   *p_srec;
     UINT16               index;

diff --git a/stack/hid/hidh_api.c b/stack/hid/hidh_api.c
index db173f1..d74b817 100644 (file)
--- a/stack/hid/hidh_api.c
+++ b/stack/hid/hidh_api.c
@@ -499,7 +499,7 @@ tHID_STATUS HID_HostCloseDev( UINT8 dev_handle )
     return hidh_conn_disconnect( dev_handle );
 }
 
-tHID_STATUS HID_HostSetSecurityLevel( char serv_name[], UINT8 sec_lvl )
+tHID_STATUS HID_HostSetSecurityLevel(const char serv_name[], UINT8 sec_lvl )
 {
     if (!BTM_SetSecurityLevel (FALSE, serv_name, BTM_SEC_SERVICE_HIDH_SEC_CTRL,
                                sec_lvl, HID_PSM_CONTROL, BTM_SEC_PROTO_HID, HID_SEC_CHN))

diff --git a/stack/include/bt_types.h b/stack/include/bt_types.h
index 53e4bd1..99af3a0 100644 (file)
--- a/stack/include/bt_types.h
+++ b/stack/include/bt_types.h
@@ -239,27 +239,27 @@ typedef struct
 #define UINT16_TO_STREAM(p, u16) {*(p)++ = (UINT8)(u16); *(p)++ = (UINT8)((u16) >> 8);}
 #define UINT8_TO_STREAM(p, u8)   {*(p)++ = (UINT8)(u8);}
 #define INT8_TO_STREAM(p, u8)    {*(p)++ = (INT8)(u8);}
-#define ARRAY32_TO_STREAM(p, a)  {register int ijk; for (ijk = 0; ijk < 32;           ijk++) *(p)++ = (UINT8) (a)[31 - ijk];}
-#define ARRAY16_TO_STREAM(p, a)  {register int ijk; for (ijk = 0; ijk < 16;           ijk++) *(p)++ = (UINT8) (a)[15 - ijk];}
-#define ARRAY8_TO_STREAM(p, a)   {register int ijk; for (ijk = 0; ijk < 8;            ijk++) *(p)++ = (UINT8) (a)[7 - ijk];}
-#define BDADDR_TO_STREAM(p, a)   {register int ijk; for (ijk = 0; ijk < BD_ADDR_LEN;  ijk++) *(p)++ = (UINT8) (a)[BD_ADDR_LEN - 1 - ijk];}
-#define LAP_TO_STREAM(p, a)      {register int ijk; for (ijk = 0; ijk < LAP_LEN;      ijk++) *(p)++ = (UINT8) (a)[LAP_LEN - 1 - ijk];}
-#define DEVCLASS_TO_STREAM(p, a) {register int ijk; for (ijk = 0; ijk < DEV_CLASS_LEN;ijk++) *(p)++ = (UINT8) (a)[DEV_CLASS_LEN - 1 - ijk];}
-#define ARRAY_TO_STREAM(p, a, len) {register int ijk; for (ijk = 0; ijk < (len);        ijk++) *(p)++ = (UINT8) (a)[ijk];}
-#define REVERSE_ARRAY_TO_STREAM(p, a, len)  {register int ijk; for (ijk = 0; ijk < (len); ijk++) *(p)++ = (UINT8) (a)[(len) - 1 - ijk];}
+#define ARRAY32_TO_STREAM(p, a)  {int ijk; for (ijk = 0; ijk < 32;           ijk++) *(p)++ = (UINT8) (a)[31 - ijk];}
+#define ARRAY16_TO_STREAM(p, a)  {int ijk; for (ijk = 0; ijk < 16;           ijk++) *(p)++ = (UINT8) (a)[15 - ijk];}
+#define ARRAY8_TO_STREAM(p, a)   {int ijk; for (ijk = 0; ijk < 8;            ijk++) *(p)++ = (UINT8) (a)[7 - ijk];}
+#define BDADDR_TO_STREAM(p, a)   {int ijk; for (ijk = 0; ijk < BD_ADDR_LEN;  ijk++) *(p)++ = (UINT8) (a)[BD_ADDR_LEN - 1 - ijk];}
+#define LAP_TO_STREAM(p, a)      {int ijk; for (ijk = 0; ijk < LAP_LEN;      ijk++) *(p)++ = (UINT8) (a)[LAP_LEN - 1 - ijk];}
+#define DEVCLASS_TO_STREAM(p, a) {int ijk; for (ijk = 0; ijk < DEV_CLASS_LEN;ijk++) *(p)++ = (UINT8) (a)[DEV_CLASS_LEN - 1 - ijk];}
+#define ARRAY_TO_STREAM(p, a, len) {int ijk; for (ijk = 0; ijk < (len);        ijk++) *(p)++ = (UINT8) (a)[ijk];}
+#define REVERSE_ARRAY_TO_STREAM(p, a, len)  {int ijk; for (ijk = 0; ijk < (len); ijk++) *(p)++ = (UINT8) (a)[(len) - 1 - ijk];}
 
 #define STREAM_TO_UINT8(u8, p)   {(u8) = (UINT8)(*(p)); (p) += 1;}
 #define STREAM_TO_UINT16(u16, p) {(u16) = ((UINT16)(*(p)) + (((UINT16)(*((p) + 1))) << 8)); (p) += 2;}
 #define STREAM_TO_UINT24(u32, p) {(u32) = (((UINT32)(*(p))) + ((((UINT32)(*((p) + 1)))) << 8) + ((((UINT32)(*((p) + 2)))) << 16) ); (p) += 3;}
 #define STREAM_TO_UINT32(u32, p) {(u32) = (((UINT32)(*(p))) + ((((UINT32)(*((p) + 1)))) << 8) + ((((UINT32)(*((p) + 2)))) << 16) + ((((UINT32)(*((p) + 3)))) << 24)); (p) += 4;}
-#define STREAM_TO_BDADDR(a, p)   {register int ijk; register UINT8 *pbda = (UINT8 *)(a) + BD_ADDR_LEN - 1; for (ijk = 0; ijk < BD_ADDR_LEN; ijk++) *pbda-- = *(p)++;}
-#define STREAM_TO_ARRAY32(a, p)  {register int ijk; register UINT8 *_pa = (UINT8 *)(a) + 31; for (ijk = 0; ijk < 32; ijk++) *_pa-- = *(p)++;}
-#define STREAM_TO_ARRAY16(a, p)  {register int ijk; register UINT8 *_pa = (UINT8 *)(a) + 15; for (ijk = 0; ijk < 16; ijk++) *_pa-- = *(p)++;}
-#define STREAM_TO_ARRAY8(a, p)   {register int ijk; register UINT8 *_pa = (UINT8 *)(a) + 7; for (ijk = 0; ijk < 8; ijk++) *_pa-- = *(p)++;}
-#define STREAM_TO_DEVCLASS(a, p) {register int ijk; register UINT8 *_pa = (UINT8 *)(a) + DEV_CLASS_LEN - 1; for (ijk = 0; ijk < DEV_CLASS_LEN; ijk++) *_pa-- = *(p)++;}
-#define STREAM_TO_LAP(a, p)      {register int ijk; register UINT8 *plap = (UINT8 *)(a) + LAP_LEN - 1; for (ijk = 0; ijk < LAP_LEN; ijk++) *plap-- = *(p)++;}
-#define STREAM_TO_ARRAY(a, p, len) {register int ijk; for (ijk = 0; ijk < (len); ijk++) ((UINT8 *) (a))[ijk] = *(p)++;}
-#define REVERSE_STREAM_TO_ARRAY(a, p, len) {register int ijk; register UINT8 *_pa = (UINT8 *)(a) + (len) - 1; for (ijk = 0; ijk < (len); ijk++) *_pa-- = *(p)++;}
+#define STREAM_TO_BDADDR(a, p)   {int ijk; UINT8 *pbda = (UINT8 *)(a) + BD_ADDR_LEN - 1; for (ijk = 0; ijk < BD_ADDR_LEN; ijk++) *pbda-- = *(p)++;}
+#define STREAM_TO_ARRAY32(a, p)  {int ijk; UINT8 *_pa = (UINT8 *)(a) + 31; for (ijk = 0; ijk < 32; ijk++) *_pa-- = *(p)++;}
+#define STREAM_TO_ARRAY16(a, p)  {int ijk; UINT8 *_pa = (UINT8 *)(a) + 15; for (ijk = 0; ijk < 16; ijk++) *_pa-- = *(p)++;}
+#define STREAM_TO_ARRAY8(a, p)   {int ijk; UINT8 *_pa = (UINT8 *)(a) + 7; for (ijk = 0; ijk < 8; ijk++) *_pa-- = *(p)++;}
+#define STREAM_TO_DEVCLASS(a, p) {int ijk; UINT8 *_pa = (UINT8 *)(a) + DEV_CLASS_LEN - 1; for (ijk = 0; ijk < DEV_CLASS_LEN; ijk++) *_pa-- = *(p)++;}
+#define STREAM_TO_LAP(a, p)      {int ijk; UINT8 *plap = (UINT8 *)(a) + LAP_LEN - 1; for (ijk = 0; ijk < LAP_LEN; ijk++) *plap-- = *(p)++;}
+#define STREAM_TO_ARRAY(a, p, len) {int ijk; for (ijk = 0; ijk < (len); ijk++) ((UINT8 *) (a))[ijk] = *(p)++;}
+#define REVERSE_STREAM_TO_ARRAY(a, p, len) {int ijk; UINT8 *_pa = (UINT8 *)(a) + (len) - 1; for (ijk = 0; ijk < (len); ijk++) *_pa-- = *(p)++;}
 
 #define STREAM_SKIP_UINT8(p)  do { (p) += 1; } while (0)
 #define STREAM_SKIP_UINT16(p) do { (p) += 2; } while (0)
@@ -282,7 +282,7 @@ typedef struct
 #define UINT16_TO_BE_STREAM(p, u16) {*(p)++ = (UINT8)((u16) >> 8); *(p)++ = (UINT8)(u16);}
 #define UINT8_TO_BE_STREAM(p, u8)   {*(p)++ = (UINT8)(u8);}
 #define ARRAY_TO_BE_STREAM(p, a, len) {int ijk; for (ijk = 0; ijk < (len); ijk++) *(p)++ = (UINT8) (a)[ijk];}
-#define ARRAY_TO_BE_STREAM_REVERSE(p, a, len) {register int ijk; for (ijk = 0; ijk < (len); ijk++) *(p)++ = (UINT8) (a)[(len) - ijk - 1];}
+#define ARRAY_TO_BE_STREAM_REVERSE(p, a, len) {int ijk; for (ijk = 0; ijk < (len); ijk++) *(p)++ = (UINT8) (a)[(len) - ijk - 1];}
 
 #define BE_STREAM_TO_UINT8(u8, p)   {(u8) = (UINT8)(*(p)); (p) += 1;}
 #define BE_STREAM_TO_UINT16(u16, p) {(u16) = (UINT16)(((UINT16)(*(p)) << 8) + (UINT16)(*((p) + 1))); (p) += 2;}
@@ -293,7 +293,7 @@ typedef struct
                                     ((UINT64)(*((p) + 3)) << 32) + ((UINT64)(*((p) + 2)) << 40) + \
                                     ((UINT64)(*((p) + 1)) << 48) + ((UINT64)(*(p)) << 56)); \
                                     (p) += 8;}
-#define BE_STREAM_TO_ARRAY(p, a, len) {register int ijk; for (ijk = 0; ijk < (len); ijk++) ((UINT8 *) (a))[ijk] = *(p)++;}
+#define BE_STREAM_TO_ARRAY(p, a, len) {int ijk; for (ijk = 0; ijk < (len); ijk++) ((UINT8 *) (a))[ijk] = *(p)++;}
 
 
 /********************************************************************************

diff --git a/stack/include/btm_api.h b/stack/include/btm_api.h
index 23fb5fb..97dad9d 100644 (file)
--- a/stack/include/btm_api.h
+++ b/stack/include/btm_api.h
@@ -3265,7 +3265,7 @@ extern void BTM_SetSecureConnectionsOnly (BOOLEAN secure_connections_only_mode);
 ** Returns          TRUE if registered OK, else FALSE
 **
 *******************************************************************************/
-extern BOOLEAN BTM_SetSecurityLevel (BOOLEAN is_originator, char *p_name,
+extern BOOLEAN BTM_SetSecurityLevel (BOOLEAN is_originator, const char *p_name,
                                      UINT8 service_id, UINT16 sec_level,
                                      UINT16 psm, UINT32 mx_proto_id,
                                      UINT32 mx_chan_id);

diff --git a/stack/include/gap_api.h b/stack/include/gap_api.h
index e1be352..372a165 100644 (file)
--- a/stack/include/gap_api.h
+++ b/stack/include/gap_api.h
@@ -23,6 +23,10 @@
 #include "btm_api.h"
 #include "l2c_api.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*****************************************************************************
 **  Constants
 *****************************************************************************/
@@ -376,7 +380,10 @@ extern BOOLEAN GAP_BleReadPeerAddressResolutionCap (BD_ADDR peer_bda,
 *******************************************************************************/
 extern BOOLEAN GAP_BleCancelReadPeerDevName (BD_ADDR peer_bda);
 
+#endif
 
+#ifdef __cplusplus
+}
 #endif
 
 #endif  /* GAP_API_H */

diff --git a/stack/include/hidh_api.h b/stack/include/hidh_api.h
index f7a5e21..2be317b 100644 (file)
--- a/stack/include/hidh_api.h
+++ b/stack/include/hidh_api.h
@@ -203,7 +203,7 @@ extern void HID_HostInit(void);
 **
 ** Returns         tHID_STATUS
 *******************************************************************************/
-extern tHID_STATUS HID_HostSetSecurityLevel( char serv_name[], UINT8 sec_lvl );
+extern tHID_STATUS HID_HostSetSecurityLevel(const char serv_name[], UINT8 sec_lvl );
 
 /*******************************************************************************
 **

diff --git a/stack/sdp/sdpint.h b/stack/sdp/sdpint.h
index 480936f..2276401 100644 (file)
--- a/stack/sdp/sdpint.h
+++ b/stack/sdp/sdpint.h
@@ -240,10 +240,6 @@ extern tSDP_CB *sdp_cb_ptr;
 #define sdp_cb (*sdp_cb_ptr)
 #endif
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Functions provided by sdp_main.c */
 extern void     sdp_init (void);
 extern void     sdp_disconnect (tCONN_CB*p_ccb, UINT16 reason);
@@ -319,6 +315,8 @@ extern void sdp_disc_server_rsp (tCONN_CB *p_ccb, BT_HDR *p_msg);
 #define sdp_disc_server_rsp(p_ccb, p_msg)
 #endif
 
-
+#ifdef __cplusplus
+}
+#endif
 
 #endif