From ad2d45b15aae80ba254277c3d1fa036207d8b926 Mon Sep 17 00:00:00 2001 From: Matthew Xie Date: Tue, 18 Sep 2012 16:14:30 -0700 Subject: Revert "Header file and whitespace cleanups" This reverts commit cc914cffd521b2e6e1be804c82aea2388b843ebf More changes in the original CL after my cherry-pick. Change-Id: Ic144dba96aeb8a60611baac7565c9f628ab8f9eb --- bta/ag/bta_ag_sco.c | 138 ++++++++++++++++++++++++++-------------------------- 1 file changed, 69 insertions(+), 69 deletions(-) (limited to 'bta/ag/bta_ag_sco.c') diff --git a/bta/ag/bta_ag_sco.c b/bta/ag/bta_ag_sco.c index dd3a971..021b96c 100644 --- a/bta/ag/bta_ag_sco.c +++ b/bta/ag/bta_ag_sco.c @@ -13,7 +13,7 @@ #include "bta_api.h" #include "bta_ag_api.h" #include "bta_ag_co.h" -#if (BTM_SCO_HCI_INCLUDED == TRUE ) +#if (BTM_SCO_HCI_INCLUDED == TRUE ) #include "bta_dm_co.h" #endif #include "bta_ag_int.h" @@ -112,7 +112,7 @@ static const tBTM_ESCO_PARAMS bta_ag_esco_params = ** Function bta_ag_sco_conn_cback ** ** Description BTM SCO connection callback. -** +** ** ** Returns void ** @@ -148,7 +148,7 @@ static void bta_ag_sco_conn_cback(UINT16 sco_idx) } } /* no match found; disconnect sco, init sco variables */ - else + else { bta_ag_cb.sco.p_curr_scb = NULL; bta_ag_cb.sco.state = BTA_AG_SCO_SHUTDOWN_ST; @@ -161,7 +161,7 @@ static void bta_ag_sco_conn_cback(UINT16 sco_idx) ** Function bta_ag_sco_disc_cback ** ** Description BTM SCO disconnection callback. -** +** ** ** Returns void ** @@ -192,10 +192,10 @@ static void bta_ag_sco_disc_cback(UINT16 sco_idx) if (handle != 0) { -#if (BTM_SCO_HCI_INCLUDED == TRUE ) +#if (BTM_SCO_HCI_INCLUDED == TRUE ) tBTM_STATUS status = BTM_ConfigScoPath(BTM_SCO_ROUTE_PCM, NULL, NULL, TRUE); APPL_TRACE_DEBUG1("bta_ag_sco_disc_cback sco close config status = %d", status); - /* SCO clean up here */ + /* SCO clean up here */ bta_dm_sco_co_close(); #endif @@ -225,7 +225,7 @@ static void bta_ag_sco_disc_cback(UINT16 sco_idx) } } /* no match found */ - else + else { APPL_TRACE_DEBUG0("no scb for ag_sco_disc_cback"); @@ -255,7 +255,7 @@ static void bta_ag_sco_read_cback (UINT16 sco_inx, BT_HDR *p_data, tBTM_SCO_DATA { APPL_TRACE_DEBUG1("bta_ag_sco_read_cback: status(%d)", status); } - + /* Callout function must free the data. */ bta_dm_sco_co_in_data (p_data, status); } @@ -279,10 +279,10 @@ static BOOLEAN bta_ag_remove_sco(tBTA_AG_SCB *p_scb, BOOLEAN only_active) { if (!only_active || p_scb->sco_idx == bta_ag_cb.sco.cur_idx) { - status = BTM_RemoveSco(p_scb->sco_idx); + status = BTM_RemoveSco(p_scb->sco_idx); APPL_TRACE_DEBUG2("ag remove sco: inx 0x%04x, status:0x%x", p_scb->sco_idx, status); - + if (status == BTM_CMD_STARTED) { /* Sco is connected; set current control block */ @@ -324,13 +324,13 @@ static void bta_ag_esco_connreq_cback(tBTM_ESCO_EVT event, tBTM_ESCO_EVT_DATA *p ((p_scb = bta_ag_scb_by_idx(handle)) != NULL) && p_scb->svc_conn) { p_scb->sco_idx = sco_inx; - + /* If no other SCO active, allow this one */ if (!bta_ag_cb.sco.p_curr_scb) { APPL_TRACE_EVENT1("bta_ag_esco_connreq_cback: Accept Conn Request (sco_inx 0x%04x)", sco_inx); bta_ag_sco_conn_rsp(p_scb, &p_data->conn_evt); - + bta_ag_cb.sco.state = BTA_AG_SCO_OPENING_ST; bta_ag_cb.sco.p_curr_scb = p_scb; bta_ag_cb.sco.cur_idx = p_scb->sco_idx; @@ -364,7 +364,7 @@ static void bta_ag_esco_connreq_cback(tBTM_ESCO_EVT event, tBTM_ESCO_EVT_DATA *p { APPL_TRACE_EVENT5("eSCO change event (inx %d): rtrans %d, rxlen %d, txlen %d, txint %d", p_data->chg_evt.sco_inx, - p_data->chg_evt.retrans_window, p_data->chg_evt.rx_pkt_len, + p_data->chg_evt.retrans_window, p_data->chg_evt.rx_pkt_len, p_data->chg_evt.tx_pkt_len, p_data->chg_evt.tx_interval); } } @@ -374,7 +374,7 @@ static void bta_ag_esco_connreq_cback(tBTM_ESCO_EVT event, tBTM_ESCO_EVT_DATA *p ** Function bta_ag_cback_sco ** ** Description Call application callback function with SCO event. -** +** ** ** Returns void ** @@ -394,8 +394,8 @@ static void bta_ag_cback_sco(tBTA_AG_SCB *p_scb, UINT8 event) ** ** Function bta_ag_create_sco ** -** Description -** +** Description +** ** ** Returns void ** @@ -418,13 +418,13 @@ static void bta_ag_create_sco(tBTA_AG_SCB *p_scb, BOOLEAN is_orig) /* Make sure this sco handle is not already in use */ if (p_scb->sco_idx != BTM_INVALID_SCO_INDEX) { - APPL_TRACE_WARNING1("bta_ag_create_sco: Index 0x%04x Already In Use!", + APPL_TRACE_WARNING1("bta_ag_create_sco: Index 0x%04x Already In Use!", p_scb->sco_idx); return; } #if (BTM_WBS_INCLUDED == TRUE ) - if ((p_scb->sco_codec == BTM_SCO_CODEC_MSBC) && + if ((p_scb->sco_codec == BTM_SCO_CODEC_MSBC) && !p_scb->codec_fallback && !p_scb->retry_with_sco_only) esco_codec = BTM_SCO_CODEC_MSBC; @@ -439,9 +439,9 @@ static void bta_ag_create_sco(tBTA_AG_SCB *p_scb, BOOLEAN is_orig) if (esco_codec == BTM_SCO_CODEC_MSBC) codec_index = esco_codec - 1; - + params = bta_ag_esco_params[codec_index]; -#else +#else params = bta_ag_esco_params; #endif @@ -453,7 +453,7 @@ static void bta_ag_create_sco(tBTA_AG_SCB *p_scb, BOOLEAN is_orig) #if (BTM_WBS_INCLUDED == TRUE) if (!codec_index) /* For non-WBS */ #endif - { + { /* Use the application packet types (5 slot EV packets not allowed) */ params.packet_types = p_bta_ag_cfg->sco_pkt_types | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | @@ -468,10 +468,10 @@ static void bta_ag_create_sco(tBTA_AG_SCB *p_scb, BOOLEAN is_orig) /* Need to find out from SIG if HSP can use eSCO; for now use SCO */ if (p_scb->conn_service == BTA_AG_HFP && p_scb->peer_version >= HFP_VERSION_1_5 && !p_scb->retry_with_sco_only) { - + BTM_SetEScoMode(BTM_LINK_TYPE_ESCO, ¶ms); /* If ESCO or EDR ESCO, retry with SCO only in case of failure */ - if((params.packet_types & BTM_ESCO_LINK_ONLY_MASK) + if((params.packet_types & BTM_ESCO_LINK_ONLY_MASK) ||!((params.packet_types & ~(BTM_ESCO_LINK_ONLY_MASK | BTM_SCO_LINK_ONLY_MASK)) ^ BTA_AG_NO_EDR_ESCO)) { #if (BTM_WBS_INCLUDED == TRUE ) @@ -485,7 +485,7 @@ static void bta_ag_create_sco(tBTA_AG_SCB *p_scb, BOOLEAN is_orig) p_scb->retry_with_sco_only = FALSE; APPL_TRACE_API0("Setting retry_with_sco_only to FALSE"); } -#else +#else p_scb->retry_with_sco_only = TRUE; APPL_TRACE_API0("Setting retry_with_sco_only to TRUE"); #endif @@ -496,7 +496,7 @@ static void bta_ag_create_sco(tBTA_AG_SCB *p_scb, BOOLEAN is_orig) if(p_scb->retry_with_sco_only) APPL_TRACE_API0("retrying with SCO only"); p_scb->retry_with_sco_only = FALSE; - + BTM_SetEScoMode(BTM_LINK_TYPE_SCO, ¶ms); } @@ -518,7 +518,7 @@ static void bta_ag_create_sco(tBTA_AG_SCB *p_scb, BOOLEAN is_orig) sco_route = bta_dm_sco_co_init(pcm_sample_rate, pcm_sample_rate, &codec_info, p_scb->app_id); #endif - + #if (BTM_WBS_INCLUDED == TRUE ) if (esco_codec == BTA_AG_CODEC_MSBC) { @@ -534,7 +534,7 @@ static void bta_ag_create_sco(tBTA_AG_SCB *p_scb, BOOLEAN is_orig) if (esco_codec == BTA_AG_CODEC_MSBC) BTM_WriteVoiceSettings (BTM_VOICE_SETTING_TRANS); else - BTM_WriteVoiceSettings (BTM_VOICE_SETTING_CVSD); + BTM_WriteVoiceSettings (BTM_VOICE_SETTING_CVSD); /* save the current codec because sco_codec can be updated while SCO is open. */ p_scb->inuse_codec = esco_codec; @@ -575,10 +575,10 @@ static void bta_ag_create_sco(tBTA_AG_SCB *p_scb, BOOLEAN is_orig) ** ** Function bta_ag_cn_timer_cback ** -** Description -** +** Description +** ** -** Returns void +** Returns void ** *******************************************************************************/ static void bta_ag_cn_timer_cback (TIMER_LIST_ENT *p_tle) @@ -613,7 +613,7 @@ static void bta_ag_cn_timer_cback (TIMER_LIST_ENT *p_tle) void bta_ag_codec_negotiate(tBTA_AG_SCB *p_scb) { bta_ag_cb.sco.p_curr_scb = p_scb; - + if (p_scb->codec_updated || p_scb->codec_fallback) { /* Change the power mode to Active until sco open is completed. */ @@ -639,8 +639,8 @@ void bta_ag_codec_negotiate(tBTA_AG_SCB *p_scb) ** ** Function bta_ag_sco_event ** -** Description -** +** Description +** ** ** Returns void ** @@ -659,7 +659,7 @@ static void bta_ag_sco_event(tBTA_AG_SCB *p_scb, UINT8 event) APPL_TRACE_EVENT5("BTA ag sco evt (hdl 0x%04x): State %d (%s), Event %d (%s)", p_scb->sco_idx, - p_sco->state, bta_ag_sco_state_str(p_sco->state), + p_sco->state, bta_ag_sco_state_str(p_sco->state), event, bta_ag_sco_evt_str(event)); #else APPL_TRACE_EVENT3("BTA ag sco evt (hdl 0x%04x): State %d, Event %d", @@ -758,7 +758,7 @@ static void bta_ag_sco_event(tBTA_AG_SCB *p_scb, UINT8 event) break; } break; - + #if (BTM_WBS_INCLUDED == TRUE ) case BTA_AG_SCO_CODEC_ST: switch (event) @@ -938,7 +938,7 @@ static void bta_ag_sco_event(tBTA_AG_SCB *p_scb, UINT8 event) bta_ag_create_sco(p_scb, FALSE); /* Back into listen mode */ /* Accept sco connection with xfer scb */ - bta_ag_sco_conn_rsp(p_sco->p_xfer_scb, &p_sco->conn_data); + bta_ag_sco_conn_rsp(p_sco->p_xfer_scb, &p_sco->conn_data); p_sco->state = BTA_AG_SCO_OPENING_ST; p_sco->p_curr_scb = p_sco->p_xfer_scb; p_sco->cur_idx = p_sco->p_xfer_scb->sco_idx; @@ -1067,7 +1067,7 @@ static void bta_ag_sco_event(tBTA_AG_SCB *p_scb, UINT8 event) /* start codec negotiation */ p_sco->state = BTA_AG_SCO_CODEC_ST; p_cn_scb = p_scb; -#else +#else /* open sco connection */ bta_ag_create_sco(p_scb, TRUE); p_sco->state = BTA_AG_SCO_OPENING_ST; @@ -1092,7 +1092,7 @@ static void bta_ag_sco_event(tBTA_AG_SCB *p_scb, UINT8 event) switch (event) { case BTA_AG_SCO_CONN_OPEN_E: - /* close sco connection so headset can be transferred + /* close sco connection so headset can be transferred Probably entered this state from "opening state" */ bta_ag_remove_sco(p_scb, TRUE); break; @@ -1123,7 +1123,7 @@ static void bta_ag_sco_event(tBTA_AG_SCB *p_scb, UINT8 event) p_sco->state = BTA_AG_SCO_CODEC_ST; p_cn_scb = p_sco->p_xfer_scb; p_sco->p_xfer_scb = NULL; -#else +#else /* create sco connection to peer */ bta_ag_create_sco(p_sco->p_xfer_scb, TRUE); p_sco->p_xfer_scb = NULL; @@ -1193,7 +1193,7 @@ static void bta_ag_sco_event(tBTA_AG_SCB *p_scb, UINT8 event) break; } break; - + default: break; } @@ -1220,7 +1220,7 @@ static void bta_ag_sco_event(tBTA_AG_SCB *p_scb, UINT8 event) ** Function bta_ag_sco_is_open ** ** Description Check if sco is open for this scb. -** +** ** ** Returns TRUE if sco open for this scb, FALSE otherwise. ** @@ -1236,7 +1236,7 @@ BOOLEAN bta_ag_sco_is_open(tBTA_AG_SCB *p_scb) ** Function bta_ag_sco_is_opening ** ** Description Check if sco is in Opening state. -** +** ** ** Returns TRUE if sco is in Opening state for this scb, FALSE otherwise. ** @@ -1244,7 +1244,7 @@ BOOLEAN bta_ag_sco_is_open(tBTA_AG_SCB *p_scb) BOOLEAN bta_ag_sco_is_opening(tBTA_AG_SCB *p_scb) { #if (BTM_WBS_INCLUDED == TRUE ) - return (((bta_ag_cb.sco.state == BTA_AG_SCO_OPENING_ST) || + return (((bta_ag_cb.sco.state == BTA_AG_SCO_OPENING_ST) || (bta_ag_cb.sco.state == BTA_AG_SCO_OPENING_ST)) && (bta_ag_cb.sco.p_curr_scb == p_scb)); #else @@ -1257,8 +1257,8 @@ BOOLEAN bta_ag_sco_is_opening(tBTA_AG_SCB *p_scb) ** ** Function bta_ag_sco_listen ** -** Description -** +** Description +** ** ** Returns void ** @@ -1272,8 +1272,8 @@ void bta_ag_sco_listen(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data) ** ** Function bta_ag_sco_open ** -** Description -** +** Description +** ** ** Returns void ** @@ -1300,8 +1300,8 @@ void bta_ag_sco_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data) ** ** Function bta_ag_sco_close ** -** Description -** +** Description +** ** ** Returns void ** @@ -1309,7 +1309,7 @@ void bta_ag_sco_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data) void bta_ag_sco_close(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data) { /* if scb is in use */ -#if (BTM_WBS_INCLUDED == TRUE ) +#if (BTM_WBS_INCLUDED == TRUE ) /* sco_idx is not allocated in SCO_CODEC_ST, we still need to move to listening state. */ if ((p_scb->sco_idx != BTM_INVALID_SCO_INDEX) || (bta_ag_cb.sco.state == BTA_AG_SCO_CODEC_ST)) #else @@ -1327,8 +1327,8 @@ void bta_ag_sco_close(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data) ** ** Function bta_ag_sco_codec_nego ** -** Description -** +** Description +** ** ** Returns void ** @@ -1339,7 +1339,7 @@ void bta_ag_sco_codec_nego(tBTA_AG_SCB *p_scb, BOOLEAN result) { /* Subsequent sco connection will skip codec negotiation */ p_scb->codec_updated = FALSE; - + bta_ag_sco_event(p_scb, BTA_AG_SCO_CN_DONE_E); } else /* codec negotiation failed */ @@ -1351,8 +1351,8 @@ void bta_ag_sco_codec_nego(tBTA_AG_SCB *p_scb, BOOLEAN result) ** ** Function bta_ag_sco_shutdown ** -** Description -** +** Description +** ** ** Returns void ** @@ -1366,8 +1366,8 @@ void bta_ag_sco_shutdown(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data) ** ** Function bta_ag_sco_conn_open ** -** Description -** +** Description +** ** ** Returns void ** @@ -1395,8 +1395,8 @@ void bta_ag_sco_conn_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data) ** ** Function bta_ag_sco_conn_close ** -** Description -** +** Description +** ** ** Returns void ** @@ -1428,7 +1428,7 @@ void bta_ag_sco_conn_close(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data) bta_ag_create_sco(p_scb, TRUE); } #endif - else + else { /* Indicate if the closing of audio is because of transfer */ if (bta_ag_cb.sco.p_xfer_scb) @@ -1452,14 +1452,14 @@ void bta_ag_sco_conn_close(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data) bta_ag_cback_sco(p_scb, BTA_AG_AUDIO_CLOSE_EVT); } p_scb->retry_with_sco_only = FALSE; -} +} /******************************************************************************* ** ** Function bta_ag_sco_conn_rsp ** ** Description Process the SCO connection request -** +** ** ** Returns void ** @@ -1500,7 +1500,7 @@ void bta_ag_sco_conn_rsp(tBTA_AG_SCB *p_scb, tBTM_ESCO_CONN_REQ_EVT_DATA *p_data } else /* Allow controller to use all types available except 5-slot EDR */ { - resp.packet_types = (BTM_SCO_LINK_ALL_PKT_MASK | + resp.packet_types = (BTM_SCO_LINK_ALL_PKT_MASK | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5); } @@ -1521,10 +1521,10 @@ void bta_ag_sco_conn_rsp(tBTA_AG_SCB *p_scb, tBTM_ESCO_CONN_REQ_EVT_DATA *p_data pcm_sample_rate = BTA_DM_SCO_SAMP_RATE_8K; /* initialize SCO setup, no voice setting for AG, data rate <==> sample rate */ - BTM_ConfigScoPath(bta_dm_sco_co_init(pcm_sample_rate, pcm_sample_rate, &codec_info, p_scb->app_id), + BTM_ConfigScoPath(bta_dm_sco_co_init(pcm_sample_rate, pcm_sample_rate, &codec_info, p_scb->app_id), bta_ag_sco_read_cback, NULL, TRUE); #endif - } + } else hci_status = HCI_ERR_HOST_REJECT_DEVICE; @@ -1532,7 +1532,7 @@ void bta_ag_sco_conn_rsp(tBTA_AG_SCB *p_scb, tBTM_ESCO_CONN_REQ_EVT_DATA *p_data /* If SCO open was initiated from HS, it must be CVSD */ p_scb->inuse_codec = BTA_AG_CODEC_NONE; #endif - + BTM_EScoConnRsp(p_data->sco_inx, hci_status, &resp); } @@ -1541,14 +1541,14 @@ void bta_ag_sco_conn_rsp(tBTA_AG_SCB *p_scb, tBTM_ESCO_CONN_REQ_EVT_DATA *p_data ** Function bta_ag_ci_sco_data ** ** Description Process the SCO data ready callin event -** +** ** ** Returns void ** *******************************************************************************/ void bta_ag_ci_sco_data(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data) { -#if (BTM_SCO_HCI_INCLUDED == TRUE ) +#if (BTM_SCO_HCI_INCLUDED == TRUE ) bta_ag_sco_event(p_scb, BTA_AG_SCO_CI_DATA_E); #endif } @@ -1558,7 +1558,7 @@ void bta_ag_ci_sco_data(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data) ** Function bta_ag_set_esco_param ** ** Description Update esco parameters from script wrapper. -** +** ** ** Returns void ** -- cgit v1.1