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/l2cap/l2c_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/l2cap/l2c_int.h')
| -rw-r--r-- | stack/l2cap/l2c_int.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stack/l2cap/l2c_int.h b/stack/l2cap/l2c_int.h index dcbe8dc..0630e12 100644 --- a/stack/l2cap/l2c_int.h +++ b/stack/l2cap/l2c_int.h @@ -293,7 +293,7 @@ typedef struct t_l2c_ccb UINT8 flags; tL2CAP_CFG_INFO our_cfg; /* Our saved configuration options */ - tL2CAP_CH_CFG_BITS peer_cfg_bits; /* Store what peer wants to configure */ + tL2CAP_CH_CFG_BITS peer_cfg_bits; /* Store what peer wants to configure */ tL2CAP_CFG_INFO peer_cfg; /* Peer's saved configuration options */ BUFFER_Q xmit_hold_q; /* Transmit data hold queue */ @@ -332,7 +332,7 @@ typedef struct t_l2c_ccb /*********************************************************************** ** Define a queue of linked CCBs. */ -typedef struct +typedef struct { tL2C_CCB *p_first_ccb; /* The first channel in this queue */ tL2C_CCB *p_last_ccb; /* The last channel in this queue */ @@ -745,7 +745,7 @@ extern void l2c_fcr_stop_timer (tL2C_CCB *p_ccb); #if (BLE_INCLUDED == TRUE) extern BOOLEAN l2cble_create_conn (tL2C_LCB *p_lcb); extern void l2cble_process_sig_cmd (tL2C_LCB *p_lcb, UINT8 *p, UINT16 pkt_len); -extern void l2cble_conn_comp (UINT16 handle, UINT8 role, BD_ADDR bda, tBLE_ADDR_TYPE type, +extern void l2cble_conn_comp (UINT16 handle, UINT8 role, BD_ADDR bda, tBLE_ADDR_TYPE type, UINT16 conn_interval, UINT16 conn_latency, UINT16 conn_timeout); #endif |