component/bt : Config for choose printf

1. add print or ets_print
2. as print format error, add -Wno-error=format

diff --git a/components/bt/Kconfig b/components/bt/Kconfig
index e43ff864de13b5e3706440b1f0b30be46e86e8d9..e2f7d973408dc85ee48042317d4669e322368398 100644 (file)
--- a/components/bt/Kconfig
+++ b/components/bt/Kconfig
@@ -8,6 +8,18 @@ config BT_ENABLED
     help
         This compiles in the low-level BT stack.
 
+menu "BT_UTIL"
+visible if BT_ENABLED
+
+config BT_USE_ETS_PRINT
+       bool "BT USE ETS_PRINT"
+       default y
+       depends on BT_ENABLED
+       help
+               This select use print or ets_print
+
+endmenu #menu
+
 #config BT_BTLE
 #    bool "Enable BTLE"
 #    depends on BT_ENABLED

diff --git a/components/bt/bluedroid/bta/gatt/bta_gattc_act.c b/components/bt/bluedroid/bta/gatt/bta_gattc_act.c
index 6c131197a39831ef7fc321338adb933d5ba975d9..5f71d1f33422a203fc431ad54e8f80549ef6c95c 100755 (executable)
--- a/components/bt/bluedroid/bta/gatt/bta_gattc_act.c
+++ b/components/bt/bluedroid/bta/gatt/bta_gattc_act.c
@@ -2012,7 +2012,7 @@ void bta_gattc_proc_other_indication(tBTA_GATTC_CLCB *p_clcb, UINT8 op,
     APPL_TRACE_DEBUG("bta_gattc_proc_other_indication check \
                        p_data->att_value.handle=%d p_data->handle=%d",
                        p_data->att_value.handle, p_data->handle);
-    APPL_TRACE_DEBUG("is_notify", p_notify->is_notify);
+    APPL_TRACE_DEBUG("is_notify %d", p_notify->is_notify);
 
     p_notify->is_notify = (op == GATTC_OPTYPE_INDICATION) ? FALSE : TRUE;
     p_notify->len = p_data->att_value.len;

diff --git a/components/bt/bluedroid/include/bt_trace.h b/components/bt/bluedroid/include/bt_trace.h
index 6953c88c2bce26514401b9c9cab301c4f1f9573b..3d346bc806799095ecf35bf1e7db3e6e3f2fb317 100755 (executable)
--- a/components/bt/bluedroid/include/bt_trace.h
+++ b/components/bt/bluedroid/include/bt_trace.h
@@ -19,13 +19,19 @@
 #ifndef _BT_TRACE_H_
 #define _BT_TRACE_H_
 
+#include <stdio.h>
 #include "bt_types.h"
 
 #include "rom/ets_sys.h"
-//extern void ets_printf(const char *fmt, ...);
+
+#ifdef CONFIG_BT_USE_ETS_PRINT
+#define BT_PRINTF      ets_printf
+#else
+#define BT_PRINTF      printf
+#endif
 
 #ifndef assert
-#define assert(x)      do { if (!(x)) ets_printf("bt host error %s %u\n", __FILE__, __LINE__); } while (0)
+#define assert(x)      do { if (!(x)) BT_PRINTF("bt host error %s %u\n", __FILE__, __LINE__); } while (0)
 #endif
 
 inline void trc_dump_buffer(uint8_t *prefix, uint8_t *data, uint16_t len)
@@ -36,14 +42,14 @@ inline void trc_dump_buffer(uint8_t *prefix, uint8_t *data, uint16_t len)
     return;
 
   if (prefix)
-    ets_printf("%s:\t", prefix);
+    BT_PRINTF("%s:\t", prefix);
 
   for (i = 0; i < len; i++) {
-    ets_printf(" %02x", *(data + i));
+    BT_PRINTF(" %02x", *(data + i));
     if (!((i + 1) & 0xf))
-      ets_printf("\n");
+      BT_PRINTF("\n");
   }
-  ets_printf("\n");
+  BT_PRINTF("\n");
 }
 
 #ifdef BTTRC_DUMP_BUFFER
@@ -264,179 +270,179 @@ inline void trc_dump_buffer(uint8_t *prefix, uint8_t *data, uint16_t len)
 #ifndef LOG_LEVEL
 #define LOG_LEVEL      LOG_LEVEL_ERROR
 #endif
-#define LOG_ERROR(fmt, args...)                        do {if (LOG_LEVEL >= LOG_LEVEL_ERROR) ets_printf(fmt,## args);} while(0)
-#define LOG_WARN(fmt, args...)                 do {if (LOG_LEVEL >= LOG_LEVEL_WARN) ets_printf(fmt,## args);} while(0)
-#define LOG_INFO(fmt, args...)                 do {if (LOG_LEVEL >= LOG_LEVEL_INFO) ets_printf(fmt,## args);} while(0)
-#define LOG_DEBUG(fmt, args...)                        do {if (LOG_LEVEL >= LOG_LEVEL_DEBUG) ets_printf(fmt,## args);} while(0)
-#define LOG_VERBOSE(fmt, args...)              do {if (LOG_LEVEL >= LOG_LEVEL_VERBOSE) ets_printf(fmt,## args);} while(0)
+#define LOG_ERROR(fmt, args...)                        do {if (LOG_LEVEL >= LOG_LEVEL_ERROR) printf(fmt,## args);} while(0)
+#define LOG_WARN(fmt, args...)                 do {if (LOG_LEVEL >= LOG_LEVEL_WARN) BT_PRINTF(fmt,## args);} while(0)
+#define LOG_INFO(fmt, args...)                 do {if (LOG_LEVEL >= LOG_LEVEL_INFO) BT_PRINTF(fmt,## args);} while(0)
+#define LOG_DEBUG(fmt, args...)                        do {if (LOG_LEVEL >= LOG_LEVEL_DEBUG) BT_PRINTF(fmt,## args);} while(0)
+#define LOG_VERBOSE(fmt, args...)              do {if (LOG_LEVEL >= LOG_LEVEL_VERBOSE) BT_PRINTF(fmt,## args);} while(0)
 
 /* Define tracing for the HCI unit
 */
-#define HCI_TRACE_ERROR(fmt, args...)          {if (btu_cb.trace_level >= BT_TRACE_LEVEL_ERROR) ets_printf(fmt,## args);}
-#define HCI_TRACE_WARNING(fmt, args...)                {if (btu_cb.trace_level >= BT_TRACE_LEVEL_WARNING) ets_printf(fmt,## args);}
-#define HCI_TRACE_EVENT(fmt, args...)          {if (btu_cb.trace_level >= BT_TRACE_LEVEL_EVENT) ets_printf(fmt,## args);}
-#define HCI_TRACE_DEBUG(fmt, args...)          {if (btu_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) ets_printf(fmt,## args);}
+#define HCI_TRACE_ERROR(fmt, args...)          {if (btu_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt,## args);}
+#define HCI_TRACE_WARNING(fmt, args...)                {if (btu_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt,## args);}
+#define HCI_TRACE_EVENT(fmt, args...)          {if (btu_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt,## args);}
+#define HCI_TRACE_DEBUG(fmt, args...)          {if (btu_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt,## args);}
 
 /* Define tracing for BTM
 */
-#define BTM_TRACE_ERROR(fmt, args...)          {if (btm_cb.trace_level >= BT_TRACE_LEVEL_ERROR) ets_printf(fmt, ## args);}
-#define BTM_TRACE_WARNING(fmt, args...)                {if (btm_cb.trace_level >= BT_TRACE_LEVEL_WARNING) ets_printf(fmt, ## args);}
-#define BTM_TRACE_API(fmt, args...)            {if (btm_cb.trace_level >= BT_TRACE_LEVEL_API) ets_printf(fmt, ## args);}
-#define BTM_TRACE_EVENT(fmt, args...)          {if (btm_cb.trace_level >= BT_TRACE_LEVEL_EVENT) ets_printf(fmt, ## args);}
-#define BTM_TRACE_DEBUG(fmt, args...)          {if (btm_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) ets_printf(fmt, ## args);}
+#define BTM_TRACE_ERROR(fmt, args...)          {if (btm_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
+#define BTM_TRACE_WARNING(fmt, args...)                {if (btm_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
+#define BTM_TRACE_API(fmt, args...)            {if (btm_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
+#define BTM_TRACE_EVENT(fmt, args...)          {if (btm_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
+#define BTM_TRACE_DEBUG(fmt, args...)          {if (btm_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
 
 /* Define tracing for the L2CAP unit
 */
-#define L2CAP_TRACE_ERROR(fmt, args...)                {if (l2cb.l2cap_trace_level >= BT_TRACE_LEVEL_ERROR) ets_printf(fmt, ## args);}
-#define L2CAP_TRACE_WARNING(fmt, args...)      {if (l2cb.l2cap_trace_level >= BT_TRACE_LEVEL_WARNING) ets_printf(fmt, ## args);}
-#define L2CAP_TRACE_API(fmt, args...)          {if (l2cb.l2cap_trace_level >= BT_TRACE_LEVEL_API) ets_printf(fmt, ## args);}
-#define L2CAP_TRACE_EVENT(fmt, args...)                {if (l2cb.l2cap_trace_level >= BT_TRACE_LEVEL_EVENT) ets_printf(fmt, ## args);}
-#define L2CAP_TRACE_DEBUG(fmt, args...)                {if (l2cb.l2cap_trace_level >= BT_TRACE_LEVEL_DEBUG) ets_printf(fmt, ## args);}
+#define L2CAP_TRACE_ERROR(fmt, args...)                {if (l2cb.l2cap_trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
+#define L2CAP_TRACE_WARNING(fmt, args...)      {if (l2cb.l2cap_trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
+#define L2CAP_TRACE_API(fmt, args...)          {if (l2cb.l2cap_trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
+#define L2CAP_TRACE_EVENT(fmt, args...)                {if (l2cb.l2cap_trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
+#define L2CAP_TRACE_DEBUG(fmt, args...)                {if (l2cb.l2cap_trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
 
 /* Define tracing for the SDP unit
 */
-#define SDP_TRACE_ERROR(fmt, args...)          {if (sdp_cb.trace_level >= BT_TRACE_LEVEL_ERROR) ets_printf(fmt, ## args);}
-#define SDP_TRACE_WARNING(fmt, args...)                {if (sdp_cb.trace_level >= BT_TRACE_LEVEL_WARNING) ets_printf(fmt, ## args);}
-#define SDP_TRACE_API(fmt, args...)            {if (sdp_cb.trace_level >= BT_TRACE_LEVEL_API) ets_printf(fmt, ## args);}
-#define SDP_TRACE_EVENT(fmt, args...)          {if (sdp_cb.trace_level >= BT_TRACE_LEVEL_EVENT) ets_printf(fmt, ## args);}
-#define SDP_TRACE_DEBUG(fmt, args...)          {if (sdp_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) ets_printf(fmt, ## args);}
+#define SDP_TRACE_ERROR(fmt, args...)          {if (sdp_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
+#define SDP_TRACE_WARNING(fmt, args...)                {if (sdp_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
+#define SDP_TRACE_API(fmt, args...)            {if (sdp_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
+#define SDP_TRACE_EVENT(fmt, args...)          {if (sdp_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
+#define SDP_TRACE_DEBUG(fmt, args...)          {if (sdp_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
 
 /* Define tracing for the RFCOMM unit
 */
-#define RFCOMM_TRACE_ERROR(fmt, args...)       {if (rfc_cb.trace_level >= BT_TRACE_LEVEL_ERROR) ets_printf(fmt, ## args);}
-#define RFCOMM_TRACE_WARNING(fmt, args...)     {if (rfc_cb.trace_level >= BT_TRACE_LEVEL_WARNING) ets_printf(fmt, ## args);}
-#define RFCOMM_TRACE_API(fmt, args...)         {if (rfc_cb.trace_level >= BT_TRACE_LEVEL_API) ets_printf(fmt, ## args);}
-#define RFCOMM_TRACE_EVENT(fmt, args...)       {if (rfc_cb.trace_level >= BT_TRACE_LEVEL_EVENT) ets_printf(fmt, ## args);}
-#define RFCOMM_TRACE_DEBUG(fmt, args...)       {if (rfc_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) ets_printf(fmt, ## args);}
+#define RFCOMM_TRACE_ERROR(fmt, args...)       {if (rfc_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
+#define RFCOMM_TRACE_WARNING(fmt, args...)     {if (rfc_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
+#define RFCOMM_TRACE_API(fmt, args...)         {if (rfc_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
+#define RFCOMM_TRACE_EVENT(fmt, args...)       {if (rfc_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
+#define RFCOMM_TRACE_DEBUG(fmt, args...)       {if (rfc_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
 
 /* Generic Access Profile traces */
-#define GAP_TRACE_ERROR(fmt, args...)          {if (gap_cb.trace_level >= BT_TRACE_LEVEL_ERROR) ets_printf(fmt, ## args);}
-#define GAP_TRACE_EVENT(fmt, args...)          {if (gap_cb.trace_level >= BT_TRACE_LEVEL_EVENT) ets_printf(fmt, ## args);}
-#define GAP_TRACE_API(fmt, args...)            {if (gap_cb.trace_level >= BT_TRACE_LEVEL_API) ets_printf(fmt, ## args);}
-#define GAP_TRACE_WARNING(fmt, args...)                {if (gap_cb.trace_level >= BT_TRACE_LEVEL_WARNING) ets_printf(fmt, ## args);}
+#define GAP_TRACE_ERROR(fmt, args...)          {if (gap_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
+#define GAP_TRACE_EVENT(fmt, args...)          {if (gap_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
+#define GAP_TRACE_API(fmt, args...)            {if (gap_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
+#define GAP_TRACE_WARNING(fmt, args...)                {if (gap_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
 
 /* define traces for HID Host */
-#define HIDH_TRACE_ERROR(fmt, args...)         {if (hh_cb.trace_level >= BT_TRACE_LEVEL_ERROR) ets_printf(fmt, ## args);}
-#define HIDH_TRACE_WARNING(fmt, args...)       {if (hh_cb.trace_level >= BT_TRACE_LEVEL_WARNING) ets_printf(fmt, ## args);}
-#define HIDH_TRACE_API(fmt, args...)           {if (hh_cb.trace_level >= BT_TRACE_LEVEL_API) ets_printf(fmt, ## args);}
-#define HIDH_TRACE_EVENT(fmt, args...)         {if (hh_cb.trace_level >= BT_TRACE_LEVEL_EVENT) ets_printf(fmt, ## args);}
-#define HIDH_TRACE_DEBUG(fmt, args...)         {if (hh_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) ets_printf(fmt, ## args);}
+#define HIDH_TRACE_ERROR(fmt, args...)         {if (hh_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
+#define HIDH_TRACE_WARNING(fmt, args...)       {if (hh_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
+#define HIDH_TRACE_API(fmt, args...)           {if (hh_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
+#define HIDH_TRACE_EVENT(fmt, args...)         {if (hh_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
+#define HIDH_TRACE_DEBUG(fmt, args...)         {if (hh_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
 
 /* define traces for BNEP */
 
-#define BNEP_TRACE_ERROR(fmt, args...)         {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_ERROR) ets_printf(fmt, ## args);}
-#define BNEP_TRACE_WARNING(fmt, args...)       {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_WARNING) ets_printf(fmt, ## args);}
-#define BNEP_TRACE_API(fmt, args...)           {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_API) ets_printf(fmt, ## args);}
-#define BNEP_TRACE_EVENT(fmt, args...)         {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_EVENT) ets_printf(fmt, ## args);}
-#define BNEP_TRACE_DEBUG(fmt, args...)         {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) ets_printf(fmt, ## args);}
+#define BNEP_TRACE_ERROR(fmt, args...)         {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
+#define BNEP_TRACE_WARNING(fmt, args...)       {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
+#define BNEP_TRACE_API(fmt, args...)           {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
+#define BNEP_TRACE_EVENT(fmt, args...)         {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
+#define BNEP_TRACE_DEBUG(fmt, args...)         {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
 
 /* define traces for PAN */
 
-#define PAN_TRACE_ERROR(fmt, args...)          {if (pan_cb.trace_level >= BT_TRACE_LEVEL_ERROR) ets_printf(fmt, ## args);}
-#define PAN_TRACE_WARNING(fmt, args...)                {if (pan_cb.trace_level >= BT_TRACE_LEVEL_WARNING) ets_printf(fmt, ## args);}
-#define PAN_TRACE_API(fmt, args...)            {if (pan_cb.trace_level >= BT_TRACE_LEVEL_API) ets_printf(fmt, ## args);}
-#define PAN_TRACE_EVENT(fmt, args...)          {if (pan_cb.trace_level >= BT_TRACE_LEVEL_EVENT) ets_printf(fmt, ## args);}
-#define PAN_TRACE_DEBUG(fmt, args...)          {if (pan_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) ets_printf(fmt, ## args);}
+#define PAN_TRACE_ERROR(fmt, args...)          {if (pan_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
+#define PAN_TRACE_WARNING(fmt, args...)                {if (pan_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
+#define PAN_TRACE_API(fmt, args...)            {if (pan_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
+#define PAN_TRACE_EVENT(fmt, args...)          {if (pan_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
+#define PAN_TRACE_DEBUG(fmt, args...)          {if (pan_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
 
 /* Define tracing for the A2DP profile
 */
-#define A2D_TRACE_ERROR(fmt, args...)          {if (a2d_cb.trace_level >= BT_TRACE_LEVEL_ERROR) ets_printf(fmt, ## args);}
-#define A2D_TRACE_WARNING(fmt, args...)                {if (a2d_cb.trace_level >= BT_TRACE_LEVEL_WARNING) ets_printf(fmt, ## args);}
-#define A2D_TRACE_EVENT(fmt, args...)          {if (a2d_cb.trace_level >= BT_TRACE_LEVEL_EVENT) ets_printf(fmt, ## args);}
-#define A2D_TRACE_DEBUG(fmt, args...)          {if (a2d_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) ets_printf(fmt, ## args);}
-#define A2D_TRACE_API(fmt, args...)            {if (a2d_cb.trace_level >= BT_TRACE_LEVEL_API) ets_printf(fmt, ## args);}
+#define A2D_TRACE_ERROR(fmt, args...)          {if (a2d_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
+#define A2D_TRACE_WARNING(fmt, args...)                {if (a2d_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
+#define A2D_TRACE_EVENT(fmt, args...)          {if (a2d_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
+#define A2D_TRACE_DEBUG(fmt, args...)          {if (a2d_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
+#define A2D_TRACE_API(fmt, args...)            {if (a2d_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
 
 /* AVDTP
 */
-#define AVDT_TRACE_ERROR(fmt, args...)         {if (avdt_cb.trace_level >= BT_TRACE_LEVEL_ERROR) ets_printf(fmt, ## args);}
-#define AVDT_TRACE_WARNING(fmt, args...)       {if (avdt_cb.trace_level >= BT_TRACE_LEVEL_WARNING) ets_printf(fmt, ## args);}
-#define AVDT_TRACE_EVENT(fmt, args...)         {if (avdt_cb.trace_level >= BT_TRACE_LEVEL_EVENT) ets_printf(fmt, ## args);}
-#define AVDT_TRACE_DEBUG(fmt, args...)         {if (avdt_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) ets_printf(fmt, ## args);}
-#define AVDT_TRACE_API(fmt, args...)           {if (avdt_cb.trace_level >= BT_TRACE_LEVEL_API) ets_printf(fmt, ## args);}
+#define AVDT_TRACE_ERROR(fmt, args...)         {if (avdt_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
+#define AVDT_TRACE_WARNING(fmt, args...)       {if (avdt_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
+#define AVDT_TRACE_EVENT(fmt, args...)         {if (avdt_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
+#define AVDT_TRACE_DEBUG(fmt, args...)         {if (avdt_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
+#define AVDT_TRACE_API(fmt, args...)           {if (avdt_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
 
 /* Define tracing for the AVCTP protocol
 */
-#define AVCT_TRACE_ERROR(fmt, args...)         {if (avct_cb.trace_level >= BT_TRACE_LEVEL_ERROR) ets_printf(fmt, ## args);}
-#define AVCT_TRACE_WARNING(fmt, args...)       {if (avct_cb.trace_level >= BT_TRACE_LEVEL_WARNING) ets_printf(fmt, ## args);}
-#define AVCT_TRACE_EVENT(fmt, args...)         {if (avct_cb.trace_level >= BT_TRACE_LEVEL_EVENT) ets_printf(fmt, ## args);}
-#define AVCT_TRACE_DEBUG(fmt, args...)         {if (avct_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) ets_printf(fmt, ## args);}
-#define AVCT_TRACE_API(fmt, args...)           {if (avct_cb.trace_level >= BT_TRACE_LEVEL_API) ets_printf(fmt, ## args);}
+#define AVCT_TRACE_ERROR(fmt, args...)         {if (avct_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
+#define AVCT_TRACE_WARNING(fmt, args...)       {if (avct_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
+#define AVCT_TRACE_EVENT(fmt, args...)         {if (avct_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
+#define AVCT_TRACE_DEBUG(fmt, args...)         {if (avct_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
+#define AVCT_TRACE_API(fmt, args...)           {if (avct_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
 
 /* Define tracing for the AVRCP profile
 */
-#define AVRC_TRACE_ERROR(fmt, args...)         {if (avrc_cb.trace_level >= BT_TRACE_LEVEL_ERROR) ets_printf(fmt, ## args);}
-#define AVRC_TRACE_WARNING(fmt, args...)       {if (avrc_cb.trace_level >= BT_TRACE_LEVEL_WARNING) ets_printf(fmt, ## args);}
-#define AVRC_TRACE_EVENT(fmt, args...)         {if (avrc_cb.trace_level >= BT_TRACE_LEVEL_EVENT) ets_printf(fmt, ## args);}
-#define AVRC_TRACE_DEBUG(fmt, args...)         {if (avrc_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) ets_printf(fmt, ## args);}
-#define AVRC_TRACE_API(fmt, args...)           {if (avrc_cb.trace_level >= BT_TRACE_LEVEL_API) ets_printf(fmt, ## args);}
+#define AVRC_TRACE_ERROR(fmt, args...)         {if (avrc_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
+#define AVRC_TRACE_WARNING(fmt, args...)       {if (avrc_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
+#define AVRC_TRACE_EVENT(fmt, args...)         {if (avrc_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
+#define AVRC_TRACE_DEBUG(fmt, args...)         {if (avrc_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
+#define AVRC_TRACE_API(fmt, args...)           {if (avrc_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
 
 /* MCAP
 */
-#define MCA_TRACE_ERROR(fmt, args...)          {if (mca_cb.trace_level >= BT_TRACE_LEVEL_ERROR) ets_printf(fmt, ## args);}
-#define MCA_TRACE_WARNING(fmt, args...)                {if (mca_cb.trace_level >= BT_TRACE_LEVEL_WARNING) ets_printf(fmt, ## args);}
-#define MCA_TRACE_EVENT(fmt, args...)          {if (mca_cb.trace_level >= BT_TRACE_LEVEL_EVENT) ets_printf(fmt, ## args);}
-#define MCA_TRACE_DEBUG(fmt, args...)          {if (mca_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) ets_printf(fmt, ## args);}
-#define MCA_TRACE_API(fmt, args...)            {if (mca_cb.trace_level >= BT_TRACE_LEVEL_API) ets_printf(fmt, ## args);}
+#define MCA_TRACE_ERROR(fmt, args...)          {if (mca_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
+#define MCA_TRACE_WARNING(fmt, args...)                {if (mca_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
+#define MCA_TRACE_EVENT(fmt, args...)          {if (mca_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
+#define MCA_TRACE_DEBUG(fmt, args...)          {if (mca_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
+#define MCA_TRACE_API(fmt, args...)            {if (mca_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
 
 /* Define tracing for the ATT/GATT unit
 */
-#define GATT_TRACE_ERROR(fmt, args...)         {if (gatt_cb.trace_level >= BT_TRACE_LEVEL_ERROR) ets_printf(fmt, ## args);}
-#define GATT_TRACE_WARNING(fmt, args...)       {if (gatt_cb.trace_level >= BT_TRACE_LEVEL_WARNING) ets_printf(fmt, ## args);}
-#define GATT_TRACE_API(fmt, args...)           {if (gatt_cb.trace_level >= BT_TRACE_LEVEL_API) ets_printf(fmt, ## args);}
-#define GATT_TRACE_EVENT(fmt, args...)         {if (gatt_cb.trace_level >= BT_TRACE_LEVEL_EVENT) ets_printf(fmt, ## args);}
-#define GATT_TRACE_DEBUG(fmt, args...)         {if (gatt_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) ets_printf(fmt, ## args);}
+#define GATT_TRACE_ERROR(fmt, args...)         {if (gatt_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
+#define GATT_TRACE_WARNING(fmt, args...)       {if (gatt_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
+#define GATT_TRACE_API(fmt, args...)           {if (gatt_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
+#define GATT_TRACE_EVENT(fmt, args...)         {if (gatt_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
+#define GATT_TRACE_DEBUG(fmt, args...)         {if (gatt_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
 
 /* Define tracing for the SMP unit
 */
-#define SMP_TRACE_ERROR(fmt, args...)          {if (smp_cb.trace_level >= BT_TRACE_LEVEL_ERROR) ets_printf(fmt, ## args);}
-#define SMP_TRACE_WARNING(fmt, args...)                {if (smp_cb.trace_level >= BT_TRACE_LEVEL_WARNING) ets_printf(fmt, ## args);}
-#define SMP_TRACE_API(fmt, args...)            {if (smp_cb.trace_level >= BT_TRACE_LEVEL_API) ets_printf(fmt, ## args);}
-#define SMP_TRACE_EVENT(fmt, args...)          {if (smp_cb.trace_level >= BT_TRACE_LEVEL_EVENT) ets_printf(fmt, ## args);}
-#define SMP_TRACE_DEBUG(fmt, args...)          {if (smp_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) ets_printf(fmt, ## args);}
+#define SMP_TRACE_ERROR(fmt, args...)          {if (smp_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
+#define SMP_TRACE_WARNING(fmt, args...)                {if (smp_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
+#define SMP_TRACE_API(fmt, args...)            {if (smp_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
+#define SMP_TRACE_EVENT(fmt, args...)          {if (smp_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
+#define SMP_TRACE_DEBUG(fmt, args...)          {if (smp_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
 
 extern UINT8 btif_trace_level;
 
 // define traces for application
-#define BTIF_TRACE_ERROR(fmt, args...)         {if (btif_trace_level >= BT_TRACE_LEVEL_ERROR) ets_printf(fmt, ## args);}
-#define BTIF_TRACE_WARNING(fmt, args...)       {if (btif_trace_level >= BT_TRACE_LEVEL_WARNING) ets_printf(fmt, ## args);}
-#define BTIF_TRACE_API(fmt, args...)           {if (btif_trace_level >= BT_TRACE_LEVEL_API) ets_printf(fmt, ## args);}
-#define BTIF_TRACE_EVENT(fmt, args...)         {if (btif_trace_level >= BT_TRACE_LEVEL_EVENT) ets_printf(fmt, ## args);}
-#define BTIF_TRACE_DEBUG(fmt, args...)         {if (btif_trace_level >= BT_TRACE_LEVEL_DEBUG) ets_printf(fmt, ## args);}
-#define BTIF_TRACE_VERBOSE(fmt, args...)       {if (btif_trace_level >= BT_TRACE_LEVEL_VERBOSE)ets_printf(fmt, ## args);}
+#define BTIF_TRACE_ERROR(fmt, args...)         {if (btif_trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
+#define BTIF_TRACE_WARNING(fmt, args...)       {if (btif_trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
+#define BTIF_TRACE_API(fmt, args...)           {if (btif_trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
+#define BTIF_TRACE_EVENT(fmt, args...)         {if (btif_trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
+#define BTIF_TRACE_DEBUG(fmt, args...)         {if (btif_trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
+#define BTIF_TRACE_VERBOSE(fmt, args...)       {if (btif_trace_level >= BT_TRACE_LEVEL_VERBOSE)BT_PRINTF(fmt, ## args);}
 
 /* define traces for application */
 
-#define APPL_TRACE_ERROR(fmt, args...)         {if (appl_trace_level >= BT_TRACE_LEVEL_ERROR) ets_printf(fmt, ## args);}
-#define APPL_TRACE_WARNING(fmt, args...)       {if (appl_trace_level >= BT_TRACE_LEVEL_WARNING) ets_printf(fmt, ## args);}
-#define APPL_TRACE_API(fmt, args...)           {if (appl_trace_level >= BT_TRACE_LEVEL_API) ets_printf(fmt, ## args);}
-#define APPL_TRACE_EVENT(fmt, args...)         {if (appl_trace_level >= BT_TRACE_LEVEL_EVENT) ets_printf(fmt, ## args);}
-#define APPL_TRACE_DEBUG(fmt, args...)         {if (appl_trace_level >= BT_TRACE_LEVEL_DEBUG) ets_printf(fmt, ## args);}
-#define APPL_TRACE_VERBOSE(fmt, args...)       {if (appl_trace_level >= BT_TRACE_LEVEL_VERBOSE) ets_printf(fmt, ## args);}
+#define APPL_TRACE_ERROR(fmt, args...)         {if (appl_trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
+#define APPL_TRACE_WARNING(fmt, args...)       {if (appl_trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
+#define APPL_TRACE_API(fmt, args...)           {if (appl_trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
+#define APPL_TRACE_EVENT(fmt, args...)         {if (appl_trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
+#define APPL_TRACE_DEBUG(fmt, args...)         {if (appl_trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
+#define APPL_TRACE_VERBOSE(fmt, args...)       {if (appl_trace_level >= BT_TRACE_LEVEL_VERBOSE) BT_PRINTF(fmt, ## args);}
 
 /* Simplified Trace Helper Macro
 */
 #define bdld(fmt, args...) \
     do{\
         if((MY_LOG_LEVEL) >= BT_TRACE_LEVEL_DEBUG) \
-               ets_printf(fmt, ## args);               \
+               BT_PRINTF(fmt, ## args);                \
     }while(0)
 
 #define bdlw(fmt, args...) \
     do{\
         if((MY_LOG_LEVEL) >= BT_TRACE_LEVEL_DEBUG) \
-               ets_printf(fmt, ## args);               \
+               BT_PRINTF(fmt, ## args);                \
     }while(0)
 
 #define bdle(fmt, args...) \
     do{\
         if((MY_LOG_LEVEL) >= BT_TRACE_LEVEL_DEBUG) \
-               ets_printf(fmt, ## args);               \
+               BT_PRINTF(fmt, ## args);                \
     }while(0)
 
 #define bdla(assert_if) \
     do{\
         if(((MY_LOG_LEVEL) >= BT_TRACE_LEVEL_ERROR) && !(assert_if)) \
-               ets_printf("%s: assert failed\n", #assert_if);          \
+               BT_PRINTF("%s: assert failed\n", #assert_if);           \
     }while(0)
 
 typedef UINT8 tBTTRC_PARAM_TYPE;

diff --git a/components/bt/bluedroid/stack/btm/btm_sec.c b/components/bt/bluedroid/stack/btm/btm_sec.c
index 083c276db96b06dde27d449919c223ffd1785d7b..611acecb7a5eff3125fbf3291019323f3d0b2803 100755 (executable)
--- a/components/bt/bluedroid/stack/btm/btm_sec.c
+++ b/components/bt/bluedroid/stack/btm/btm_sec.c
@@ -2251,7 +2251,7 @@ tBTM_STATUS btm_sec_l2cap_access_req (BD_ADDR bd_addr, UINT16 psm, UINT16 handle
         /* acceptor receives L2CAP Channel Connect Request for Secure Connections Only service */
         if (!(local_supports_sc) || !(p_dev_rec->remote_supports_secure_connections))
         {
-            BTM_TRACE_DEBUG("%s: SC only service, local_support_for_sc %d\n",
+            BTM_TRACE_DEBUG("%s: SC only service, local_support_for_sc %d\n"
                             "rmt_support_for_sc : %d -> fail pairing\n", __FUNCTION__,
                             local_supports_sc,
                             p_dev_rec->remote_supports_secure_connections);
@@ -2650,7 +2650,7 @@ tBTM_STATUS btm_sec_mx_access_request (BD_ADDR bd_addr, UINT16 psm, BOOLEAN is_o
         /* Secure Connections Only service */
         if (!(local_supports_sc) || !(p_dev_rec->remote_supports_secure_connections))
         {
-            BTM_TRACE_DEBUG("%s: SC only service,local_support_for_sc %d,\n",
+            BTM_TRACE_DEBUG("%s: SC only service,local_support_for_sc %d,\n"
                             "remote_support_for_sc %d: fail pairing\n",__FUNCTION__,
                             local_supports_sc, p_dev_rec->remote_supports_secure_connections);
 
@@ -3399,7 +3399,7 @@ void btm_io_capabilities_req (UINT8 *p)
 
     if ((btm_cb.security_mode == BTM_SEC_MODE_SC) && (p_dev_rec->num_read_pages == 0))
     {
-        BTM_TRACE_EVENT("%s: Device security mode is SC only.\n",
+        BTM_TRACE_EVENT("%s: Device security mode is SC only.\n"
                          "To continue need to know remote features.\n", __FUNCTION__);
 
         p_dev_rec->remote_features_needed = TRUE;
@@ -3471,7 +3471,7 @@ void btm_io_capabilities_req (UINT8 *p)
         /* device in Secure Connections Only mode */
         if (!(local_supports_sc) || !(p_dev_rec->remote_supports_secure_connections))
         {
-            BTM_TRACE_DEBUG("%s: SC only service, local_support_for_sc %d,\n",
+            BTM_TRACE_DEBUG("%s: SC only service, local_support_for_sc %d,\n"
                             " remote_support_for_sc 0x%02x -> fail pairing\n", __FUNCTION__,
                             local_supports_sc, p_dev_rec->remote_supports_secure_connections);
 
@@ -5503,7 +5503,7 @@ static tBTM_STATUS btm_sec_execute_procedure (tBTM_SEC_DEV_REC *p_dev_rec)
     if ((p_dev_rec->security_required & BTM_SEC_MODE4_LEVEL4) &&
         (p_dev_rec->link_key_type != BTM_LKEY_TYPE_AUTH_COMB_P_256))
     {
-        BTM_TRACE_EVENT("%s: Security Manager: SC only service, but link key type is 0x%02x -",
+        BTM_TRACE_EVENT("%s: Security Manager: SC only service, but link key type is 0x%02x -"
                         "security failure\n", __FUNCTION__, p_dev_rec->link_key_type);
         return (BTM_FAILED_ON_SECURITY);
     }

diff --git a/components/bt/bluedroid/stack/gatt/gatt_utils.c b/components/bt/bluedroid/stack/gatt/gatt_utils.c
index c882a1b3d2a5f1244c509099257d395e68ed9af3..b3daa708db53e73d1defe53c623e2e0a97cd1af8 100755 (executable)
--- a/components/bt/bluedroid/stack/gatt/gatt_utils.c
+++ b/components/bt/bluedroid/stack/gatt/gatt_utils.c
@@ -2703,7 +2703,7 @@ BOOLEAN gatt_update_auto_connect_dev (tGATT_IF gatt_if, BOOLEAN add, BD_ADDR bd_
     /* Make sure app is registered */
     if ((p_reg = gatt_get_regcb(gatt_if)) == NULL)
     {
-        GATT_TRACE_ERROR("gatt_update_auto_connect_dev - gatt_if is not registered", gatt_if);
+        GATT_TRACE_ERROR("gatt_update_auto_connect_dev - gatt_if %d is not registered", gatt_if);
         return(FALSE);
     }
 

diff --git a/components/bt/bluedroid/stack/l2cap/l2c_api.c b/components/bt/bluedroid/stack/l2cap/l2c_api.c
index 7f698d6dda8f781577ffa25abe18681ce59318de..5b06f35cc57e13f18cbb34168bb0ba1ff0138b51 100755 (executable)
--- a/components/bt/bluedroid/stack/l2cap/l2c_api.c
+++ b/components/bt/bluedroid/stack/l2cap/l2c_api.c
@@ -1441,7 +1441,7 @@ BOOLEAN L2CA_ConnectFixedChnl (UINT16 fixed_cid, BD_ADDR rem_bda)
         // racing with disconnecting, queue the connection request
         if (p_lcb->link_state == LST_DISCONNECTING)
         {
-            L2CAP_TRACE_DEBUG ("$s() - link disconnecting: RETRY LATER", __func__);
+            L2CAP_TRACE_DEBUG ("%s() - link disconnecting: RETRY LATER", __func__);
             /* Save ccb so it can be started after disconnect is finished */
             p_lcb->p_pending_ccb = p_lcb->p_fixed_ccbs[fixed_cid - L2CAP_FIRST_FIXED_CHNL];
             return TRUE;

diff --git a/components/bt/component.mk b/components/bt/component.mk
index dcff2b62ae0cbbb0825d52f5c252c3bb551ef0e7..7f165a600db5751115f749728ae27be5d32835de 100644 (file)
--- a/components/bt/component.mk
+++ b/components/bt/component.mk
@@ -30,7 +30,7 @@ COMPONENT_ADD_INCLUDEDIRS :=  bluedroid/bta/include                   \
                                bluedroid/include                       \
                                include 
 
-CFLAGS += -Wno-error=unused-label -Wno-error=return-type -Wno-error=missing-braces -Wno-error=pointer-sign -Wno-error=parentheses
+CFLAGS += -Wno-error=unused-label -Wno-error=return-type -Wno-error=missing-braces -Wno-error=pointer-sign -Wno-error=parentheses -Wno-error=format
 
 LIBS := btdm_app