diff options
Diffstat (limited to 'bta/ag')
-rwxr-xr-x[-rw-r--r--] | bta/ag/bta_ag_act.c | 8 | ||||
-rw-r--r-- | bta/ag/bta_ag_cmd.c | 6 | ||||
-rw-r--r-- | bta/ag/bta_ag_main.c | 27 | ||||
-rw-r--r-- | bta/ag/bta_ag_rfc.c | 2 | ||||
-rw-r--r-- | bta/ag/bta_ag_sco.c | 34 |
5 files changed, 41 insertions, 36 deletions
diff --git a/bta/ag/bta_ag_act.c b/bta/ag/bta_ag_act.c index 4e446a725..81dfa3b78 100644..100755 --- a/bta/ag/bta_ag_act.c +++ b/bta/ag/bta_ag_act.c @@ -555,7 +555,7 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data) /* set role */ p_scb->role = BTA_AG_ACP; - APPL_TRACE_DEBUG ("bta_ag_rfc_acp_open: serv_handle0 = %d serv_handle1 = %d", + APPL_TRACE_IMP ("bta_ag_rfc_acp_open: serv_handle0 = %d serv_handle1 = %d", p_scb->serv_handle[0], p_scb->serv_handle[1]); /* get bd addr of peer */ @@ -612,7 +612,7 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data) } } - APPL_TRACE_DEBUG ("bta_ag_rfc_acp_open: conn_service = %d conn_handle = %d", + APPL_TRACE_IMP ("bta_ag_rfc_acp_open: conn_service = %d conn_handle = %d", p_scb->conn_service, p_scb->conn_handle); /* close any unopened server */ @@ -667,7 +667,7 @@ void bta_ag_rfc_data(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data) bta_ag_at_parse(&p_scb->at_cb, buf, len); if ((p_scb->sco_idx != BTM_INVALID_SCO_INDEX) && bta_ag_sco_is_open(p_scb)) { - APPL_TRACE_DEBUG ("bta_ag_rfc_data, change link policy for SCO"); + APPL_TRACE_IMP("bta_ag_rfc_data, change link policy for SCO"); bta_sys_sco_open(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr); } else @@ -865,7 +865,7 @@ void bta_ag_ci_rx_data(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data) PORT_WriteData(p_scb->conn_handle, p_data_area, strlen(p_data_area), &len); if ((p_scb->sco_idx != BTM_INVALID_SCO_INDEX) && bta_ag_sco_is_open(p_scb)) { - APPL_TRACE_DEBUG ("bta_ag_rfc_data, change link policy for SCO"); + APPL_TRACE_IMP("bta_ag_rfc_data, change link policy for SCO"); bta_sys_sco_open(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr); } else diff --git a/bta/ag/bta_ag_cmd.c b/bta/ag/bta_ag_cmd.c index cc162d208..a956422ce 100644 --- a/bta/ag/bta_ag_cmd.c +++ b/bta/ag/bta_ag_cmd.c @@ -385,7 +385,7 @@ static void bta_ag_send_result(tBTA_AG_SCB *p_scb, UINT8 code, char *p_arg, *p++ = '\n'; #if defined(BTA_AG_RESULT_DEBUG) && (BTA_AG_RESULT_DEBUG == TRUE) - APPL_TRACE_DEBUG("bta_ag_send_result: %s", buf); + APPL_TRACE_IMP("bta_ag_send_result: %s", buf); #endif /* send to RFCOMM */ @@ -885,7 +885,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB *p_scb, UINT16 cmd, UINT8 arg_type, return; } - APPL_TRACE_DEBUG("HFP AT cmd:%d arg_type:%d arg:%d arg:%s", cmd, arg_type, + APPL_TRACE_IMP("HFP AT cmd:%d arg_type:%d arg:%d arg:%s", cmd, arg_type, int_arg, p_arg); val.hdr.handle = bta_ag_scb_to_idx(p_scb); @@ -1460,7 +1460,7 @@ void bta_ag_hfp_result(tBTA_AG_SCB *p_scb, tBTA_AG_API_RESULT *p_result) { UINT8 code = bta_ag_trans_result[p_result->result]; - APPL_TRACE_DEBUG("bta_ag_hfp_result : res = %d", p_result->result); + APPL_TRACE_IMP("bta_ag_hfp_result : res = %d", p_result->result); switch(p_result->result) { diff --git a/bta/ag/bta_ag_main.c b/bta/ag/bta_ag_main.c index b5501916d..b74fc4828 100644 --- a/bta/ag/bta_ag_main.c +++ b/bta/ag/bta_ag_main.c @@ -805,7 +805,7 @@ static void bta_ag_api_result(tBTA_AG_DATA *p_data) { if ((p_scb = bta_ag_scb_by_idx(p_data->hdr.layer_specific)) != NULL) { - APPL_TRACE_DEBUG("bta_ag_api_result: p_scb 0x%08x ", p_scb); + APPL_TRACE_IMP("bta_ag_api_result: p_scb 0x%08x ", p_scb); bta_ag_sm_execute(p_scb, BTA_AG_API_RESULT_EVT, p_data); } } @@ -837,23 +837,21 @@ void bta_ag_sm_execute(tBTA_AG_SCB *p_scb, UINT16 event, tBTA_AG_DATA *p_data) tBTA_AG_ST_TBL state_table; UINT8 action; int i; - -#if BTA_AG_DEBUG == TRUE UINT16 in_event = event; UINT8 in_state = p_scb->state; - /* Ignore displaying of AT results when not connected (Ignored in state machine) */ if (in_event != BTA_AG_API_RESULT_EVT || p_scb->state == BTA_AG_OPEN_ST) { - APPL_TRACE_EVENT("AG evt (hdl 0x%04x): State %d (%s), Event 0x%04x (%s)", + #if BTA_AG_DEBUG == TRUE + APPL_TRACE_IMP("AG evt (hdl 0x%04x): State %d (%s), Event 0x%04x (%s)", bta_ag_scb_to_idx(p_scb), p_scb->state, bta_ag_state_str(p_scb->state), event, bta_ag_evt_str(event, p_data->api_result.result)); + #else + APPL_TRACE_IMP("AG evt (hdl 0x%04x): State %d, Event 0x%04x", + bta_ag_scb_to_idx(p_scb), p_scb->state, event); + #endif } -#else - APPL_TRACE_EVENT("AG evt (hdl 0x%04x): State %d, Event 0x%04x", - bta_ag_scb_to_idx(p_scb), p_scb->state, event); -#endif event &= 0x00FF; if (event >= (BTA_AG_MAX_EVT & 0x00FF)) @@ -880,15 +878,18 @@ void bta_ag_sm_execute(tBTA_AG_SCB *p_scb, UINT16 event, tBTA_AG_DATA *p_data) break; } } -#if BTA_AG_DEBUG == TRUE if (p_scb->state != in_state) { - APPL_TRACE_EVENT("BTA AG State Change: [%s] -> [%s] after Event [%s]", + #if BTA_AG_DEBUG == TRUE + APPL_TRACE_IMP("BTA AG State Change: [%s] -> [%s] after Event [%s]", bta_ag_state_str(in_state), bta_ag_state_str(p_scb->state), bta_ag_evt_str(in_event, p_data->api_result.result)); + #else + APPL_TRACE_IMP("BTA AG State Change: [%d] -> [%d]", + in_state, p_scb->state); + #endif } -#endif } /******************************************************************************* @@ -932,7 +933,7 @@ BOOLEAN bta_ag_hdl_event(BT_HDR *p_msg) default: if ((p_scb = bta_ag_scb_by_idx(p_msg->layer_specific)) != NULL) { - APPL_TRACE_DEBUG("bta_ag_hdl_event: p_scb 0x%08x ", p_scb); + APPL_TRACE_IMP("bta_ag_hdl_event: p_scb 0x%08x ", p_scb); bta_ag_sm_execute(p_scb, p_msg->event, (tBTA_AG_DATA *) p_msg); } break; diff --git a/bta/ag/bta_ag_rfc.c b/bta/ag/bta_ag_rfc.c index 9018b75e3..eadd559c7 100644 --- a/bta/ag/bta_ag_rfc.c +++ b/bta/ag/bta_ag_rfc.c @@ -381,7 +381,7 @@ void bta_ag_rfc_do_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data) bta_ag_mgmt_cback_tbl[bta_ag_scb_to_idx(p_scb) - 1]) == PORT_SUCCESS) { bta_ag_setup_port(p_scb, p_scb->conn_handle); - APPL_TRACE_DEBUG("bta_ag_rfc_do_open : conn_handle = %d", p_scb->conn_handle); + APPL_TRACE_IMP("bta_ag_rfc_do_open : conn_handle = %d", p_scb->conn_handle); } /* RFCOMM create connection failed; send ourselves RFCOMM close event */ else diff --git a/bta/ag/bta_ag_sco.c b/bta/ag/bta_ag_sco.c index e612f7790..6e02efcf9 100644 --- a/bta/ag/bta_ag_sco.c +++ b/bta/ag/bta_ag_sco.c @@ -203,7 +203,7 @@ static void bta_ag_sco_disc_cback(UINT16 sco_idx) BT_HDR *p_buf; UINT16 handle = 0; - APPL_TRACE_DEBUG ("bta_ag_sco_disc_cback(): sco_idx: 0x%x p_cur_scb: 0x%08x sco.state: %d", sco_idx, bta_ag_cb.sco.p_curr_scb, bta_ag_cb.sco.state); + APPL_TRACE_IMP("bta_ag_sco_disc_cback(): sco_idx: 0x%x p_cur_scb: 0x%08x sco.state: %d", sco_idx, bta_ag_cb.sco.p_curr_scb, bta_ag_cb.sco.state); APPL_TRACE_DEBUG ("bta_ag_sco_disc_cback(): scb[0] addr: 0x%08x in_use: %u sco_idx: 0x%x sco state: %u", &bta_ag_cb.scb[0], bta_ag_cb.scb[0].in_use, bta_ag_cb.scb[0].sco_idx, bta_ag_cb.scb[0].state); @@ -328,7 +328,7 @@ static BOOLEAN bta_ag_remove_sco(tBTA_AG_SCB *p_scb, BOOLEAN only_active) { status = BTM_RemoveSco(p_scb->sco_idx); - APPL_TRACE_DEBUG("ag remove sco: inx 0x%04x, status:0x%x", p_scb->sco_idx, status); + APPL_TRACE_IMP("ag remove sco: inx 0x%04x, status:0x%x", p_scb->sco_idx, status); if (status == BTM_CMD_STARTED) { @@ -375,7 +375,7 @@ static void bta_ag_esco_connreq_cback(tBTM_ESCO_EVT event, tBTM_ESCO_EVT_DATA *p /* If no other SCO active, allow this one */ if (!bta_ag_cb.sco.p_curr_scb) { - APPL_TRACE_EVENT("bta_ag_esco_connreq_cback: Accept Conn Request (sco_inx 0x%04x)", sco_inx); + APPL_TRACE_IMP("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; @@ -384,7 +384,7 @@ static void bta_ag_esco_connreq_cback(tBTM_ESCO_EVT event, tBTM_ESCO_EVT_DATA *p } else /* Begin a transfer: Close current SCO before responding */ { - APPL_TRACE_DEBUG("bta_ag_esco_connreq_cback: Begin XFER"); + APPL_TRACE_IMP("bta_ag_esco_connreq_cback: Begin XFER"); bta_ag_cb.sco.p_xfer_scb = p_scb; bta_ag_cb.sco.conn_data = p_data->conn_evt; bta_ag_cb.sco.state = BTA_AG_SCO_OPEN_XFER_ST; @@ -622,7 +622,7 @@ static void bta_ag_create_sco(tBTA_AG_SCB *p_scb, BOOLEAN is_orig) } } - APPL_TRACE_API("ag create sco: orig %d, inx 0x%04x, status 0x%x, pkt types 0x%04x", + APPL_TRACE_IMP("ag create sco: orig %d, inx 0x%04x, status 0x%x, pkt types 0x%04x", is_orig, p_scb->sco_idx, status, params.packet_types); } @@ -732,15 +732,15 @@ static void bta_ag_sco_event(tBTA_AG_SCB *p_scb, UINT8 event) #if (BTM_SCO_HCI_INCLUDED == TRUE ) BT_HDR *p_buf; #endif -#if BTA_AG_SCO_DEBUG == TRUE UINT8 in_state = p_sco->state; - APPL_TRACE_EVENT("BTA ag sco evt (hdl 0x%04x): State %d (%s), Event %d (%s)", +#if BTA_AG_SCO_DEBUG == TRUE + APPL_TRACE_IMP("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), event, bta_ag_sco_evt_str(event)); #else - APPL_TRACE_EVENT("BTA ag sco evt (hdl 0x%04x): State %d, Event %d", + APPL_TRACE_IMP("BTA ag sco evt (hdl 0x%04x): State %d, Event %d", p_scb->sco_idx, p_sco->state, event); #endif @@ -1316,15 +1316,19 @@ static void bta_ag_sco_event(tBTA_AG_SCB *p_scb, UINT8 event) default: break; } -#if BTA_AG_SCO_DEBUG == TRUE + if (p_sco->state != in_state) { - APPL_TRACE_EVENT("BTA AG SCO State Change: [%s] -> [%s] after Event [%s]", - bta_ag_sco_state_str(in_state), - bta_ag_sco_state_str(p_sco->state), - bta_ag_sco_evt_str(event)); + #if BTA_AG_SCO_DEBUG == TRUE + APPL_TRACE_IMP("BTA AG SCO State Change: [%s] -> [%s] after Event [%s]", + bta_ag_sco_state_str(in_state), + bta_ag_sco_state_str(p_sco->state), + bta_ag_sco_evt_str(event)); + #else + APPL_TRACE_IMP("BTA AG SCO State Change: [%d] -> [%d] after Event [%d]", + in_state, p_sco->state, event); + #endif } -#endif #if (BTM_WBS_INCLUDED == TRUE ) if (p_cn_scb) @@ -1439,7 +1443,7 @@ void bta_ag_sco_close(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data) if (p_scb->sco_idx != BTM_INVALID_SCO_INDEX) #endif { - APPL_TRACE_DEBUG("bta_ag_sco_close: sco_inx = %d", p_scb->sco_idx); + APPL_TRACE_IMP("bta_ag_sco_close: sco_inx = %d", p_scb->sco_idx); bta_ag_sco_event(p_scb, BTA_AG_SCO_CLOSE_E); } } |