diff options
| author | Matthew Xie <mattx@google.com> | 2012-09-18 16:19:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-18 16:19:53 -0700 |
| commit | f80d3d045eab5f002be4b5e8a3d2d376fdf7581a (patch) | |
| tree | 4a1f17241e1af019e8d3328852bf93423258a23c /stack/btm/btm_ble_int.h | |
| parent | d659d3ca8cbb1edc5d1dd42ef367e9336f0f269b (diff) | |
| parent | ad2d45b15aae80ba254277c3d1fa036207d8b926 (diff) | |
| download | external_bluetooth_bluedroid-f80d3d045eab5f002be4b5e8a3d2d376fdf7581a.zip external_bluetooth_bluedroid-f80d3d045eab5f002be4b5e8a3d2d376fdf7581a.tar.gz external_bluetooth_bluedroid-f80d3d045eab5f002be4b5e8a3d2d376fdf7581a.tar.bz2 | |
Merge "Revert "Header file and whitespace cleanups"" into jb-mr1-dev
Diffstat (limited to 'stack/btm/btm_ble_int.h')
| -rw-r--r-- | stack/btm/btm_ble_int.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/stack/btm/btm_ble_int.h b/stack/btm/btm_ble_int.h index 29d231f..b03e124 100644 --- a/stack/btm/btm_ble_int.h +++ b/stack/btm/btm_ble_int.h @@ -61,7 +61,7 @@ #define BTM_BLE_SEC_REQ_ACT_NONE 0 #define BTM_BLE_SEC_REQ_ACT_ENCRYPT 1 /* encrypt the link using current key or key refresh */ -#define BTM_BLE_SEC_REQ_ACT_PAIR 2 +#define BTM_BLE_SEC_REQ_ACT_PAIR 2 #define BTM_BLE_SEC_REQ_ACT_DISCARD 3 /* discard the sec request while encryption is started but not completed */ typedef UINT8 tBTM_BLE_SEC_REQ_ACT; @@ -121,7 +121,7 @@ typedef struct UINT8 max_bd_entries; tBLE_BD_ADDR local_bda; - + tBTM_BLE_LOCAL_ADV_DATA adv_data; tBTM_BLE_ADV_CHNL_MAP adv_chnl_map; @@ -180,19 +180,19 @@ typedef struct #define BLE_BG_CONN_IDLE 0 #define BLE_BG_CONN_ACTIVE 1 #define BLE_BG_CONN_SUSPEND 2 - + UINT8 bg_conn_state; /* random address management control block */ tBTM_LE_RANDOM_CB addr_mgnt_cb; - + /* white list information */ UINT8 num_empty_filter; /* Number of entries in white list */ UINT8 max_filter_entries; /* Maximum number of entries that can be stored */ BOOLEAN enabled; BOOLEAN privacy; /* privacy enabled or disabled */ -#ifdef BTM_BLE_PC_ADV_TEST_MODE +#ifdef BTM_BLE_PC_ADV_TEST_MODE tBTM_BLE_SCAN_REQ_CBACK *p_scan_req_cback; #endif |