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/dm/bta_dm_ci.c | |
| 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/dm/bta_dm_ci.c')
| -rw-r--r-- | bta/dm/bta_dm_ci.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/bta/dm/bta_dm_ci.c b/bta/dm/bta_dm_ci.c index c9e979a..b003cbe 100644 --- a/bta/dm/bta_dm_ci.c +++ b/bta/dm/bta_dm_ci.c @@ -28,15 +28,15 @@ ** bta_dm_co_io_req(), if *p_oob_data to BTA_OOB_UNKNOWN ** by bta_dm_co_io_req(). ** -** Returns void +** Returns void ** *******************************************************************************/ void bta_dm_ci_io_req(BD_ADDR bd_addr, tBTA_IO_CAP io_cap, tBTA_OOB_DATA oob_data, tBTA_AUTH_REQ auth_req) { - tBTA_DM_CI_IO_REQ *p_msg; - + tBTA_DM_CI_IO_REQ *p_msg; + if ((p_msg = (tBTA_DM_CI_IO_REQ *) GKI_getbuf(sizeof(tBTA_DM_CI_IO_REQ))) != NULL) { p_msg->hdr.event = BTA_DM_CI_IO_REQ_EVT; @@ -56,13 +56,13 @@ void bta_dm_ci_io_req(BD_ADDR bd_addr, tBTA_IO_CAP io_cap, tBTA_OOB_DATA oob_dat ** bta_dm_co_rmt_oob() to provide the OOB data associated ** with the remote device. ** -** Returns void +** Returns void ** *******************************************************************************/ void bta_dm_ci_rmt_oob(BOOLEAN accept, BD_ADDR bd_addr, BT_OCTET16 c, BT_OCTET16 r) { - tBTA_DM_CI_RMT_OOB *p_msg; - + tBTA_DM_CI_RMT_OOB *p_msg; + if ((p_msg = (tBTA_DM_CI_RMT_OOB *) GKI_getbuf(sizeof(tBTA_DM_CI_RMT_OOB))) != NULL) { p_msg->hdr.event = BTA_DM_CI_RMT_OOB_EVT; @@ -80,15 +80,15 @@ void bta_dm_ci_rmt_oob(BOOLEAN accept, BD_ADDR bd_addr, BT_OCTET16 c, BT_OCTET16 ** ** Function bta_dm_sco_ci_data_ready ** -** Description This function sends an event to indicating that the phone -** has SCO data ready. +** Description This function sends an event to indicating that the phone +** has SCO data ready. ** ** Parameters event: is obtained from bta_dm_sco_co_open() function, which ** is the BTA event we want to send back to BTA module ** when there is encoded data ready. -** sco_handle: is the BTA sco handle which indicate a specific +** sco_handle: is the BTA sco handle which indicate a specific ** SCO connection. -** Returns void +** Returns void ** *******************************************************************************/ void bta_dm_sco_ci_data_ready(UINT16 event, UINT16 sco_handle) |