diff options
| author | Mike J. Chen <mjchen@google.com> | 2014-02-11 20:10:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-11 20:11:00 +0000 |
| commit | b83a823466bf93f7d484f7c8d23513e0e7c1a5a8 (patch) | |
| tree | 0c3efec207d038f70f7020094447080cdc8c917e /stack/gatt/gatt_utils.c | |
| parent | 5fba60a8761b28adec2704dcbf69376ebde4f19b (diff) | |
| parent | ba1ee422cee82449e675a52a785dac1a9200a3df (diff) | |
| download | android_system_bt-b83a823466bf93f7d484f7c8d23513e0e7c1a5a8.tar.gz android_system_bt-b83a823466bf93f7d484f7c8d23513e0e7c1a5a8.tar.bz2 android_system_bt-b83a823466bf93f7d484f7c8d23513e0e7c1a5a8.zip | |
Merge changes Ifc373f95,I95eb887a,I1e6be2ab,Ia6ea939a,I147d0138, ... into klp-modular-dev
* changes:
Make all warnings fatal compilation errors
Major warnings cleanup
Add macro UNUSED() to bt_utils.h
Fix unused parameter warning in static function
Add "static" to a static function
Fix a number of unused parameter warnings in static functions
Fix bug with wrong parameter passed to logu
Default send_ind_evt should be FALSE
Fix warning "implicit declaration of function 'GAP_BleReadPeerPrefConnParams'"
Fix unused parameter warnings in static functions by changing prototype
Fix some unused parameter warnings in static functions
Fix warnings about implicit declaration of bdcmp and bdcpy
Fix warning "comparison is always true due to limited range of data type"
Fix warning "suggest braces around empty body in an 'if' statement"
Fix warning "comparison is always true due to limited range of data type"
Add a function prototype for btm_ble_test_command_complete
Change argument to return ptr rather than assign to unused local
Fix warning "comparison is always true due to limited range of data type"
Fix warnings about implicit declarations
Fix warning "implicit declaration of function 'bdcmp'"
Fix warning "case label value exceeds maximum value for type"
Fix missing initializer warning
Fix missing initializer warning
Fix warning about missing initializer
Diffstat (limited to 'stack/gatt/gatt_utils.c')
| -rw-r--r-- | stack/gatt/gatt_utils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/stack/gatt/gatt_utils.c b/stack/gatt/gatt_utils.c index 36f80a4d8..978c88ce5 100644 --- a/stack/gatt/gatt_utils.c +++ b/stack/gatt/gatt_utils.c @@ -22,6 +22,7 @@ * ******************************************************************************/ #include "bt_target.h" +#include "bt_utils.h" #if BLE_INCLUDED == TRUE #include <string.h> @@ -477,6 +478,8 @@ void gatt_update_last_pri_srv_info(tGATT_SRV_LIST_INFO *p_list) *******************************************************************************/ void gatts_update_srv_list_elem(UINT8 i_sreg, UINT16 handle, BOOLEAN is_primary) { + UNUSED(handle); + gatt_cb.srv_list[i_sreg].in_use = TRUE; gatt_cb.srv_list[i_sreg].i_sreg = i_sreg; gatt_cb.srv_list[i_sreg].s_hdl = gatt_cb.sr_reg[i_sreg].s_hdl; @@ -1330,6 +1333,7 @@ UINT8 gatt_sr_alloc_rcb(tGATT_HDL_LIST_ELEM *p_list ) void gatt_sr_get_sec_info(BD_ADDR rem_bda, BOOLEAN le_conn, UINT8 *p_sec_flag, UINT8 *p_key_size) { UINT8 sec_flag = 0; + UNUSED(le_conn); BTM_GetSecurityFlags(rem_bda, &sec_flag); |