diff options
| author | Sharvil Nanavati <sharvil@google.com> | 2015-01-20 23:12:31 -0800 |
|---|---|---|
| committer | Andre Eisenbach <eisenbach@google.com> | 2015-03-16 16:51:42 -0700 |
| commit | f105417abd42ccdc3c36a154a86596d5aa5ae424 (patch) | |
| tree | 860c5df146d78459f74ec87e9f54489fcf5ffc92 /stack/bnep/bnep_api.c | |
| parent | 41e319644db0b951c8c08fb3b50cbb0e1778b381 (diff) | |
| download | android_system_bt-f105417abd42ccdc3c36a154a86596d5aa5ae424.tar.gz android_system_bt-f105417abd42ccdc3c36a154a86596d5aa5ae424.tar.bz2 android_system_bt-f105417abd42ccdc3c36a154a86596d5aa5ae424.zip | |
Collapse BNEP #defines that don't need to be configurable.
In some instances, defining these macros to FALSE would result in
broken runtime behavior (e.g. UUID fields containing uninitialized
values). This change collapses the following defines:
BNEP_SUPPORTS_PROT_FILTERS
BNEP_SUPPORTS_MULTI_FILTERS
BNEP_SUPPORTS_DEBUG_DUMP
BNEP_SUPPORTS_ALL_UUID_LENGTHS
Diffstat (limited to 'stack/bnep/bnep_api.c')
| -rw-r--r-- | stack/bnep/bnep_api.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/stack/bnep/bnep_api.c b/stack/bnep/bnep_api.c index c9987cb2f..76bffca50 100644 --- a/stack/bnep/bnep_api.c +++ b/stack/bnep/bnep_api.c @@ -150,11 +150,6 @@ tBNEP_RESULT BNEP_Connect (BD_ADDR p_rem_bda, if (src_uuid->len != dst_uuid->len) return BNEP_CONN_FAILED_UUID_SIZE; -#if (!defined (BNEP_SUPPORTS_ALL_UUID_LENGTHS) || BNEP_SUPPORTS_ALL_UUID_LENGTHS == FALSE) - if (src_uuid->len != 2) - return BNEP_CONN_FAILED_UUID_SIZE; -#endif - if (!p_bcb) { if ((p_bcb = bnepu_allocate_bcb (p_rem_bda)) == NULL) @@ -585,7 +580,6 @@ tBNEP_RESULT BNEP_SetProtocolFilters (UINT16 handle, UINT16 *p_start_array, UINT16 *p_end_array) { -#if (defined (BNEP_SUPPORTS_PROT_FILTERS) && BNEP_SUPPORTS_PROT_FILTERS == TRUE) UINT16 xx; tBNEP_CONN *p_bcb; @@ -618,9 +612,6 @@ tBNEP_RESULT BNEP_SetProtocolFilters (UINT16 handle, bnepu_send_peer_our_filters (p_bcb); return (BNEP_SUCCESS); -#else - return (BNEP_SET_FILTER_FAIL); -#endif } @@ -648,7 +639,6 @@ tBNEP_RESULT BNEP_SetMulticastFilters (UINT16 handle, UINT8 *p_start_array, UINT8 *p_end_array) { -#if (defined (BNEP_SUPPORTS_MULTI_FILTERS) && BNEP_SUPPORTS_MULTI_FILTERS == TRUE) UINT16 xx; tBNEP_CONN *p_bcb; @@ -684,9 +674,6 @@ tBNEP_RESULT BNEP_SetMulticastFilters (UINT16 handle, bnepu_send_peer_our_multi_filters (p_bcb); return (BNEP_SUCCESS); -#else - return (BNEP_SET_FILTER_FAIL); -#endif } /******************************************************************************* |