diff options
author | Mike J. Chen <mjchen@google.com> | 2014-01-31 18:16:59 -0800 |
---|---|---|
committer | Mike J. Chen <mjchen@google.com> | 2014-02-11 09:48:38 -0800 |
commit | 5cd8bff2dd0337cb52bf48f312e3d2d55a8882fb (patch) | |
tree | e57ed7fa0f556b2f10f081f39354a903511ae5f5 /stack/btm | |
parent | 60126e439e01a30d6121a55aaf6d3a5d6d400507 (diff) | |
download | android_system_bt-5cd8bff2dd0337cb52bf48f312e3d2d55a8882fb.tar.gz android_system_bt-5cd8bff2dd0337cb52bf48f312e3d2d55a8882fb.tar.bz2 android_system_bt-5cd8bff2dd0337cb52bf48f312e3d2d55a8882fb.zip |
Major warnings cleanup
Mostly fixing unused parameter warnings.
A few other warnings also fixed like possible use of
unitialized variables (no real issue found, just compiler couldn't
follow the path), signed vs unsigned warning.
Also fixed some typos, indent issues, removal of dead code, etc.
Change-Id: I95eb887aefc4d559d7921f71a0af5f3bfb01ac01
Signed-off-by: Mike J. Chen <mjchen@google.com>
Diffstat (limited to 'stack/btm')
-rw-r--r-- | stack/btm/btm_ble.c | 3 | ||||
-rw-r--r-- | stack/btm/btm_ble_bgconn.c | 8 | ||||
-rw-r--r-- | stack/btm/btm_ble_gap.c | 12 | ||||
-rw-r--r-- | stack/btm/btm_devctl.c | 14 | ||||
-rw-r--r-- | stack/btm/btm_pm.c | 3 | ||||
-rw-r--r-- | stack/btm/btm_sco.c | 7 | ||||
-rw-r--r-- | stack/btm/btm_sec.c | 12 |
7 files changed, 54 insertions, 5 deletions
diff --git a/stack/btm/btm_ble.c b/stack/btm/btm_ble.c index 6f2f454f6..0db65e48d 100644 --- a/stack/btm/btm_ble.c +++ b/stack/btm/btm_ble.c @@ -33,6 +33,7 @@ #include "smp_api.h" #include "l2c_int.h" #include "gap_api.h" +#include "bt_utils.h" #if SMP_INCLUDED == TRUE extern BOOLEAN AES_CMAC ( BT_OCTET16 key, UINT8 *input, UINT16 length, UINT16 tlen, UINT8 *p_signature); @@ -1507,6 +1508,7 @@ void btm_ble_connected (UINT8 *bda, UINT16 handle, UINT8 enc_mode, UINT8 role, { tBTM_SEC_DEV_REC *p_dev_rec = btm_find_dev (bda); tBTM_BLE_CB *p_cb = &btm_cb.ble_ctr_cb; + UNUSED(addr_matched); BTM_TRACE_EVENT0 ("btm_ble_connected"); @@ -1568,6 +1570,7 @@ void btm_ble_conn_complete(UINT8 *p, UINT16 evt_len) BD_ADDR bda; UINT16 conn_interval, conn_latency, conn_timeout; BOOLEAN match = FALSE; + UNUSED(evt_len); STREAM_TO_UINT8 (status, p); STREAM_TO_UINT16 (handle, p); diff --git a/stack/btm/btm_ble_bgconn.c b/stack/btm/btm_ble_bgconn.c index 727390c55..96d35c4c5 100644 --- a/stack/btm/btm_ble_bgconn.c +++ b/stack/btm/btm_ble_bgconn.c @@ -29,7 +29,7 @@ #include "btm_int.h" #include "l2c_int.h" #include "hcimsgs.h" - +#include "bt_utils.h" #ifndef BTM_BLE_SCAN_PARAM_TOUT #define BTM_BLE_SCAN_PARAM_TOUT 50 /* 50 seconds */ @@ -73,6 +73,7 @@ BOOLEAN btm_add_dev_to_controller (BOOLEAN to_add, BD_ADDR bd_addr, UINT8 attr) BOOLEAN started = FALSE; BD_ADDR dummy_bda = {0}; tBT_DEVICE_TYPE dev_type; + UNUSED(attr); if (p_dev_rec != NULL && p_dev_rec->device_type == BT_DEVICE_TYPE_BLE) @@ -227,6 +228,8 @@ void btm_ble_clear_white_list_complete(UINT8 *p_data, UINT16 evt_len) { tBTM_BLE_CB *p_cb = &btm_cb.ble_ctr_cb; UINT8 status; + UNUSED(evt_len); + BTM_TRACE_EVENT0 ("btm_ble_clear_white_list_complete"); STREAM_TO_UINT8 (status, p_data); @@ -259,6 +262,8 @@ void btm_ble_add_2_white_list_complete(UINT8 status) void btm_ble_remove_from_white_list_complete(UINT8 *p, UINT16 evt_len) { tBTM_BLE_CB *p_cb = &btm_cb.ble_ctr_cb; + UNUSED(evt_len); + BTM_TRACE_EVENT0 ("btm_ble_remove_from_white_list_complete"); if (*p == HCI_SUCCESS) { @@ -299,6 +304,7 @@ BOOLEAN btm_update_bg_conn_list(BOOLEAN to_add, BD_ADDR bd_addr, UINT8 *p_attr_t tBTM_LE_BG_CONN_DEV *p_bg_dev = &p_cb->bg_dev_list[0], *p_next, *p_cur; UINT8 i, j; BOOLEAN ret = FALSE; + UNUSED(p_attr_tag); BTM_TRACE_EVENT0 ("btm_update_bg_conn_list"); diff --git a/stack/btm/btm_ble_gap.c b/stack/btm/btm_ble_gap.c index bfe5fda08..5e5b5dba4 100644 --- a/stack/btm/btm_ble_gap.c +++ b/stack/btm/btm_ble_gap.c @@ -27,6 +27,7 @@ #include <stddef.h> #include "bt_types.h" +#include "bt_utils.h" #include "btu.h" #include "btm_int.h" #include "hcimsgs.h" @@ -85,7 +86,10 @@ void BTM_BleReset(void) *******************************************************************************/ BOOLEAN BTM_BleUpdateAdvWhitelist(BOOLEAN add_remove, BD_ADDR remote_bda) { - return FALSE; + UNUSED(add_remove); + UNUSED(remote_bda); + + return FALSE; } /******************************************************************************* @@ -279,6 +283,8 @@ void BTM_RegisterScanReqEvt(tBTM_BLE_SCAN_REQ_CBACK *p_scan_req_cback) tBTM_BLE_CB *p_cb = &btm_cb.ble_ctr_cb; p_cb->p_scan_req_cback = p_scan_req_cback; } +#else + UNUSED(p_scan_req_cback); #endif } @@ -1391,6 +1397,7 @@ void btm_ble_cache_adv_data(tBTM_INQ_RESULTS *p_cur, UINT8 data_len, UINT8 *p, U tBTM_BLE_INQ_CB *p_le_inq_cb = &btm_cb.ble_ctr_cb.inq_var; UINT8 *p_cache; UINT8 length; + UNUSED(p_cur); /* cache adv report/scan response data */ if (evt_type != BTM_BLE_SCAN_RSP_EVT) @@ -1619,6 +1626,7 @@ void btm_send_sel_conn_callback(BD_ADDR remote_bda, UINT8 evt_type, UINT8 *p_dat { UINT8 data_len, len; UINT8 *p_dev_name, remname[31] = {0}; + UNUSED(addr_type); if (btm_cb.ble_ctr_cb.p_select_cback == NULL || /* non-connectable device */ @@ -2032,6 +2040,8 @@ void btm_ble_update_mode_operation(UINT8 link_role, BD_ADDR bd_addr, BOOLEAN con tACL_CONN *pa = &btm_cb.acl_db[0]; UINT16 xx; UINT8 dev_role = link_role; + UNUSED(bd_addr); + UNUSED(conn_cancel); BTM_TRACE_DEBUG1("btm_ble_update_mode_operation adv_mode = %d", btm_cb.ble_ctr_cb.inq_var.adv_mode ); diff --git a/stack/btm/btm_devctl.c b/stack/btm/btm_devctl.c index 64c821ac6..240bd2fed 100644 --- a/stack/btm/btm_devctl.c +++ b/stack/btm/btm_devctl.c @@ -29,6 +29,7 @@ #include <stddef.h> #include "bt_types.h" +#include "bt_utils.h" #include "hcimsgs.h" #include "btu.h" #include "btm_int.h" @@ -729,6 +730,7 @@ void btm_read_hci_buf_size_complete (UINT8 *p, UINT16 evt_len) UINT16 lm_num_acl_bufs; UINT16 lm_num_sco_bufs; UINT16 acl_buf_size; + UNUSED(evt_len); STREAM_TO_UINT8 (status, p); if (status == HCI_SUCCESS) @@ -790,8 +792,9 @@ void btm_read_ble_buf_size_complete (UINT8 *p, UINT16 evt_len) { UINT8 status; UINT16 lm_num_le_bufs; + UNUSED(evt_len); - BTM_TRACE_DEBUG0("btm_read_ble_buf_size_complete "); + BTM_TRACE_DEBUG0("btm_read_ble_buf_size_complete "); STREAM_TO_UINT8 (status, p); if (status == HCI_SUCCESS) { @@ -823,6 +826,7 @@ void btm_read_ble_buf_size_complete (UINT8 *p, UINT16 evt_len) void btm_read_ble_local_supported_features_complete (UINT8 *p, UINT16 evt_len) { UINT8 status; + UNUSED(evt_len); BTM_TRACE_DEBUG0("btm_read_ble_local_supported_features_complete "); @@ -860,8 +864,9 @@ void btm_read_ble_local_supported_features_complete (UINT8 *p, UINT16 evt_len) void btm_read_white_list_size_complete(UINT8 *p, UINT16 evt_len) { UINT8 status; + UNUSED(evt_len); - BTM_TRACE_DEBUG0("btm_read_white_list_size_complete "); + BTM_TRACE_DEBUG0("btm_read_white_list_size_complete "); STREAM_TO_UINT8 (status, p); if (status == HCI_SUCCESS) @@ -888,6 +893,7 @@ void btm_read_local_version_complete (UINT8 *p, UINT16 evt_len) { tBTM_VERSION_INFO *p_vi = &btm_cb.devcb.local_version; UINT8 status; + UNUSED(evt_len); #ifdef BTA_PRM_CHECK_FW_VER if(BTA_PRM_CHECK_FW_VER(p)) @@ -1326,6 +1332,7 @@ void btm_read_local_features_complete (UINT8 *p, UINT16 evt_len) { tBTM_DEVCB *p_devcb = &btm_cb.devcb; UINT8 status; + UNUSED(evt_len); btu_stop_timer (&p_devcb->reset_timer); @@ -1369,6 +1376,7 @@ void btm_read_local_ext_features_complete (UINT8 *p, UINT16 evt_len) UINT8 status; UINT8 page_number; UINT8 page_number_max; + UNUSED(evt_len); btu_stop_timer (&btm_cb.devcb.reset_timer); @@ -1644,6 +1652,7 @@ void btm_read_local_name_complete (UINT8 *p, UINT16 evt_len) { tBTM_CMPL_CB *p_cb = btm_cb.devcb.p_rln_cmpl_cb; UINT8 status; + UNUSED(evt_len); btu_stop_timer (&btm_cb.devcb.rln_timer); @@ -1708,6 +1717,7 @@ tBTM_STATUS BTM_ReadLocalDeviceAddr (tBTM_CMPL_CB *p_cb) void btm_read_local_addr_complete (UINT8 *p, UINT16 evt_len) { UINT8 status; + UNUSED(evt_len); STREAM_TO_UINT8 (status, p); diff --git a/stack/btm/btm_pm.c b/stack/btm/btm_pm.c index 925e69f89..02e3a6a92 100644 --- a/stack/btm/btm_pm.c +++ b/stack/btm/btm_pm.c @@ -40,7 +40,7 @@ #include "btm_int.h" #include "l2c_int.h" #include "hcidefs.h" - +#include "bt_utils.h" #if BTM_PWR_MGR_INCLUDED == TRUE @@ -923,6 +923,7 @@ void btm_pm_proc_ssr_evt (UINT8 *p, UINT16 evt_len) tBTM_PM_MCB *p_cb; tACL_CONN *p_acl=NULL; UINT16 use_ssr = TRUE; + UNUSED(evt_len); STREAM_TO_UINT8 (status, p); diff --git a/stack/btm/btm_sco.c b/stack/btm/btm_sco.c index 3eb010c58..2200b7119 100644 --- a/stack/btm/btm_sco.c +++ b/stack/btm/btm_sco.c @@ -33,6 +33,7 @@ #include "btm_api.h" #include "btm_int.h" #include "hcidefs.h" +#include "bt_utils.h" #if BTM_SCO_INCLUDED == TRUE @@ -93,7 +94,11 @@ void btm_sco_flush_sco_data(UINT16 sco_inx) GKI_freebuf (p_buf); } } +#else + UNUSED(sco_inx); #endif +#else + UNUSED(sco_inx); #endif } /******************************************************************************* @@ -382,6 +387,8 @@ tBTM_STATUS BTM_WriteScoData (UINT16 sco_inx, BT_HDR *p_buf) return (status); #else + UNUSED(sco_inx); + UNUSED(p_buf); return (BTM_NO_RESOURCES); #endif } diff --git a/stack/btm/btm_sec.c b/stack/btm/btm_sec.c index e3628f8b8..09f41b799 100644 --- a/stack/btm/btm_sec.c +++ b/stack/btm/btm_sec.c @@ -28,6 +28,7 @@ #include "btu.h" #include "btm_int.h" #include "l2c_int.h" +#include "bt_utils.h" #if (BT_USE_TRACES == TRUE && BT_TRACE_VERBOSE == FALSE) /* needed for sprintf() */ @@ -432,6 +433,13 @@ BOOLEAN BTM_SetUCDSecurityLevel (BOOLEAN is_originator, char *p_name, UINT8 serv return(btm_sec_set_security_level (conn_type, p_name, service_id, sec_level, psm, mx_proto_id, mx_chan_id)); #else + UNUSED(is_originator); + UNUSED(p_name); + UNUSED(service_id); + UNUSED(sec_level); + UNUSED(psm); + UNUSED(mx_proto_id); + UNUSED(mx_chan_id); return FALSE; #endif } @@ -842,6 +850,7 @@ UINT8 BTM_SecClrUCDService (UINT8 service_id) return(num_cleared); #else + UNUSED(service_id); return(0); #endif } @@ -4039,6 +4048,7 @@ BOOLEAN btm_sec_create_conn (BD_ADDR bda, UINT16 packet_types, static void btm_sec_connect_after_reject_timeout (TIMER_LIST_ENT *p_tle) { tBTM_SEC_DEV_REC *p_dev_rec = btm_cb.p_collided_dev_rec; + UNUSED(p_tle); BTM_TRACE_EVENT0 ("btm_sec_connect_after_reject_timeout()"); btm_cb.sec_collision_tle.param = 0; @@ -4655,6 +4665,7 @@ static void btm_sec_pairing_timeout (TIMER_LIST_ENT *p_tle) #endif #endif UINT8 name[2]; + UNUSED(p_tle); p_cb->pairing_tle.param = 0; /* Coverity: FALSE-POSITIVE error from Coverity tool. Please do NOT remove following comment. */ @@ -5357,6 +5368,7 @@ static tBTM_SEC_SERV_REC *btm_sec_find_mx_serv (UINT8 is_originator, UINT16 psm, static void btm_sec_collision_timeout (TIMER_LIST_ENT *p_tle) { tBTM_STATUS status; + UNUSED(p_tle); BTM_TRACE_EVENT0 ("btm_sec_collision_timeout()"); btm_cb.sec_collision_tle.param = 0; |