Merge "cleanup: Remove BT_USE_TRACES and BT_TRACE_APPL" (f51d6f05) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/av/bta_av_act.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -1967,13 +1967,9 @@ void bta_av_rc_disc_done(tBTA_AV_DATA *p_data)
		{
		rc_handle = bta_av_rc_create(p_cb, AVCT_INT, (uint8_t)(p_scb->hdi + 1), p_lcb->lidx);
		p_cb->rcb[rc_handle].peer_features = peer_features;
		}
		#if (BT_USE_TRACES == TRUE \|\| BT_TRACE_APPL == TRUE)
		else
		{
		} else {
		APPL_TRACE_ERROR("can not find LCB!!");
		}
		#endif
		}
		else if (p_scb->use_rc)
		{

system/bta/hl/bta_hl_main.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@
		#include "mca_defs.h"


		#if (BTA_HL_DEBUG == TRUE && BT_USE_TRACES == TRUE)
		#if (BTA_HL_DEBUG == TRUE)
		static char *bta_hl_cch_state_code(tBTA_HL_CCH_STATE state_code);
		static char *bta_hl_dch_state_code(tBTA_HL_DCH_STATE state_code);
		#endif
		@@ -419,7 +419,7 @@ void bta_hl_cch_sm_execute(uint8_t app_idx, uint8_t mcl_idx,
		int i;
		tBTA_HL_MCL_CB *p_cb = BTA_HL_GET_MCL_CB_PTR(app_idx, mcl_idx);

		#if (BTA_HL_DEBUG == TRUE && BT_USE_TRACES == TRUE)
		#if (BTA_HL_DEBUG == TRUE)
		tBTA_HL_CCH_STATE in_state = p_cb->cch_state;
		uint16_t cur_evt = event;
		APPL_TRACE_DEBUG("HDP CCH Event Handler: State 0x%02x [%s], Event [%s]", in_state,
		@@ -448,7 +448,7 @@ void bta_hl_cch_sm_execute(uint8_t app_idx, uint8_t mcl_idx,
		break;
		}
		}
		#if (BTA_HL_DEBUG == TRUE && BT_USE_TRACES == TRUE)
		#if (BTA_HL_DEBUG == TRUE)
		if (in_state != p_cb->cch_state)
		{
		APPL_TRACE_DEBUG("HL CCH State Change: [%s] -> [%s] after [%s]",
		@@ -477,7 +477,7 @@ void bta_hl_dch_sm_execute(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
		int i;
		tBTA_HL_MDL_CB *p_cb = BTA_HL_GET_MDL_CB_PTR(app_idx, mcl_idx, mdl_idx);

		#if (BTA_HL_DEBUG == TRUE && BT_USE_TRACES == TRUE)
		#if (BTA_HL_DEBUG == TRUE)
		tBTA_HL_DCH_STATE in_state = p_cb->dch_state;
		uint16_t cur_evt = event;
		APPL_TRACE_DEBUG("HDP DCH Event Handler: State 0x%02x [%s], Event [%s]", in_state,
		@@ -507,7 +507,7 @@ void bta_hl_dch_sm_execute(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
		}


		#if (BTA_HL_DEBUG == TRUE && BT_USE_TRACES == TRUE)
		#if (BTA_HL_DEBUG == TRUE)
		if (in_state != p_cb->dch_state)
		{
		APPL_TRACE_DEBUG("HL DCH State Change: [%s] -> [%s] after [%s]",
		@@ -2052,7 +2052,7 @@ bool bta_hl_hdl_event(BT_HDR *p_msg)
		/*****************************************************************************
		** Debug Functions
		*****************************************************************************/
		#if (BTA_HL_DEBUG == TRUE && BT_USE_TRACES == TRUE)
		#if (BTA_HL_DEBUG == TRUE)

		/*******************************************************************************
		**

system/include/bt_target.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -136,10 +136,6 @@
		#define BTA_HOST_INTERLEAVE_SEARCH FALSE
		#endif

		#ifndef BT_USE_TRACES
		#define BT_USE_TRACES TRUE
		#endif

		#ifndef BT_TRACE_VERBOSE
		#define BT_TRACE_VERBOSE FALSE
		#endif

system/include/bt_trace.h

+0 −9

Original line number	Diff line number	Diff line
		@@ -126,11 +126,6 @@ static const char BTE_LOGMSG_MODULE[] = "bte_logmsg_module";
		#define BT_TRACE_VERBOSE FALSE
		#endif

		/* Enables or disables all trace messages. */
		#ifndef BT_USE_TRACES
		#define BT_USE_TRACES TRUE
		#endif

		/******************************************************************************
		**
		** Trace Levels
		@@ -205,10 +200,6 @@ static const char BTE_LOGMSG_MODULE[] = "bte_logmsg_module";
		#define APPL_INITIAL_TRACE_LEVEL BT_TRACE_LEVEL_WARNING
		#endif

		#ifndef BT_TRACE_APPL
		#define BT_TRACE_APPL BT_USE_TRACES
		#endif

		#ifndef GATT_INITIAL_TRACE_LEVEL
		#define GATT_INITIAL_TRACE_LEVEL BT_TRACE_LEVEL_WARNING
		#endif

system/stack/avct/avct_l2c.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -159,10 +159,8 @@ void avct_l2c_connect_ind_cback(BD_ADDR bd_addr, uint16_t lcid, uint16_t psm, ui
		AVCT_TRACE_DEBUG("avct_l2c snd Cfg Req");
		}

		#if (BT_USE_TRACES == TRUE)
		if (p_lcb)
		AVCT_TRACE_DEBUG("ch_state cni: %d ", p_lcb->ch_state);
		#endif
		}

		/*******************************************************************************