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 /bta/ag/bta_ag_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 'bta/ag/bta_ag_int.h')
| -rwxr-xr-x[-rw-r--r--] | bta/ag/bta_ag_int.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bta/ag/bta_ag_int.h b/bta/ag/bta_ag_int.h index 0830c64..d953156 100644..100755 --- a/bta/ag/bta_ag_int.h +++ b/bta/ag/bta_ag_int.h @@ -283,14 +283,14 @@ typedef struct typedef struct { tBTM_ESCO_CONN_REQ_EVT_DATA conn_data; /* SCO data for pending conn request */ - tBTA_AG_SCB *p_curr_scb; /* SCB associated with SCO connection */ - tBTA_AG_SCB *p_xfer_scb; /* SCB associated with SCO transfer */ + tBTA_AG_SCB *p_curr_scb; /* SCB associated with SCO connection */ + tBTA_AG_SCB *p_xfer_scb; /* SCB associated with SCO transfer */ UINT16 cur_idx; /* SCO handle */ UINT8 state; /* SCO state variable */ BOOLEAN param_updated; /* if params were updated to non-default */ tBTM_ESCO_PARAMS params; /* ESCO parameters */ } tBTA_AG_SCO_CB; - + /* type for AG control block */ typedef struct @@ -336,7 +336,7 @@ extern BOOLEAN bta_ag_other_scb_open(tBTA_AG_SCB *p_curr_scb); extern tBTA_AG_SCB *bta_ag_get_other_idle_scb (tBTA_AG_SCB *p_curr_scb); extern void bta_ag_sm_execute(tBTA_AG_SCB *p_scb, UINT16 event, tBTA_AG_DATA *p_data); extern BOOLEAN bta_ag_hdl_event(BT_HDR *p_msg); -extern void bta_ag_collision_cback (tBTA_SYS_CONN_STATUS status, UINT8 id, +extern void bta_ag_collision_cback (tBTA_SYS_CONN_STATUS status, UINT8 id, UINT8 app_id, BD_ADDR peer_addr); extern void bta_ag_resume_open (tBTA_AG_SCB *p_scb); |