Logging cleanup
diff --git a/include/bt_trace.h b/include/bt_trace.h
index 7d1e605..0b802fc 100644
--- a/include/bt_trace.h
+++ b/include/bt_trace.h
@@ -16,25 +16,7 @@
*
******************************************************************************/
-/******************************************************************************
- *
- * This file contains definitions for implementing the
- * diagnostic trace message service.
- *
- ******************************************************************************/
-
-#ifndef BT_TRACE_H
-#define BT_TRACE_H
-
-#ifndef BTTRC_INCLUDED
-#define BTTRC_INCLUDED FALSE
-#endif
-#ifndef BTTRC_PARSER_INCLUDED
-#define BTTRC_PARSER_INCLUDED FALSE
-#endif
-#ifndef MAX_TRACE_RAM_SIZE
-#define MAX_TRACE_RAM_SIZE 10000
-#endif
+#pragma once
/* BTE tracing IDs for debug purposes */
/* LayerIDs for stack */
@@ -92,7 +74,6 @@
#define BTTRC_ID_STK_SNEP 52
#define BTTRC_ID_STK_NDEF 53
-
/* LayerIDs for BTA */
#define BTTRC_ID_BTA_ACC 55 /* Advanced Camera Client */
#define BTTRC_ID_BTA_AG 56 /* audio gateway */
@@ -137,109 +118,10 @@
#define BTTRC_ID_MAX_ID BTTRC_ID_BT_PROTOCOL
// btla-specific --
#define BTTRC_ID_ALL_LAYERS 0xFF /* all trace layers */
-typedef UINT8 tBTTRC_LAYER_ID;
-
-/* Trace type definitions. Note that these are mutually exclusive in a trace. This
-means that any trace can be either error,warning,api,event or dbg */
-#define BTTRC_TYPE_ERROR 0x01 /* Traces for error situation */
-#define BTTRC_TYPE_WARNING 0x02 /* Traces for warning situation */
-#define BTTRC_TYPE_API 0x04 /* Traces for API */
-#define BTTRC_TYPE_EVENT 0x08 /* Traces for EVENT */
-#define BTTRC_TYPE_ACTION 0x10 /* Traces for Action functions */
-#define BTTRC_TYPE_DBG 0x20 /* Traces for debugging purpose */
-typedef UINT8 tBTTRC_TYPE;
-
-/* Masks to identify the stack that originated the trace */
-#define BTTRC_TRACE_LITE 0x80 /* MM Lite stack */
-#define BTTRC_TRACE_EMBD 0x40 /* Embedded host stack */
-
/* Parameter datatypes used in Trace APIs */
#define BTTRC_PARAM_UINT8 1
#define BTTRC_PARAM_UINT16 2
#define BTTRC_PARAM_UINT32 3
-typedef UINT8 tBTTRC_PARAM_TYPE;
-
-/* Special token definitions */
-#define BTTRC_TOKEN_SM_STATE 0xFFFF /* Token indicating the State of a State m/c */
-
-// btla-specific ++
-typedef struct {
- tBTTRC_LAYER_ID layer_id;
- tBTTRC_TYPE type; /* TODO: use tBTTRC_TYPE instead of "classical level 0-5" */
-} tBTTRC_LEVEL;
-
-typedef UINT8 (tBTTRC_SET_TRACE_LEVEL)( UINT8 );
-
-typedef struct {
- const tBTTRC_LAYER_ID layer_id_start;
- const tBTTRC_LAYER_ID layer_id_end;
- tBTTRC_SET_TRACE_LEVEL *p_f;
- const char *trc_name;
- UINT8 trace_level;
-} tBTTRC_FUNC_MAP;
-
-extern tBTTRC_FUNC_MAP bttrc_set_level_map[];
-extern const UINT16 bttrc_map_size;
-extern BT_API tBTTRC_LEVEL * BTA_SysSetTraceLevel( tBTTRC_LEVEL * p_levels );
-// btla-specific --
-
-/* External declaration for appl_trace_level here to avoid to add the declaration in all the files using APPL_TRACExxx macros */
-extern UINT8 appl_trace_level ;
-
-void BTE_InitTraceLevels( void );
-
-/* Prototype for message logging function. */
-void LogMsg (UINT32 trace_set_mask, const char *fmt_str, ...);
-
-/* Prototype for stack tracing function. */
-void BTTRC_StackTrace0(tBTTRC_LAYER_ID layer_id,
- tBTTRC_TYPE type,
- UINT16 token);
-void BTTRC_StackTrace1(tBTTRC_LAYER_ID layer_id,
- tBTTRC_TYPE type,
- UINT16 token,
- tBTTRC_PARAM_TYPE p1_type, UINT32 p1_val);
-void BTTRC_StackTrace2(tBTTRC_LAYER_ID layer_id,
- tBTTRC_TYPE type,
- UINT16 token,
- tBTTRC_PARAM_TYPE p1_type, UINT32 p1_val,
- tBTTRC_PARAM_TYPE p2_type, UINT32 p2_val);
-void BTTRC_StackTrace3(tBTTRC_LAYER_ID layer_id,
- tBTTRC_TYPE type,
- UINT16 token,
- tBTTRC_PARAM_TYPE p1_type, UINT32 p1_val,
- tBTTRC_PARAM_TYPE p2_type, UINT32 p2_val,
- tBTTRC_PARAM_TYPE p3_type, UINT32 p3_val);
-void BTTRC_StackTrace4(tBTTRC_LAYER_ID layer_id,
- tBTTRC_TYPE type,
- UINT16 token,
- tBTTRC_PARAM_TYPE p1_type, UINT32 p1_val,
- tBTTRC_PARAM_TYPE p2_type, UINT32 p2_val,
- tBTTRC_PARAM_TYPE p3_type, UINT32 p3_val,
- tBTTRC_PARAM_TYPE p4_type, UINT32 p4_val);
-void BTTRC_StackTrace5(tBTTRC_LAYER_ID layer_id,
- tBTTRC_TYPE type,
- UINT16 token,
- tBTTRC_PARAM_TYPE p1_type, UINT32 p1_val,
- tBTTRC_PARAM_TYPE p2_type, UINT32 p2_val,
- tBTTRC_PARAM_TYPE p3_type, UINT32 p3_val,
- tBTTRC_PARAM_TYPE p4_type, UINT32 p4_val,
- tBTTRC_PARAM_TYPE p5_type, UINT32 p5_val);
-void BTTRC_StackTrace6(tBTTRC_LAYER_ID layer_id,
- tBTTRC_TYPE type,
- UINT16 token,
- tBTTRC_PARAM_TYPE p1_type, UINT32 p1_val,
- tBTTRC_PARAM_TYPE p2_type, UINT32 p2_val,
- tBTTRC_PARAM_TYPE p3_type, UINT32 p3_val,
- tBTTRC_PARAM_TYPE p4_type, UINT32 p4_val,
- tBTTRC_PARAM_TYPE p5_type, UINT32 p5_val,
- tBTTRC_PARAM_TYPE p6_type, UINT32 p6_val);
-
-/******************************************************************************
-**
-** Trace configurable parameters
-**
-******************************************************************************/
/* Enables or disables verbose trace information. */
#ifndef BT_TRACE_VERBOSE
@@ -251,7 +133,6 @@
#define BT_USE_TRACES TRUE
#endif
-
/******************************************************************************
**
** Trace Levels
@@ -340,134 +221,6 @@
#endif
// btla-specific --
-
-#if (BTTRC_INCLUDED == TRUE)
-/***************************************************************************************/
-/* BTTRC MACROS */
-
-#define BTTRC_EVENT(lid, event, state) \
- {BTTRC_StackTrace1(lid, BTTRC_TYPE_EVENT, event, BTTRC_PARAM_UINT8, state);}
-#define BTTRC_ACTION(lid, action) \
- {BTTRC_StackTrace0(lid, BTTRC_TYPE_ACTION, action);}
-#define BTTRC_STATE(lid, state) \
- {BTTRC_StackTrace1(lid, BTTRC_TYPE_EVENT, BTTRC_TOKEN_SM_STATE, BTTRC_PARAM_UINT8, state);}
-
-#define BTTRC_API0(lid, api) \
- {BTTRC_StackTrace0(lid, BTTRC_TYPE_API, api);}
-#define BTTRC_API1(lid, api, p1_t,p1_v) \
- {BTTRC_StackTrace1(lid, BTTRC_TYPE_API, api, p1_t,p1_v);}
-#define BTTRC_API2(lid, api, p1_t,p1_v,p2_t,p2_v) \
- {BTTRC_StackTrace2(lid, BTTRC_TYPE_API, api, p1_t,p1_v,p2_t,p2_v);}
-#define BTTRC_API3(lid, api, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v) \
- {BTTRC_StackTrace3(lid, BTTRC_TYPE_API, api, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v);}
-#define BTTRC_API4(lid, api, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v) \
- {BTTRC_StackTrace4(lid, BTTRC_TYPE_API, api, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v);}
-#define BTTRC_API5(lid, api, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v) \
- {BTTRC_StackTrace5(lid, BTTRC_TYPE_API, api, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v);}
-#define BTTRC_API6(lid, api, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v,p6_t,p6_v) \
- {BTTRC_StackTrace6(lid, BTTRC_TYPE_API, api, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v,p6_t,p6_v);}
-
-
-#define BTTRC_DBG0(lid, dbg) \
- {BTTRC_StackTrace0(lid, BTTRC_TYPE_DBG, dbg);}
-#define BTTRC_DBG1(lid, dbg, p1_t,p1_v) \
- {BTTRC_StackTrace1(lid, BTTRC_TYPE_DBG, dbg, p1_t,p1_v);}
-#define BTTRC_DBG2(lid, dbg, p1_t,p1_v,p2_t,p2_v) \
- {BTTRC_StackTrace2(lid, BTTRC_TYPE_DBG, dbg, p1_t,p1_v,p2_t,p2_v);}
-#define BTTRC_DBG3(lid, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v) \
- {BTTRC_StackTrace3(lid, BTTRC_TYPE_DBG, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v);}
-#define BTTRC_DBG4(lid, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v) \
- {BTTRC_StackTrace4(lid, BTTRC_TYPE_DBG, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v);}
-#define BTTRC_DBG5(lid, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v) \
- {BTTRC_StackTrace5(lid, BTTRC_TYPE_DBG, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v);}
-#define BTTRC_DBG6(lid, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v,p6_t,p6_v) \
- {BTTRC_StackTrace6(lid, BTTRC_TYPE_DBG, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v,p6_t,p6_v);}
-
-/***************************************************************************************/
-/*AVDT MACROS */
-
-#define BTTRC_AVDT_API0(api) \
- BTTRC_API0(BTTRC_ID_STK_AVDT, api)
-#define BTTRC_AVDT_API1(api, p1_t, p1_v) \
- BTTRC_API1(BTTRC_ID_STK_AVDT, api, p1_t, p1_v)
-#define BTTRC_AVDT_API2(api, p1_t, p1_v, p2_t, p2_v) \
- BTTRC_API2(BTTRC_ID_STK_AVDT, api, p1_t, p1_v, p2_t, p2_v)
-/***************************************************************************************/
-/*AVDT_SCB MACROS */
-
-#define BTTRC_AVDT_SCB_EVENT(event, state) \
- BTTRC_EVENT(BTTRC_ID_AVDT_SCB, event, state)
-#define BTTRC_AVDT_SCB_ACTION(action) \
- BTTRC_ACTION(BTTRC_ID_AVDT_SCB, action)
-#define BTTRC_AVDT_SCB_STATE(next_state) \
- BTTRC_STATE(BTTRC_ID_AVDT_SCB, next_state)
-
-#define BTTRC_AVDT_SCB_DBG0(dbg) \
- BTTRC_DBG0(BTTRC_ID_AVDT_SCB, dbg)
-#define BTTRC_AVDT_SCB_DBG1(dbg, p1_t,p1_v) \
- BTTRC_DBG1(BTTRC_ID_AVDT_SCB, dbg, p1_t,p1_v)
-#define BTTRC_AVDT_SCB_DBG2(dbg, p1_t,p1_v,p2_t,p2_v) \
- BTTRC_DBG2(BTTRC_ID_AVDT_SCB, dbg, p1_t,p1_v,p2_t,p2_v)
-#define BTTRC_AVDT_SCB_DBG3(dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v) \
- BTTRC_DBG3(BTTRC_ID_AVDT_SCB, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v)
-#define BTTRC_AVDT_SCB_DBG4(dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v) \
- BTTRC_DBG4(BTTRC_ID_AVDT_SCB, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v)
-#define BTTRC_AVDT_SCB_DBG5(dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v) \
- BTTRC_DBG5(BTTRC_ID_AVDT_SCB, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v)
-#define BTTRC_AVDT_SCB_DBG6(dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v,p6_t,p6_v) \
- BTTRC_DBG6(BTTRC_ID_AVDT_SCB, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v,p6_t,p6_v)
-/***************************************************************************************/
-/*AVDT_CCB MACROS */
-
-#define BTTRC_AVDT_CCB_EVENT(event, state) \
- BTTRC_EVENT(BTTRC_ID_AVDT_CCB, event, state)
-#define BTTRC_AVDT_CCB_ACTION(action) \
- BTTRC_ACTION(BTTRC_ID_AVDT_CCB, action)
-#define BTTRC_AVDT_CCB_STATE(next_state) \
- BTTRC_STATE(BTTRC_ID_AVDT_CCB, next_state)
-
-#define BTTRC_AVDT_CCB_DBG0(dbg) \
- BTTRC_DBG0(BTTRC_ID_AVDT_CCB, dbg)
-#define BTTRC_AVDT_CCB_DBG1(dbg, p1_t,p1_v) \
- BTTRC_DBG1(BTTRC_ID_AVDT_CCB, dbg, p1_t,p1_v)
-#define BTTRC_AVDT_CCB_DBG2(dbg, p1_t,p1_v,p2_t,p2_v) \
- BTTRC_DBG2(BTTRC_ID_AVDT_CCB, dbg, p1_t,p1_v,p2_t,p2_v)
-#define BTTRC_AVDT_CCB_DBG3(dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v) \
- BTTRC_DBG3(BTTRC_ID_AVDT_CCB, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v)
-#define BTTRC_AVDT_CCB_DBG4(dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v) \
- BTTRC_DBG4(BTTRC_ID_AVDT_CCB, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v)
-#define BTTRC_AVDT_CCB_DBG5(dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v) \
- BTTRC_DBG5(BTTRC_ID_AVDT_CCB, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v)
-#define BTTRC_AVDT_CCB_DBG6(dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v,p6_t,p6_v) \
- BTTRC_DBG6(BTTRC_ID_AVDT_CCB, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v,p6_t,p6_v)
-/***************************************************************************************/
-
-#else /*BTTRC_INCLUDED*/
-
-/***************************************************************************************/
-/* BTTRC MACROS */
-
-#define BTTRC_EVENT(lid, event, state)
-#define BTTRC_ACTION(lid, action)
-#define BTTRC_STATE(lid, state)
-
-#define BTTRC_API0(lid, api)
-#define BTTRC_API1(lid, api, p1_t, p1_v)
-#define BTTRC_API2(lid, api, p1_t, p1_v, p2_t, p2_v)
-#define BTTRC_API3(lid, api, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v)
-#define BTTRC_API4(lid, api, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v)
-#define BTTRC_API5(lid, api, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v)
-#define BTTRC_API6(lid, api, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v,p6_t,p6_v)
-
-
-#define BTTRC_DBG0(lid, dbg)
-#define BTTRC_DBG1(lid, dbg, p1_t,p1_v)
-#define BTTRC_DBG2(lid, dbg, p1_t,p1_v,p2_t,p2_v)
-#define BTTRC_DBG3(lid, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v)
-#define BTTRC_DBG4(lid, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v)
-#define BTTRC_DBG5(lid, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v)
-#define BTTRC_DBG6(lid, dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v,p6_t,p6_v)
-
/***************************************************************************************/
/*AVDT MACROS */
#define BTTRC_AVDT_API0(api)
@@ -480,14 +233,6 @@
#define BTTRC_AVDT_SCB_ACTION(action)
#define BTTRC_AVDT_SCB_STATE(next_state)
-#define BTTRC_AVDT_SCB_DBG0(dbg)
-#define BTTRC_AVDT_SCB_DBG1(dbg, p1_t,p1_v)
-#define BTTRC_AVDT_SCB_DBG2(dbg, p1_t,p1_v,p2_t,p2_v)
-#define BTTRC_AVDT_SCB_DBG3(dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v)
-#define BTTRC_AVDT_SCB_DBG4(dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v)
-#define BTTRC_AVDT_SCB_DBG5(dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v)
-#define BTTRC_AVDT_SCB_DBG6(dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v,p6_t,p6_v)
-
/***************************************************************************************/
/*AVDT_CCB MACROS */
@@ -495,21 +240,6 @@
#define BTTRC_AVDT_CCB_ACTION(action)
#define BTTRC_AVDT_CCB_STATE(next_state)
-#define BTTRC_AVDT_CCB_DBG0(dbg)
-#define BTTRC_AVDT_CCB_DBG1(dbg, p1_t,p1_v)
-#define BTTRC_AVDT_CCB_DBG2(dbg, p1_t,p1_v,p2_t,p2_v)
-#define BTTRC_AVDT_CCB_DBG3(dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v)
-#define BTTRC_AVDT_CCB_DBG4(dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v)
-#define BTTRC_AVDT_CCB_DBG5(dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v)
-#define BTTRC_AVDT_CCB_DBG6(dbg, p1_t,p1_v,p2_t,p2_v,p3_t,p3_v,p4_t,p4_v,p5_t,p5_v,p6_t,p6_v)
-
-/***************************************************************************************/
-
-#endif /*BTTRC_INCLUDED*/
-
-
-#if (BT_USE_TRACES == TRUE)
-
#define BT_TRACE(l,t,...) LogMsg((TRACE_CTRL_GENERAL | (l) | TRACE_ORG_STACK | (t)), ##__VA_ARGS__)
#define BT_ERROR_TRACE(l,...) LogMsg(TRACE_CTRL_GENERAL | (l) | TRACE_ORG_STACK | TRACE_TYPE_ERROR, ##__VA_ARGS__)
@@ -640,142 +370,6 @@
#define SMP_TRACE_EVENT(...) {if (smp_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_SMP, TRACE_TYPE_EVENT, ##__VA_ARGS__);}
#define SMP_TRACE_DEBUG(...) {if (smp_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_SMP, TRACE_TYPE_DEBUG, ##__VA_ARGS__);}
-/* END OF USE TRACES */
-#else
-
-#define BT_TRACE(l,t,...)
-#define BT_BT_ERROR_TRACE(l,...)
-
-/* Define tracing for the HCI unit
-*/
-#define HCI_TRACE_ERROR(...)
-#define HCI_TRACE_WARNING(...)
-#define HCI_TRACE_EVENT(...)
-#define HCI_TRACE_DEBUG(...)
-
-
-/* Define tracing for BTM
-*/
-#define BTM_TRACE_ERROR(...)
-#define BTM_TRACE_WARNING(...)
-#define BTM_TRACE_API(...)
-#define BTM_TRACE_EVENT(...)
-#define BTM_TRACE_DEBUG(...)
-
-
-/* Define tracing for the L2CAP unit
-*/
-#define L2CAP_TRACE_ERROR(...)
-#define L2CAP_TRACE_WARNING(...)
-#define L2CAP_TRACE_API(...)
-#define L2CAP_TRACE_EVENT(...)
-#define L2CAP_TRACE_DEBUG(...)
-
-/* Define tracing for the SDP unit
-*/
-#define SDP_TRACE_ERROR(...)
-#define SDP_TRACE_WARNING(...)
-#define SDP_TRACE_API(...)
-#define SDP_TRACE_EVENT(...)
-#define SDP_TRACE_DEBUG(...)
-
-/* Define tracing for the RFCOMM unit
-*/
-#define RFCOMM_TRACE_ERROR(...)
-#define RFCOMM_TRACE_WARNING(...)
-#define RFCOMM_TRACE_API(...)
-#define RFCOMM_TRACE_EVENT(...)
-#define RFCOMM_TRACE_DEBUG(...)
-
-/* Generic Access Profile traces */
-#define GAP_TRACE_ERROR(...)
-#define GAP_TRACE_EVENT(...)
-#define GAP_TRACE_API(...)
-#define GAP_TRACE_WARNING(...)
-
-/* define traces for HID Host */
-#define HIDH_TRACE_ERROR(...)
-#define HIDH_TRACE_WARNING(...)
-#define HIDH_TRACE_API(...)
-#define HIDH_TRACE_EVENT(...)
-#define HIDH_TRACE_DEBUG(...)
-
-/* define traces for BNEP */
-
-#define BNEP_TRACE_ERROR(...)
-#define BNEP_TRACE_WARNING(...)
-#define BNEP_TRACE_API(...)
-#define BNEP_TRACE_EVENT(...)
-#define BNEP_TRACE_DEBUG(...)
-
-/* define traces for PAN */
-
-#define PAN_TRACE_ERROR(...)
-#define PAN_TRACE_WARNING(...)
-#define PAN_TRACE_API(...)
-#define PAN_TRACE_EVENT(...)
-#define PAN_TRACE_DEBUG(...)
-
-/* Define tracing for the A2DP profile
-*/
-#define A2D_TRACE_ERROR(...)
-#define A2D_TRACE_WARNING(...)
-#define A2D_TRACE_EVENT(...)
-#define A2D_TRACE_DEBUG(...)
-#define A2D_TRACE_API(...)
-
-/* AVDTP
-*/
-#define AVDT_TRACE_ERROR(...)
-#define AVDT_TRACE_WARNING(...)
-#define AVDT_TRACE_EVENT(...)
-#define AVDT_TRACE_DEBUG(...)
-#define AVDT_TRACE_API(...)
-
-/* Define tracing for the AVCTP protocol
-*/
-#define AVCT_TRACE_ERROR(...)
-#define AVCT_TRACE_WARNING(...)
-#define AVCT_TRACE_EVENT(...)
-#define AVCT_TRACE_DEBUG(...)
-#define AVCT_TRACE_API(...)
-
-/* Define tracing for the AVRCP profile
-*/
-#define AVRC_TRACE_ERROR(...)
-#define AVRC_TRACE_WARNING(...)
-#define AVRC_TRACE_EVENT(...)
-#define AVRC_TRACE_DEBUG(...)
-#define AVRC_TRACE_API(...)
-
-/* MCAP
-*/
-#define MCA_TRACE_ERROR(...)
-#define MCA_TRACE_WARNING(...)
-#define MCA_TRACE_EVENT(...)
-#define MCA_TRACE_DEBUG(...)
-#define MCA_TRACE_API(...)
-
-/* Define tracing for the GATT
-*/
-#define GATT_TRACE_ERROR(...)
-#define GATT_TRACE_WARNING(...)
-#define GATT_TRACE_API(...)
-#define GATT_TRACE_EVENT(...)
-#define GATT_TRACE_DEBUG(...)
-
-/* Define tracing for the SMP unit
-*/
-#define SMP_TRACE_ERROR(...)
-#define SMP_TRACE_WARNING(...)
-#define SMP_TRACE_API(...)
-#define SMP_TRACE_EVENT(...)
-#define SMP_TRACE_DEBUG(...)
-
-#endif
-
-#if (BT_TRACE_BTIF == TRUE)
-
extern UINT8 btif_trace_level;
/* define traces for application */
@@ -786,21 +380,6 @@
#define BTIF_TRACE_DEBUG(...) {if (btif_trace_level >= BT_TRACE_LEVEL_DEBUG) LogMsg(TRACE_CTRL_GENERAL | TRACE_LAYER_NONE | TRACE_ORG_APPL | TRACE_TYPE_DEBUG, ##__VA_ARGS__);}
#define BTIF_TRACE_VERBOSE(...) {if (btif_trace_level >= BT_TRACE_LEVEL_VERBOSE) LogMsg(TRACE_CTRL_GENERAL | TRACE_LAYER_NONE | TRACE_ORG_APPL | TRACE_TYPE_DEBUG, ##__VA_ARGS__);}
-#else
-/* define traces for Application */
-
-#define BTIF_TRACE_ERROR(...)
-#define BTIF_TRACE_WARNING(...)
-#define BTIF_TRACE_API(...)
-#define BTIF_TRACE_EVENT(...)
-#define BTIF_TRACE_DEBUG(...)
-#define BTIF_TRACE_VERBOSE(...)
-
-#endif
-
-
-#if (BT_USE_TRACES == TRUE || BT_TRACE_APPL == TRUE)
-
/* define traces for application */
#define APPL_TRACE_ERROR(...) {if (appl_trace_level >= BT_TRACE_LEVEL_ERROR) LogMsg(TRACE_CTRL_GENERAL | TRACE_LAYER_NONE | TRACE_ORG_APPL | TRACE_TYPE_ERROR, ##__VA_ARGS__);}
#define APPL_TRACE_WARNING(...) {if (appl_trace_level >= BT_TRACE_LEVEL_WARNING) LogMsg(TRACE_CTRL_GENERAL | TRACE_LAYER_NONE | TRACE_ORG_APPL | TRACE_TYPE_WARNING, ##__VA_ARGS__);}
@@ -809,21 +388,8 @@
#define APPL_TRACE_DEBUG(...) {if (appl_trace_level >= BT_TRACE_LEVEL_DEBUG) LogMsg(TRACE_CTRL_GENERAL | TRACE_LAYER_NONE | TRACE_ORG_APPL | TRACE_TYPE_DEBUG, ##__VA_ARGS__);}
#define APPL_TRACE_VERBOSE(...) {if (appl_trace_level >= BT_TRACE_LEVEL_VERBOSE) LogMsg(TRACE_CTRL_GENERAL | TRACE_LAYER_NONE | TRACE_ORG_APPL | TRACE_TYPE_DEBUG, ##__VA_ARGS__);}
-#else
-/* define traces for Application */
-
-#define APPL_TRACE_ERROR(...)
-#define APPL_TRACE_WARNING(...)
-#define APPL_TRACE_API(...)
-#define APPL_TRACE_EVENT(...)
-#define APPL_TRACE_DEBUG(...)
-#define APPL_TRACE_VERBOSE(...)
-
-#endif
-
/* Simplified Trace Helper Macro
*/
-#if (BT_USE_TRACES == TRUE)
#define bdld(fmt, ...) \
do{\
if((MY_LOG_LEVEL) >= BT_TRACE_LEVEL_DEBUG) \
@@ -847,10 +413,27 @@
if(((MY_LOG_LEVEL) >= BT_TRACE_LEVEL_ERROR) && !(assert_if)) \
LogMsg((MY_LOG_LAYER) | TRACE_TYPE_ERROR, "%s(L%d): assert failed: " #assert_if, __FUNCTION__, __LINE__); \
}while(0)
-#else
-#define bdld(fmt, ...) ((void)0) /*Empty statement as placeholder*/
-#define bdlw(fmt, ...) ((void)0)
-#define bdle(fmt, ...) ((void)0)
-#define bdla(assert_if) ((void)0)
-#endif
-#endif /* BT_TRACE_H */
+
+typedef UINT8 tBTTRC_PARAM_TYPE;
+typedef UINT8 tBTTRC_LAYER_ID;
+typedef UINT8 tBTTRC_TYPE;
+
+typedef struct {
+ tBTTRC_LAYER_ID layer_id;
+ tBTTRC_TYPE type; /* TODO: use tBTTRC_TYPE instead of "classical level 0-5" */
+} tBTTRC_LEVEL;
+
+typedef UINT8 (tBTTRC_SET_TRACE_LEVEL)( UINT8 );
+
+typedef struct {
+ const tBTTRC_LAYER_ID layer_id_start;
+ const tBTTRC_LAYER_ID layer_id_end;
+ tBTTRC_SET_TRACE_LEVEL *p_f;
+ const char *trc_name;
+ UINT8 trace_level;
+} tBTTRC_FUNC_MAP;
+
+/* External declaration for appl_trace_level here to avoid to add the declaration in all the files using APPL_TRACExxx macros */
+extern UINT8 appl_trace_level;
+
+void BTE_InitTraceLevels(void);