Logging cleanup: HIDH, BNEP, and PAN.
Change-Id: I3b81b6875c764f0642be4f4d8905aa24524ea902
diff --git a/include/bt_trace.h b/include/bt_trace.h
index 11db0db..16f0acb 100644
--- a/include/bt_trace.h
+++ b/include/bt_trace.h
@@ -668,129 +668,27 @@
#define GAP_TRACE_WARNING(...) {if (gap_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_GAP, TRACE_TYPE_WARNING, ##__VA_ARGS__);}
/* define traces for HID Host */
-#define HIDH_TRACE_ERROR0(m) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_ERROR, m);}
-#define HIDH_TRACE_ERROR1(m,p1) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_ERROR, m, p1);}
-#define HIDH_TRACE_ERROR2(m,p1,p2) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_ERROR, m,p1,p2);}
-#define HIDH_TRACE_ERROR3(m,p1,p2,p3) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_ERROR, m,p1,p2,p3);}
-#define HIDH_TRACE_ERROR4(m,p1,p2,p3,p4) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_ERROR, m,p1,p2,p3,p4);}
-#define HIDH_TRACE_ERROR5(m,p1,p2,p3,p4,p5) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_ERROR, m,p1,p2,p3,p4,p5);}
-#define HIDH_TRACE_ERROR6(m,p1,p2,p3,p4,p5,p6) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_ERROR, m,p1,p2,p3,p4,p5,p6);}
-
-#define HIDH_TRACE_WARNING0(m) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_WARNING, m);}
-#define HIDH_TRACE_WARNING1(m,p1) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_WARNING, m,p1);}
-#define HIDH_TRACE_WARNING2(m,p1,p2) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_WARNING, m,p1,p2);}
-#define HIDH_TRACE_WARNING3(m,p1,p2,p3) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_WARNING, m,p1,p2,p3);}
-#define HIDH_TRACE_WARNING4(m,p1,p2,p3,p4) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_WARNING, m,p1,p2,p3,p4);}
-#define HIDH_TRACE_WARNING5(m,p1,p2,p3,p4,p5) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_WARNING, m,p1,p2,p3,p4,p5);}
-#define HIDH_TRACE_WARNING6(m,p1,p2,p3,p4,p5,p6) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_WARNING, m,p1,p2,p3,p4,p5,p6);}
-
-#define HIDH_TRACE_API0(m) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_API, m);}
-#define HIDH_TRACE_API1(m,p1) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_API, m, p1);}
-#define HIDH_TRACE_API2(m,p1,p2) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_API, m,p1,p2);}
-#define HIDH_TRACE_API3(m,p1,p2,p3) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_API, m,p1,p2,p3);}
-#define HIDH_TRACE_API4(m,p1,p2,p3,p4) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_API, m,p1,p2,p3,p4);}
-#define HIDH_TRACE_API5(m,p1,p2,p3,p4,p5) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_API, m,p1,p2,p3,p4,p5);}
-#define HIDH_TRACE_API6(m,p1,p2,p3,p4,p5,p6) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_API, m,p1,p2,p3,p4,p5,p6);}
-
-#define HIDH_TRACE_EVENT0(m) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_EVENT, m);}
-#define HIDH_TRACE_EVENT1(m,p1) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_EVENT, m, p1);}
-#define HIDH_TRACE_EVENT2(m,p1,p2) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_EVENT, m,p1,p2);}
-#define HIDH_TRACE_EVENT3(m,p1,p2,p3) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_EVENT, m,p1,p2,p3);}
-#define HIDH_TRACE_EVENT4(m,p1,p2,p3,p4) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_EVENT, m,p1,p2,p3,p4);}
-#define HIDH_TRACE_EVENT5(m,p1,p2,p3,p4,p5) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_EVENT, m,p1,p2,p3,p4,p5);}
-#define HIDH_TRACE_EVENT6(m,p1,p2,p3,p4,p5,p6) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_EVENT, m,p1,p2,p3,p4,p5,p6);}
-
-#define HIDH_TRACE_DEBUG0(m) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_DEBUG, m);}
-#define HIDH_TRACE_DEBUG1(m,p1) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_DEBUG, m,p1);}
-#define HIDH_TRACE_DEBUG2(m,p1,p2) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_DEBUG, m,p1,p2);}
-#define HIDH_TRACE_DEBUG3(m,p1,p2,p3) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_DEBUG, m,p1,p2,p3);}
-#define HIDH_TRACE_DEBUG4(m,p1,p2,p3,p4) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_DEBUG, m,p1,p2,p3,p4);}
-#define HIDH_TRACE_DEBUG5(m,p1,p2,p3,p4,p5) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_DEBUG, m,p1,p2,p3,p4,p5);}
-#define HIDH_TRACE_DEBUG6(m,p1,p2,p3,p4,p5,p6) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_DEBUG, m,p1,p2,p3,p4,p5,p6);}
+#define HIDH_TRACE_ERROR(...) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_ERROR, ##__VA_ARGS__);}
+#define HIDH_TRACE_WARNING(...) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_WARNING, ##__VA_ARGS__);}
+#define HIDH_TRACE_API(...) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_API, ##__VA_ARGS__);}
+#define HIDH_TRACE_EVENT(...) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_EVENT, ##__VA_ARGS__);}
+#define HIDH_TRACE_DEBUG(...) {if (hh_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_HID, TRACE_TYPE_DEBUG, ##__VA_ARGS__);}
/* define traces for BNEP */
-#define BNEP_TRACE_ERROR0(m) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_ERROR, m);}
-#define BNEP_TRACE_ERROR1(m,p1) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_ERROR, m, p1);}
-#define BNEP_TRACE_ERROR2(m,p1,p2) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_ERROR, m,p1,p2);}
-#define BNEP_TRACE_ERROR3(m,p1,p2,p3) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_ERROR, m,p1,p2,p3);}
-#define BNEP_TRACE_ERROR4(m,p1,p2,p3,p4) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_ERROR, m,p1,p2,p3,p4);}
-#define BNEP_TRACE_ERROR5(m,p1,p2,p3,p4,p5) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_ERROR, m,p1,p2,p3,p4,p5);}
-#define BNEP_TRACE_ERROR6(m,p1,p2,p3,p4,p5,p6) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_ERROR, m,p1,p2,p3,p4,p5,p6);}
-
-#define BNEP_TRACE_WARNING0(m) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_WARNING, m);}
-#define BNEP_TRACE_WARNING1(m,p1) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_WARNING, m,p1);}
-#define BNEP_TRACE_WARNING2(m,p1,p2) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_WARNING, m,p1,p2);}
-#define BNEP_TRACE_WARNING3(m,p1,p2,p3) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_WARNING, m,p1,p2,p3);}
-#define BNEP_TRACE_WARNING4(m,p1,p2,p3,p4) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_WARNING, m,p1,p2,p3,p4);}
-#define BNEP_TRACE_WARNING5(m,p1,p2,p3,p4,p5) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_WARNING, m,p1,p2,p3,p4,p5);}
-#define BNEP_TRACE_WARNING6(m,p1,p2,p3,p4,p5,p6) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_WARNING, m,p1,p2,p3,p4,p5,p6);}
-
-#define BNEP_TRACE_API0(m) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_API, m);}
-#define BNEP_TRACE_API1(m,p1) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_API, m, p1);}
-#define BNEP_TRACE_API2(m,p1,p2) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_API, m,p1,p2);}
-#define BNEP_TRACE_API3(m,p1,p2,p3) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_API, m,p1,p2,p3);}
-#define BNEP_TRACE_API4(m,p1,p2,p3,p4) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_API, m,p1,p2,p3,p4);}
-#define BNEP_TRACE_API5(m,p1,p2,p3,p4,p5) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_API, m,p1,p2,p3,p4,p5);}
-#define BNEP_TRACE_API6(m,p1,p2,p3,p4,p5,p6) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_API, m,p1,p2,p3,p4,p5,p6);}
-
-#define BNEP_TRACE_EVENT0(m) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_EVENT, m);}
-#define BNEP_TRACE_EVENT1(m,p1) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_EVENT, m, p1);}
-#define BNEP_TRACE_EVENT2(m,p1,p2) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_EVENT, m,p1,p2);}
-#define BNEP_TRACE_EVENT3(m,p1,p2,p3) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_EVENT, m,p1,p2,p3);}
-#define BNEP_TRACE_EVENT4(m,p1,p2,p3,p4) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_EVENT, m,p1,p2,p3,p4);}
-#define BNEP_TRACE_EVENT5(m,p1,p2,p3,p4,p5) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_EVENT, m,p1,p2,p3,p4,p5);}
-#define BNEP_TRACE_EVENT6(m,p1,p2,p3,p4,p5,p6) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_EVENT, m,p1,p2,p3,p4,p5,p6);}
-
-#define BNEP_TRACE_DEBUG0(m) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_DEBUG, m);}
-#define BNEP_TRACE_DEBUG1(m,p1) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_DEBUG, m,p1);}
-#define BNEP_TRACE_DEBUG2(m,p1,p2) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_DEBUG, m,p1,p2);}
-#define BNEP_TRACE_DEBUG3(m,p1,p2,p3) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_DEBUG, m,p1,p2,p3);}
-#define BNEP_TRACE_DEBUG4(m,p1,p2,p3,p4) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_DEBUG, m,p1,p2,p3,p4);}
-#define BNEP_TRACE_DEBUG5(m,p1,p2,p3,p4,p5) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_DEBUG, m,p1,p2,p3,p4,p5);}
-#define BNEP_TRACE_DEBUG6(m,p1,p2,p3,p4,p5,p6) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_DEBUG, m,p1,p2,p3,p4,p5,p6);}
+#define BNEP_TRACE_ERROR(...) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_ERROR, ##__VA_ARGS__);}
+#define BNEP_TRACE_WARNING(...) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_WARNING, ##__VA_ARGS__);}
+#define BNEP_TRACE_API(...) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_API, ##__VA_ARGS__);}
+#define BNEP_TRACE_EVENT(...) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_EVENT, ##__VA_ARGS__);}
+#define BNEP_TRACE_DEBUG(...) {if (bnep_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_BNEP, TRACE_TYPE_DEBUG, ##__VA_ARGS__);}
/* define traces for PAN */
-#define PAN_TRACE_ERROR0(m) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_ERROR, m);}
-#define PAN_TRACE_ERROR1(m,p1) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_ERROR, m, p1);}
-#define PAN_TRACE_ERROR2(m,p1,p2) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_ERROR, m,p1,p2);}
-#define PAN_TRACE_ERROR3(m,p1,p2,p3) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_ERROR, m,p1,p2,p3);}
-#define PAN_TRACE_ERROR4(m,p1,p2,p3,p4) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_ERROR, m,p1,p2,p3,p4);}
-#define PAN_TRACE_ERROR5(m,p1,p2,p3,p4,p5) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_ERROR, m,p1,p2,p3,p4,p5);}
-#define PAN_TRACE_ERROR6(m,p1,p2,p3,p4,p5,p6) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_ERROR, m,p1,p2,p3,p4,p5,p6);}
-
-#define PAN_TRACE_WARNING0(m) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_WARNING, m);}
-#define PAN_TRACE_WARNING1(m,p1) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_WARNING, m,p1);}
-#define PAN_TRACE_WARNING2(m,p1,p2) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_WARNING, m,p1,p2);}
-#define PAN_TRACE_WARNING3(m,p1,p2,p3) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_WARNING, m,p1,p2,p3);}
-#define PAN_TRACE_WARNING4(m,p1,p2,p3,p4) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_WARNING, m,p1,p2,p3,p4);}
-#define PAN_TRACE_WARNING5(m,p1,p2,p3,p4,p5) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_WARNING, m,p1,p2,p3,p4,p5);}
-#define PAN_TRACE_WARNING6(m,p1,p2,p3,p4,p5,p6) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_WARNING, m,p1,p2,p3,p4,p5,p6);}
-
-#define PAN_TRACE_API0(m) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_API, m);}
-#define PAN_TRACE_API1(m,p1) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_API, m, p1);}
-#define PAN_TRACE_API2(m,p1,p2) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_API, m,p1,p2);}
-#define PAN_TRACE_API3(m,p1,p2,p3) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_API, m,p1,p2,p3);}
-#define PAN_TRACE_API4(m,p1,p2,p3,p4) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_API, m,p1,p2,p3,p4);}
-#define PAN_TRACE_API5(m,p1,p2,p3,p4,p5) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_API, m,p1,p2,p3,p4,p5);}
-#define PAN_TRACE_API6(m,p1,p2,p3,p4,p5,p6) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_API, m,p1,p2,p3,p4,p5,p6);}
-
-#define PAN_TRACE_EVENT0(m) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_EVENT, m);}
-#define PAN_TRACE_EVENT1(m,p1) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_EVENT, m, p1);}
-#define PAN_TRACE_EVENT2(m,p1,p2) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_EVENT, m,p1,p2);}
-#define PAN_TRACE_EVENT3(m,p1,p2,p3) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_EVENT, m,p1,p2,p3);}
-#define PAN_TRACE_EVENT4(m,p1,p2,p3,p4) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_EVENT, m,p1,p2,p3,p4);}
-#define PAN_TRACE_EVENT5(m,p1,p2,p3,p4,p5) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_EVENT, m,p1,p2,p3,p4,p5);}
-#define PAN_TRACE_EVENT6(m,p1,p2,p3,p4,p5,p6) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_EVENT, m,p1,p2,p3,p4,p5,p6);}
-
-#define PAN_TRACE_DEBUG0(m) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_DEBUG, m);}
-#define PAN_TRACE_DEBUG1(m,p1) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_DEBUG, m,p1);}
-#define PAN_TRACE_DEBUG2(m,p1,p2) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_DEBUG, m,p1,p2);}
-#define PAN_TRACE_DEBUG3(m,p1,p2,p3) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_DEBUG, m,p1,p2,p3);}
-#define PAN_TRACE_DEBUG4(m,p1,p2,p3,p4) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_DEBUG, m,p1,p2,p3,p4);}
-#define PAN_TRACE_DEBUG5(m,p1,p2,p3,p4,p5) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_DEBUG, m,p1,p2,p3,p4,p5);}
-#define PAN_TRACE_DEBUG6(m,p1,p2,p3,p4,p5,p6) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_DEBUG, m,p1,p2,p3,p4,p5,p6);}
+#define PAN_TRACE_ERROR(...) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_ERROR, ##__VA_ARGS__);}
+#define PAN_TRACE_WARNING(...) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_WARNING, ##__VA_ARGS__);}
+#define PAN_TRACE_API(...) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_API, ##__VA_ARGS__);}
+#define PAN_TRACE_EVENT(...) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_EVENT, ##__VA_ARGS__);}
+#define PAN_TRACE_DEBUG(...) {if (pan_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_PAN, TRACE_TYPE_DEBUG, ##__VA_ARGS__);}
/* Define tracing for the A2DP profile
*/
@@ -1141,129 +1039,27 @@
#define GAP_TRACE_WARNING(...)
/* define traces for HID Host */
-#define HIDH_TRACE_ERROR0(m)
-#define HIDH_TRACE_ERROR1(m,p1)
-#define HIDH_TRACE_ERROR2(m,p1,p2)
-#define HIDH_TRACE_ERROR3(m,p1,p2,p3)
-#define HIDH_TRACE_ERROR4(m,p1,p2,p3,p4)
-#define HIDH_TRACE_ERROR5(m,p1,p2,p3,p4,p5)
-#define HIDH_TRACE_ERROR6(m,p1,p2,p3,p4,p5,p6)
-
-#define HIDH_TRACE_WARNING0(m)
-#define HIDH_TRACE_WARNING1(m,p1)
-#define HIDH_TRACE_WARNING2(m,p1,p2)
-#define HIDH_TRACE_WARNING3(m,p1,p2,p3)
-#define HIDH_TRACE_WARNING4(m,p1,p2,p3,p4)
-#define HIDH_TRACE_WARNING5(m,p1,p2,p3,p4,p5)
-#define HIDH_TRACE_WARNING6(m,p1,p2,p3,p4,p5,p6)
-
-#define HIDH_TRACE_API0(m)
-#define HIDH_TRACE_API1(m,p1)
-#define HIDH_TRACE_API2(m,p1,p2)
-#define HIDH_TRACE_API3(m,p1,p2,p3)
-#define HIDH_TRACE_API4(m,p1,p2,p3,p4)
-#define HIDH_TRACE_API5(m,p1,p2,p3,p4,p5)
-#define HIDH_TRACE_API6(m,p1,p2,p3,p4,p5,p6)
-
-#define HIDH_TRACE_EVENT0(m)
-#define HIDH_TRACE_EVENT1(m,p1)
-#define HIDH_TRACE_EVENT2(m,p1,p2)
-#define HIDH_TRACE_EVENT3(m,p1,p2,p3)
-#define HIDH_TRACE_EVENT4(m,p1,p2,p3,p4)
-#define HIDH_TRACE_EVENT5(m,p1,p2,p3,p4,p5)
-#define HIDH_TRACE_EVENT6(m,p1,p2,p3,p4,p5,p6)
-
-#define HIDH_TRACE_DEBUG0(m)
-#define HIDH_TRACE_DEBUG1(m,p1)
-#define HIDH_TRACE_DEBUG2(m,p1,p2)
-#define HIDH_TRACE_DEBUG3(m,p1,p2,p3)
-#define HIDH_TRACE_DEBUG4(m,p1,p2,p3,p4)
-#define HIDH_TRACE_DEBUG5(m,p1,p2,p3,p4,p5)
-#define HIDH_TRACE_DEBUG6(m,p1,p2,p3,p4,p5,p6)
+#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_ERROR0(m)
-#define BNEP_TRACE_ERROR1(m,p1)
-#define BNEP_TRACE_ERROR2(m,p1,p2)
-#define BNEP_TRACE_ERROR3(m,p1,p2,p3)
-#define BNEP_TRACE_ERROR4(m,p1,p2,p3,p4)
-#define BNEP_TRACE_ERROR5(m,p1,p2,p3,p4,p5)
-#define BNEP_TRACE_ERROR6(m,p1,p2,p3,p4,p5,p6)
-
-#define BNEP_TRACE_WARNING0(m)
-#define BNEP_TRACE_WARNING1(m,p1)
-#define BNEP_TRACE_WARNING2(m,p1,p2)
-#define BNEP_TRACE_WARNING3(m,p1,p2,p3)
-#define BNEP_TRACE_WARNING4(m,p1,p2,p3,p4)
-#define BNEP_TRACE_WARNING5(m,p1,p2,p3,p4,p5)
-#define BNEP_TRACE_WARNING6(m,p1,p2,p3,p4,p5,p6)
-
-#define BNEP_TRACE_API0(m)
-#define BNEP_TRACE_API1(m,p1)
-#define BNEP_TRACE_API2(m,p1,p2)
-#define BNEP_TRACE_API3(m,p1,p2,p3)
-#define BNEP_TRACE_API4(m,p1,p2,p3,p4)
-#define BNEP_TRACE_API5(m,p1,p2,p3,p4,p5)
-#define BNEP_TRACE_API6(m,p1,p2,p3,p4,p5,p6)
-
-#define BNEP_TRACE_EVENT0(m)
-#define BNEP_TRACE_EVENT1(m,p1)
-#define BNEP_TRACE_EVENT2(m,p1,p2)
-#define BNEP_TRACE_EVENT3(m,p1,p2,p3)
-#define BNEP_TRACE_EVENT4(m,p1,p2,p3,p4)
-#define BNEP_TRACE_EVENT5(m,p1,p2,p3,p4,p5)
-#define BNEP_TRACE_EVENT6(m,p1,p2,p3,p4,p5,p6)
-
-#define BNEP_TRACE_DEBUG0(m)
-#define BNEP_TRACE_DEBUG1(m,p1)
-#define BNEP_TRACE_DEBUG2(m,p1,p2)
-#define BNEP_TRACE_DEBUG3(m,p1,p2,p3)
-#define BNEP_TRACE_DEBUG4(m,p1,p2,p3,p4)
-#define BNEP_TRACE_DEBUG5(m,p1,p2,p3,p4,p5)
-#define BNEP_TRACE_DEBUG6(m,p1,p2,p3,p4,p5,p6)
+#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_ERROR0(m)
-#define PAN_TRACE_ERROR1(m,p1)
-#define PAN_TRACE_ERROR2(m,p1,p2)
-#define PAN_TRACE_ERROR3(m,p1,p2,p3)
-#define PAN_TRACE_ERROR4(m,p1,p2,p3,p4)
-#define PAN_TRACE_ERROR5(m,p1,p2,p3,p4,p5)
-#define PAN_TRACE_ERROR6(m,p1,p2,p3,p4,p5,p6)
-
-#define PAN_TRACE_WARNING0(m)
-#define PAN_TRACE_WARNING1(m,p1)
-#define PAN_TRACE_WARNING2(m,p1,p2)
-#define PAN_TRACE_WARNING3(m,p1,p2,p3)
-#define PAN_TRACE_WARNING4(m,p1,p2,p3,p4)
-#define PAN_TRACE_WARNING5(m,p1,p2,p3,p4,p5)
-#define PAN_TRACE_WARNING6(m,p1,p2,p3,p4,p5,p6)
-
-#define PAN_TRACE_API0(m)
-#define PAN_TRACE_API1(m,p1)
-#define PAN_TRACE_API2(m,p1,p2)
-#define PAN_TRACE_API3(m,p1,p2,p3)
-#define PAN_TRACE_API4(m,p1,p2,p3,p4)
-#define PAN_TRACE_API5(m,p1,p2,p3,p4,p5)
-#define PAN_TRACE_API6(m,p1,p2,p3,p4,p5,p6)
-
-#define PAN_TRACE_EVENT0(m)
-#define PAN_TRACE_EVENT1(m,p1)
-#define PAN_TRACE_EVENT2(m,p1,p2)
-#define PAN_TRACE_EVENT3(m,p1,p2,p3)
-#define PAN_TRACE_EVENT4(m,p1,p2,p3,p4)
-#define PAN_TRACE_EVENT5(m,p1,p2,p3,p4,p5)
-#define PAN_TRACE_EVENT6(m,p1,p2,p3,p4,p5,p6)
-
-#define PAN_TRACE_DEBUG0(m)
-#define PAN_TRACE_DEBUG1(m,p1)
-#define PAN_TRACE_DEBUG2(m,p1,p2)
-#define PAN_TRACE_DEBUG3(m,p1,p2,p3)
-#define PAN_TRACE_DEBUG4(m,p1,p2,p3,p4)
-#define PAN_TRACE_DEBUG5(m,p1,p2,p3,p4,p5)
-#define PAN_TRACE_DEBUG6(m,p1,p2,p3,p4,p5,p6)
+#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
*/
diff --git a/stack/bnep/bnep_api.c b/stack/bnep/bnep_api.c
index fbbf179..b1d8c7c 100644
--- a/stack/bnep/bnep_api.c
+++ b/stack/bnep/bnep_api.c
@@ -140,7 +140,7 @@
UINT16 cid;
tBNEP_CONN *p_bcb = bnepu_find_bcb_by_bd_addr (p_rem_bda);
- BNEP_TRACE_API6 ("BNEP_Connect() BDA: %02x-%02x-%02x-%02x-%02x-%02x",
+ BNEP_TRACE_API ("BNEP_Connect() BDA: %02x-%02x-%02x-%02x-%02x-%02x",
p_rem_bda[0], p_rem_bda[1], p_rem_bda[2],
p_rem_bda[3], p_rem_bda[4], p_rem_bda[5]);
@@ -181,7 +181,7 @@
/* Transition to the next appropriate state, waiting for connection confirm. */
p_bcb->con_state = BNEP_STATE_SEC_CHECKING;
- BNEP_TRACE_API1 ("BNEP initiating security procedures for src uuid 0x%x",
+ BNEP_TRACE_API ("BNEP initiating security procedures for src uuid 0x%x",
p_bcb->src_uuid.uu.uuid16);
#if (defined (BNEP_DO_AUTH_FOR_ROLE_SWITCH) && BNEP_DO_AUTH_FOR_ROLE_SWITCH == TRUE)
@@ -206,7 +206,7 @@
}
else
{
- BNEP_TRACE_ERROR0 ("BNEP - Originate failed");
+ BNEP_TRACE_ERROR ("BNEP - Originate failed");
if (bnep_cb.p_conn_state_cb)
(*bnep_cb.p_conn_state_cb) (p_bcb->handle, p_bcb->rem_bda, BNEP_CONN_FAILED, FALSE);
bnepu_release_bcb (p_bcb);
@@ -251,7 +251,7 @@
(!(p_bcb->con_flags & BNEP_FLAGS_SETUP_RCVD)))
return (BNEP_WRONG_STATE);
- BNEP_TRACE_API2 ("BNEP_ConnectResp() for handle %d, responce %d", handle, resp);
+ BNEP_TRACE_API ("BNEP_ConnectResp() for handle %d, responce %d", handle, resp);
/* Form appropriate responce based on profile responce */
if (resp == BNEP_CONN_FAILED_SRC_UUID) resp_code = BNEP_SETUP_INVALID_SRC_UUID;
@@ -327,7 +327,7 @@
if (p_bcb->con_state == BNEP_STATE_IDLE)
return (BNEP_WRONG_HANDLE);
- BNEP_TRACE_API1 ("BNEP_Disconnect() for handle %d", handle);
+ BNEP_TRACE_API ("BNEP_Disconnect() for handle %d", handle);
L2CA_DisconnectReq (p_bcb->l2cap_cid);
@@ -378,7 +378,7 @@
/* Check MTU size */
if (p_buf->len > BNEP_MTU_SIZE)
{
- BNEP_TRACE_ERROR2 ("BNEP_Write() length %d exceeded MTU %d", p_buf->len, BNEP_MTU_SIZE);
+ BNEP_TRACE_ERROR ("BNEP_Write() length %d exceeded MTU %d", p_buf->len, BNEP_MTU_SIZE);
GKI_freebuf (p_buf);
return (BNEP_MTU_EXCEDED);
}
@@ -485,7 +485,7 @@
/* Check MTU size. Consider the possibility of having extension headers */
if (len > BNEP_MTU_SIZE)
{
- BNEP_TRACE_ERROR2 ("BNEP_Write() length %d exceeded MTU %d", len, BNEP_MTU_SIZE);
+ BNEP_TRACE_ERROR ("BNEP_Write() length %d exceeded MTU %d", len, BNEP_MTU_SIZE);
return (BNEP_MTU_EXCEDED);
}
@@ -544,7 +544,7 @@
/* Get a buffer to copy teh data into */
if ((p_buf = (BT_HDR *)GKI_getpoolbuf (BNEP_POOL_ID)) == NULL)
{
- BNEP_TRACE_ERROR0 ("BNEP_Write() not able to get buffer");
+ BNEP_TRACE_ERROR ("BNEP_Write() not able to get buffer");
return (BNEP_NO_RESOURCES);
}
diff --git a/stack/bnep/bnep_main.c b/stack/bnep/bnep_main.c
index 45d3b14..62fa316 100644
--- a/stack/bnep/bnep_main.c
+++ b/stack/bnep/bnep_main.c
@@ -99,7 +99,7 @@
/* Now, register with L2CAP */
if (!L2CA_Register (BT_PSM_BNEP, &bnep_cb.reg_info))
{
- BNEP_TRACE_ERROR0 ("BNEP - Registration failed");
+ BNEP_TRACE_ERROR ("BNEP - Registration failed");
return BNEP_SECURITY_FAIL;
}
@@ -147,7 +147,7 @@
/* Start timer waiting for config setup */
btu_start_timer (&p_bcb->conn_tle, BTU_TTYPE_BNEP, BNEP_CONN_TIMEOUT);
- BNEP_TRACE_EVENT1("BNEP - Rcvd L2CAP conn ind, CID: 0x%x", p_bcb->l2cap_cid);
+ BNEP_TRACE_EVENT("BNEP - Rcvd L2CAP conn ind, CID: 0x%x", p_bcb->l2cap_cid);
}
@@ -170,7 +170,7 @@
/* Find CCB based on CID */
if ((bcb = bnepu_find_bcb_by_cid (l2cap_cid)) == NULL)
{
- BNEP_TRACE_WARNING1 ("BNEP - Rcvd conn cnf for unknown CID 0x%x", l2cap_cid);
+ BNEP_TRACE_WARNING ("BNEP - Rcvd conn cnf for unknown CID 0x%x", l2cap_cid);
return;
}
@@ -186,11 +186,11 @@
/* Start timer waiting for config results */
btu_start_timer (&bcb->conn_tle, BTU_TTYPE_BNEP, BNEP_CONN_TIMEOUT);
- BNEP_TRACE_EVENT1 ("BNEP - got conn cnf, sent cfg req, CID: 0x%x", bcb->l2cap_cid);
+ BNEP_TRACE_EVENT ("BNEP - got conn cnf, sent cfg req, CID: 0x%x", bcb->l2cap_cid);
}
else
{
- BNEP_TRACE_WARNING2 ("BNEP - Rcvd conn cnf with error: 0x%x CID 0x%x", result, bcb->l2cap_cid);
+ BNEP_TRACE_WARNING ("BNEP - Rcvd conn cnf with error: 0x%x CID 0x%x", result, bcb->l2cap_cid);
/* Tell the upper layer, if he has a callback */
if (bnep_cb.p_conn_state_cb &&
@@ -221,11 +221,11 @@
/* Find CCB based on CID */
if ((p_bcb = bnepu_find_bcb_by_cid (l2cap_cid)) == NULL)
{
- BNEP_TRACE_WARNING1 ("BNEP - Rcvd L2CAP cfg ind, unknown CID: 0x%x", l2cap_cid);
+ BNEP_TRACE_WARNING ("BNEP - Rcvd L2CAP cfg ind, unknown CID: 0x%x", l2cap_cid);
return;
}
- BNEP_TRACE_EVENT1 ("BNEP - Rcvd cfg ind, CID: 0x%x", l2cap_cid);
+ BNEP_TRACE_EVENT ("BNEP - Rcvd cfg ind, CID: 0x%x", l2cap_cid);
/* Remember the remote MTU size */
if ((!p_cfg->mtu_present) || (p_cfg->mtu < BNEP_MIN_MTU_SIZE))
@@ -253,7 +253,7 @@
if (result != L2CAP_CFG_OK)
{
- BNEP_TRACE_EVENT2 ("BNEP - Rcvd cfg ind with bad MTU %d, CID: 0x%x", mtu, l2cap_cid);
+ BNEP_TRACE_EVENT ("BNEP - Rcvd cfg ind with bad MTU %d, CID: 0x%x", mtu, l2cap_cid);
return;
}
@@ -291,12 +291,12 @@
{
tBNEP_CONN *p_bcb;
- BNEP_TRACE_EVENT2 ("BNEP - Rcvd cfg cfm, CID: 0x%x Result: %d", l2cap_cid, p_cfg->result);
+ BNEP_TRACE_EVENT ("BNEP - Rcvd cfg cfm, CID: 0x%x Result: %d", l2cap_cid, p_cfg->result);
/* Find CCB based on CID */
if ((p_bcb = bnepu_find_bcb_by_cid (l2cap_cid)) == NULL)
{
- BNEP_TRACE_WARNING1 ("BNEP - Rcvd L2CAP cfg ind, unknown CID: 0x%x", l2cap_cid);
+ BNEP_TRACE_WARNING ("BNEP - Rcvd L2CAP cfg ind, unknown CID: 0x%x", l2cap_cid);
return;
}
@@ -356,11 +356,11 @@
/* Find CCB based on CID */
if ((p_bcb = bnepu_find_bcb_by_cid (l2cap_cid)) == NULL)
{
- BNEP_TRACE_WARNING1 ("BNEP - Rcvd L2CAP disc, unknown CID: 0x%x", l2cap_cid);
+ BNEP_TRACE_WARNING ("BNEP - Rcvd L2CAP disc, unknown CID: 0x%x", l2cap_cid);
return;
}
- BNEP_TRACE_EVENT1 ("BNEP - Rcvd L2CAP disc, CID: 0x%x", l2cap_cid);
+ BNEP_TRACE_EVENT ("BNEP - Rcvd L2CAP disc, CID: 0x%x", l2cap_cid);
/* Tell the user if he has a callback */
if (p_bcb->con_state == BNEP_STATE_CONNECTED)
@@ -391,7 +391,7 @@
*******************************************************************************/
static void bnep_disconnect_cfm (UINT16 l2cap_cid, UINT16 result)
{
- BNEP_TRACE_EVENT2 ("BNEP - Rcvd L2CAP disc cfm, CID: 0x%x, Result 0x%x", l2cap_cid, result);
+ BNEP_TRACE_EVENT ("BNEP - Rcvd L2CAP disc cfm, CID: 0x%x, Result 0x%x", l2cap_cid, result);
}
@@ -411,7 +411,7 @@
/* Find BCB based on CID */
if ((p_bcb = bnepu_find_bcb_by_cid (l2cap_cid)) == NULL)
{
- BNEP_TRACE_WARNING1 ("BNEP - Rcvd L2CAP cong, unknown CID: 0x%x", l2cap_cid);
+ BNEP_TRACE_WARNING ("BNEP - Rcvd L2CAP cong, unknown CID: 0x%x", l2cap_cid);
return;
}
@@ -476,7 +476,7 @@
/* Find CCB based on CID */
if ((p_bcb = bnepu_find_bcb_by_cid (l2cap_cid)) == NULL)
{
- BNEP_TRACE_WARNING1 ("BNEP - Rcvd L2CAP data, unknown CID: 0x%x", l2cap_cid);
+ BNEP_TRACE_WARNING ("BNEP - Rcvd L2CAP data, unknown CID: 0x%x", l2cap_cid);
GKI_freebuf (p_buf);
return;
}
@@ -487,7 +487,7 @@
type &= 0x7f;
if ((rem_len <= bnep_frame_hdr_sizes[type]) || (rem_len > BNEP_MTU_SIZE))
{
- BNEP_TRACE_EVENT2 ("BNEP - rcvd frame, bad len: %d type: 0x%02x", p_buf->len, type);
+ BNEP_TRACE_EVENT ("BNEP - rcvd frame, bad len: %d type: 0x%02x", p_buf->len, type);
GKI_freebuf (p_buf);
return;
}
@@ -498,7 +498,7 @@
(!(p_bcb->con_flags & BNEP_FLAGS_CONN_COMPLETED)) &&
(type != BNEP_FRAME_CONTROL))
{
- BNEP_TRACE_WARNING2 ("BNEP - Ignored L2CAP data while in state: %d, CID: 0x%x",
+ BNEP_TRACE_WARNING ("BNEP - Ignored L2CAP data while in state: %d, CID: 0x%x",
p_bcb->con_state, l2cap_cid);
if (extension_present)
@@ -537,12 +537,12 @@
if (type > BNEP_FRAME_COMPRESSED_ETHERNET_DEST_ONLY)
{
- BNEP_TRACE_EVENT1 ("BNEP - rcvd frame, unknown type: 0x%02x", type);
+ BNEP_TRACE_EVENT ("BNEP - rcvd frame, unknown type: 0x%02x", type);
GKI_freebuf (p_buf);
return;
}
- BNEP_TRACE_DEBUG3 ("BNEP - rcv frame, type: %d len: %d Ext: %d", type, p_buf->len, extension_present);
+ BNEP_TRACE_DEBUG ("BNEP - rcv frame, type: %d len: %d Ext: %d", type, p_buf->len, extension_present);
/* Initialize addresses to 'not supplied' */
p_src_addr = p_dst_addr = NULL;
@@ -622,7 +622,7 @@
/* if unknown extension present stop processing */
if (ext_type)
{
- BNEP_TRACE_EVENT1 ("Data extension type 0x%x found", ext_type);
+ BNEP_TRACE_EVENT ("Data extension type 0x%x found", ext_type);
break;
}
@@ -689,12 +689,12 @@
p_bcb = (tBNEP_CONN *)p_tle->param;
- BNEP_TRACE_EVENT4 ("BNEP - CCB timeout in state: %d CID: 0x%x flags %x, re_transmit %d",
+ BNEP_TRACE_EVENT ("BNEP - CCB timeout in state: %d CID: 0x%x flags %x, re_transmit %d",
p_bcb->con_state, p_bcb->l2cap_cid, p_bcb->con_flags, p_bcb->re_transmits);
if (p_bcb->con_state == BNEP_STATE_CONN_SETUP)
{
- BNEP_TRACE_EVENT2 ("BNEP - CCB timeout in state: %d CID: 0x%x",
+ BNEP_TRACE_EVENT ("BNEP - CCB timeout in state: %d CID: 0x%x",
p_bcb->con_state, p_bcb->l2cap_cid);
if (!(p_bcb->con_flags & BNEP_FLAGS_IS_ORIG))
@@ -723,7 +723,7 @@
}
else if (p_bcb->con_state != BNEP_STATE_CONNECTED)
{
- BNEP_TRACE_EVENT2 ("BNEP - CCB timeout in state: %d CID: 0x%x",
+ BNEP_TRACE_EVENT ("BNEP - CCB timeout in state: %d CID: 0x%x",
p_bcb->con_state, p_bcb->l2cap_cid);
L2CA_DisconnectReq (p_bcb->l2cap_cid);
diff --git a/stack/bnep/bnep_utils.c b/stack/bnep/bnep_utils.c
index faf808b..92061d0 100644
--- a/stack/bnep/bnep_utils.c
+++ b/stack/bnep/bnep_utils.c
@@ -173,10 +173,10 @@
BT_HDR *p_buf;
UINT8 *p, *p_start;
- BNEP_TRACE_DEBUG1 ("BNEP sending setup req with dst uuid %x", p_bcb->dst_uuid.uu.uuid16);
+ BNEP_TRACE_DEBUG ("BNEP sending setup req with dst uuid %x", p_bcb->dst_uuid.uu.uuid16);
if ((p_buf = (BT_HDR *)GKI_getpoolbuf (BNEP_POOL_ID)) == NULL)
{
- BNEP_TRACE_ERROR0 ("BNEP - not able to send connection request");
+ BNEP_TRACE_ERROR ("BNEP - not able to send connection request");
return;
}
@@ -231,10 +231,10 @@
BT_HDR *p_buf;
UINT8 *p;
- BNEP_TRACE_EVENT1 ("BNEP - bnep_send_conn_responce for CID: 0x%x", p_bcb->l2cap_cid);
+ BNEP_TRACE_EVENT ("BNEP - bnep_send_conn_responce for CID: 0x%x", p_bcb->l2cap_cid);
if ((p_buf = (BT_HDR *)GKI_getpoolbuf (BNEP_POOL_ID)) == NULL)
{
- BNEP_TRACE_ERROR0 ("BNEP - not able to send connection response");
+ BNEP_TRACE_ERROR ("BNEP - not able to send connection response");
return;
}
@@ -272,11 +272,11 @@
UINT8 *p;
UINT16 xx;
- BNEP_TRACE_DEBUG0 ("BNEP sending peer our filters");
+ BNEP_TRACE_DEBUG ("BNEP sending peer our filters");
if ((p_buf = (BT_HDR *)GKI_getpoolbuf (BNEP_POOL_ID)) == NULL)
{
- BNEP_TRACE_ERROR0 ("BNEP - no buffer send filters");
+ BNEP_TRACE_ERROR ("BNEP - no buffer send filters");
return;
}
@@ -324,11 +324,11 @@
UINT8 *p;
UINT16 xx;
- BNEP_TRACE_DEBUG0 ("BNEP sending peer our multicast filters");
+ BNEP_TRACE_DEBUG ("BNEP sending peer our multicast filters");
if ((p_buf = (BT_HDR *)GKI_getpoolbuf (BNEP_POOL_ID)) == NULL)
{
- BNEP_TRACE_ERROR0 ("BNEP - no buffer to send multicast filters");
+ BNEP_TRACE_ERROR ("BNEP - no buffer to send multicast filters");
return;
}
@@ -376,10 +376,10 @@
BT_HDR *p_buf;
UINT8 *p;
- BNEP_TRACE_DEBUG0 ("BNEP sending filter response");
+ BNEP_TRACE_DEBUG ("BNEP sending filter response");
if ((p_buf = (BT_HDR *)GKI_getpoolbuf (BNEP_POOL_ID)) == NULL)
{
- BNEP_TRACE_ERROR0 ("BNEP - no buffer filter rsp");
+ BNEP_TRACE_ERROR ("BNEP - no buffer filter rsp");
return;
}
@@ -414,10 +414,10 @@
BT_HDR *p_buf;
UINT8 *p;
- BNEP_TRACE_EVENT2 ("BNEP - bnep_send_command_not_understood for CID: 0x%x, cmd 0x%x", p_bcb->l2cap_cid, cmd_code);
+ BNEP_TRACE_EVENT ("BNEP - bnep_send_command_not_understood for CID: 0x%x, cmd 0x%x", p_bcb->l2cap_cid, cmd_code);
if ((p_buf = (BT_HDR *)GKI_getpoolbuf (BNEP_POOL_ID)) == NULL)
{
- BNEP_TRACE_ERROR0 ("BNEP - not able to send connection response");
+ BNEP_TRACE_ERROR ("BNEP - not able to send connection response");
return;
}
@@ -452,12 +452,12 @@
*******************************************************************************/
void bnepu_check_send_packet (tBNEP_CONN *p_bcb, BT_HDR *p_buf)
{
- BNEP_TRACE_EVENT1 ("BNEP - bnepu_check_send_packet for CID: 0x%x", p_bcb->l2cap_cid);
+ BNEP_TRACE_EVENT ("BNEP - bnepu_check_send_packet for CID: 0x%x", p_bcb->l2cap_cid);
if (p_bcb->con_flags & BNEP_FLAGS_L2CAP_CONGESTED)
{
if (p_bcb->xmit_q.count >= BNEP_MAX_XMITQ_DEPTH)
{
- BNEP_TRACE_EVENT1 ("BNEP - congested, dropping buf, CID: 0x%x", p_bcb->l2cap_cid);
+ BNEP_TRACE_EVENT ("BNEP - congested, dropping buf, CID: 0x%x", p_bcb->l2cap_cid);
GKI_freebuf (p_buf);
}
@@ -584,13 +584,13 @@
*******************************************************************************/
void bnep_process_setup_conn_req (tBNEP_CONN *p_bcb, UINT8 *p_setup, UINT8 len)
{
- BNEP_TRACE_EVENT1 ("BNEP - bnep_process_setup_conn_req for CID: 0x%x", p_bcb->l2cap_cid);
+ BNEP_TRACE_EVENT ("BNEP - bnep_process_setup_conn_req for CID: 0x%x", p_bcb->l2cap_cid);
if (p_bcb->con_state != BNEP_STATE_CONN_SETUP &&
p_bcb->con_state != BNEP_STATE_SEC_CHECKING &&
p_bcb->con_state != BNEP_STATE_CONNECTED)
{
- BNEP_TRACE_ERROR1 ("BNEP - setup request in bad state %d", p_bcb->con_state);
+ BNEP_TRACE_ERROR ("BNEP - setup request in bad state %d", p_bcb->con_state);
bnep_send_conn_responce (p_bcb, BNEP_SETUP_CONN_NOT_ALLOWED);
return;
}
@@ -598,7 +598,7 @@
/* Check if we already initiated security check or if waiting for user responce */
if (p_bcb->con_flags & BNEP_FLAGS_SETUP_RCVD)
{
- BNEP_TRACE_EVENT0 ("BNEP - Duplicate Setup message received while doing security check");
+ BNEP_TRACE_EVENT ("BNEP - Duplicate Setup message received while doing security check");
return;
}
@@ -607,7 +607,7 @@
(!(p_bcb->con_flags & BNEP_FLAGS_SETUP_RCVD)) &&
(p_bcb->con_flags & BNEP_FLAGS_IS_ORIG))
{
- BNEP_TRACE_ERROR1 ("BNEP - setup request when we are originator", p_bcb->con_state);
+ BNEP_TRACE_ERROR ("BNEP - setup request when we are originator", p_bcb->con_state);
bnep_send_conn_responce (p_bcb, BNEP_SETUP_CONN_NOT_ALLOWED);
return;
}
@@ -651,7 +651,7 @@
#endif
else
{
- BNEP_TRACE_ERROR1 ("BNEP - Bad UID len %d in ConnReq", p_bcb->dst_uuid.len);
+ BNEP_TRACE_ERROR ("BNEP - Bad UID len %d in ConnReq", p_bcb->dst_uuid.len);
bnep_send_conn_responce (p_bcb, BNEP_SETUP_INVALID_UUID_SIZE);
return;
}
@@ -659,7 +659,7 @@
p_bcb->con_state = BNEP_STATE_SEC_CHECKING;
p_bcb->con_flags |= BNEP_FLAGS_SETUP_RCVD;
- BNEP_TRACE_EVENT1 ("BNEP initiating security check for incoming call for uuid 0x%x", p_bcb->src_uuid.uu.uuid16);
+ BNEP_TRACE_EVENT ("BNEP initiating security check for incoming call for uuid 0x%x", p_bcb->src_uuid.uu.uuid16);
#if (!defined (BNEP_DO_AUTH_FOR_ROLE_SWITCH) || BNEP_DO_AUTH_FOR_ROLE_SWITCH == FALSE)
if (p_bcb->con_flags & BNEP_FLAGS_CONN_COMPLETED)
bnep_sec_check_complete (p_bcb->rem_bda, p_bcb, BTM_SUCCESS);
@@ -689,19 +689,19 @@
tBNEP_RESULT resp;
UINT16 resp_code;
- BNEP_TRACE_DEBUG0 ("BNEP received setup responce");
+ BNEP_TRACE_DEBUG ("BNEP received setup responce");
/* The state should be either SETUP or CONNECTED */
if (p_bcb->con_state != BNEP_STATE_CONN_SETUP)
{
/* Should we disconnect ? */
- BNEP_TRACE_ERROR1 ("BNEP - setup response in bad state %d", p_bcb->con_state);
+ BNEP_TRACE_ERROR ("BNEP - setup response in bad state %d", p_bcb->con_state);
return;
}
/* Check if we are the originator */
if (!(p_bcb->con_flags & BNEP_FLAGS_IS_ORIG))
{
- BNEP_TRACE_ERROR1 ("BNEP - setup response when we are not originator", p_bcb->con_state);
+ BNEP_TRACE_ERROR ("BNEP - setup response when we are not originator", p_bcb->con_state);
return;
}
@@ -732,7 +732,7 @@
{
if (p_bcb->con_flags & BNEP_FLAGS_CONN_COMPLETED)
{
- BNEP_TRACE_EVENT1 ("BNEP - role change response is %d", resp_code);
+ BNEP_TRACE_EVENT ("BNEP - role change response is %d", resp_code);
/* Restore the earlier BNEP status */
p_bcb->con_state = BNEP_STATE_CONNECTED;
@@ -752,7 +752,7 @@
}
else
{
- BNEP_TRACE_ERROR1 ("BNEP - setup response %d is not OK", resp_code);
+ BNEP_TRACE_ERROR ("BNEP - setup response %d is not OK", resp_code);
L2CA_DisconnectReq (p_bcb->l2cap_cid);
@@ -796,12 +796,12 @@
control_type = *p++;
*rem_len = *rem_len - 1;
- BNEP_TRACE_EVENT3 ("BNEP processing control packet rem_len %d, is_ext %d, ctrl_type %d", *rem_len, is_ext, control_type);
+ BNEP_TRACE_EVENT ("BNEP processing control packet rem_len %d, is_ext %d, ctrl_type %d", *rem_len, is_ext, control_type);
switch (control_type)
{
case BNEP_CONTROL_COMMAND_NOT_UNDERSTOOD:
- BNEP_TRACE_ERROR1 ("BNEP Received Cmd not understood for ctl pkt type: %d", *p);
+ BNEP_TRACE_ERROR ("BNEP Received Cmd not understood for ctl pkt type: %d", *p);
p++;
*rem_len = *rem_len - 1;
break;
@@ -811,7 +811,7 @@
if (*rem_len < ((2 * len) + 1))
{
bad_pkt = TRUE;
- BNEP_TRACE_ERROR0 ("BNEP Received Setup message with bad length");
+ BNEP_TRACE_ERROR ("BNEP Received Setup message with bad length");
break;
}
if (!is_ext)
@@ -832,7 +832,7 @@
if (*rem_len < (len + 2))
{
bad_pkt = TRUE;
- BNEP_TRACE_ERROR0 ("BNEP Received Filter set message with bad length");
+ BNEP_TRACE_ERROR ("BNEP Received Filter set message with bad length");
break;
}
bnepu_process_peer_filter_set (p_bcb, p, len);
@@ -851,7 +851,7 @@
if (*rem_len < (len + 2))
{
bad_pkt = TRUE;
- BNEP_TRACE_ERROR0 ("BNEP Received Multicast Filter Set message with bad length");
+ BNEP_TRACE_ERROR ("BNEP Received Multicast Filter Set message with bad length");
break;
}
bnepu_process_peer_multicast_filter_set (p_bcb, p, len);
@@ -866,7 +866,7 @@
break;
default :
- BNEP_TRACE_ERROR1 ("BNEP - bad ctl pkt type: %d", control_type);
+ BNEP_TRACE_ERROR ("BNEP - bad ctl pkt type: %d", control_type);
bnep_send_command_not_understood (p_bcb, control_type);
if (is_ext)
{
@@ -878,7 +878,7 @@
if (bad_pkt)
{
- BNEP_TRACE_ERROR1 ("BNEP - bad ctl pkt length: %d", *rem_len);
+ BNEP_TRACE_ERROR ("BNEP - bad ctl pkt length: %d", *rem_len);
*rem_len = 0;
return NULL;
}
@@ -909,15 +909,15 @@
if ((p_bcb->con_state != BNEP_STATE_CONNECTED) &&
(!(p_bcb->con_flags & BNEP_FLAGS_CONN_COMPLETED)))
{
- BNEP_TRACE_DEBUG0 ("BNEP received filter set from peer when there is no connection");
+ BNEP_TRACE_DEBUG ("BNEP received filter set from peer when there is no connection");
return;
}
- BNEP_TRACE_DEBUG0 ("BNEP received filter set from peer");
+ BNEP_TRACE_DEBUG ("BNEP received filter set from peer");
/* Check for length not a multiple of 4 */
if (len & 3)
{
- BNEP_TRACE_EVENT1 ("BNEP - bad filter len: %d", len);
+ BNEP_TRACE_EVENT ("BNEP - bad filter len: %d", len);
bnepu_send_peer_filter_rsp (p_bcb, BNEP_FILTER_CRL_BAD_RANGE);
return;
}
@@ -986,19 +986,19 @@
UINT16 resp_code;
tBNEP_RESULT result;
- BNEP_TRACE_DEBUG0 ("BNEP received filter responce");
+ BNEP_TRACE_DEBUG ("BNEP received filter responce");
/* The state should be CONNECTED */
if ((p_bcb->con_state != BNEP_STATE_CONNECTED) &&
(!(p_bcb->con_flags & BNEP_FLAGS_CONN_COMPLETED)))
{
- BNEP_TRACE_ERROR1 ("BNEP - filter response in bad state %d", p_bcb->con_state);
+ BNEP_TRACE_ERROR ("BNEP - filter response in bad state %d", p_bcb->con_state);
return;
}
/* Check if we are the originator */
if (!(p_bcb->con_flags & BNEP_FLAGS_FILTER_RESP_PEND))
{
- BNEP_TRACE_ERROR0 ("BNEP - filter response when not expecting");
+ BNEP_TRACE_ERROR ("BNEP - filter response when not expecting");
return;
}
@@ -1038,19 +1038,19 @@
UINT16 resp_code;
tBNEP_RESULT result;
- BNEP_TRACE_DEBUG0 ("BNEP received multicast filter responce");
+ BNEP_TRACE_DEBUG ("BNEP received multicast filter responce");
/* The state should be CONNECTED */
if ((p_bcb->con_state != BNEP_STATE_CONNECTED) &&
(!(p_bcb->con_flags & BNEP_FLAGS_CONN_COMPLETED)))
{
- BNEP_TRACE_ERROR1 ("BNEP - multicast filter response in bad state %d", p_bcb->con_state);
+ BNEP_TRACE_ERROR ("BNEP - multicast filter response in bad state %d", p_bcb->con_state);
return;
}
/* Check if we are the originator */
if (!(p_bcb->con_flags & BNEP_FLAGS_MULTI_RESP_PEND))
{
- BNEP_TRACE_ERROR0 ("BNEP - multicast filter response when not expecting");
+ BNEP_TRACE_ERROR ("BNEP - multicast filter response when not expecting");
return;
}
@@ -1095,20 +1095,20 @@
if ((p_bcb->con_state != BNEP_STATE_CONNECTED) &&
(!(p_bcb->con_flags & BNEP_FLAGS_CONN_COMPLETED)))
{
- BNEP_TRACE_DEBUG0 ("BNEP received multicast filter set from peer when there is no connection");
+ BNEP_TRACE_DEBUG ("BNEP received multicast filter set from peer when there is no connection");
return;
}
if (len % 12)
{
- BNEP_TRACE_EVENT1 ("BNEP - bad filter len: %d", len);
+ BNEP_TRACE_EVENT ("BNEP - bad filter len: %d", len);
bnepu_send_peer_multicast_filter_rsp (p_bcb, BNEP_FILTER_CRL_BAD_RANGE);
return;
}
if (len > (BNEP_MAX_MULTI_FILTERS * 2 * BD_ADDR_LEN))
{
- BNEP_TRACE_EVENT0 ("BNEP - Too many filters");
+ BNEP_TRACE_EVENT ("BNEP - Too many filters");
bnepu_send_peer_multicast_filter_rsp (p_bcb, BNEP_FILTER_CRL_MAX_REACHED);
return;
}
@@ -1149,7 +1149,7 @@
}
}
- BNEP_TRACE_EVENT1 ("BNEP multicast filters %d", p_bcb->rcvd_mcast_filters);
+ BNEP_TRACE_EVENT ("BNEP multicast filters %d", p_bcb->rcvd_mcast_filters);
bnepu_send_peer_multicast_filter_rsp (p_bcb, resp_code);
if (bnep_cb.p_mfilter_ind_cb)
@@ -1174,10 +1174,10 @@
BT_HDR *p_buf;
UINT8 *p;
- BNEP_TRACE_DEBUG1 ("BNEP sending multicast filter response %d", response_code);
+ BNEP_TRACE_DEBUG ("BNEP sending multicast filter response %d", response_code);
if ((p_buf = (BT_HDR *)GKI_getpoolbuf (BNEP_POOL_ID)) == NULL)
{
- BNEP_TRACE_ERROR0 ("BNEP - no buffer filter rsp");
+ BNEP_TRACE_ERROR ("BNEP - no buffer filter rsp");
return;
}
@@ -1218,7 +1218,7 @@
UNUSED(bd_addr);
UNUSED(trasnport);
- BNEP_TRACE_EVENT1 ("BNEP security callback returned result %d", result);
+ BNEP_TRACE_EVENT ("BNEP security callback returned result %d", result);
if (p_bcb->con_flags & BNEP_FLAGS_CONN_COMPLETED)
is_role_change = TRUE;
else
@@ -1227,7 +1227,7 @@
/* check if the port is still waiting for security to complete */
if (p_bcb->con_state != BNEP_STATE_SEC_CHECKING)
{
- BNEP_TRACE_ERROR1 ("BNEP Connection in wrong state %d when security is completed", p_bcb->con_state);
+ BNEP_TRACE_ERROR ("BNEP Connection in wrong state %d when security is completed", p_bcb->con_state);
return;
}
@@ -1353,7 +1353,7 @@
if (i == p_bcb->rcvd_num_filters)
{
- BNEP_TRACE_DEBUG1 ("Ignoring protocol 0x%x in BNEP data write", proto);
+ BNEP_TRACE_DEBUG ("Ignoring protocol 0x%x in BNEP data write", proto);
return BNEP_IGNORE_CMD;
}
}
@@ -1384,7 +1384,7 @@
*/
if ((p_bcb->rcvd_mcast_filters == 0xFFFF) || (i == p_bcb->rcvd_mcast_filters))
{
- BNEP_TRACE_DEBUG6 ("Ignoring multicast address %x.%x.%x.%x.%x.%x in BNEP data write",
+ BNEP_TRACE_DEBUG ("Ignoring multicast address %x.%x.%x.%x.%x.%x in BNEP data write",
p_dest_addr[0], p_dest_addr[1], p_dest_addr[2],
p_dest_addr[3], p_dest_addr[4], p_dest_addr[5]);
return BNEP_IGNORE_CMD;
@@ -1444,10 +1444,10 @@
char buff[200];
tBNEP_CONN *p_bcb;
- BNEP_TRACE_DEBUG6 ("BNEP my BD Addr %x.%x.%x.%x.%x.%x",
+ BNEP_TRACE_DEBUG ("BNEP my BD Addr %x.%x.%x.%x.%x.%x",
bnep_cb.my_bda[0], bnep_cb.my_bda[1], bnep_cb.my_bda[2],
bnep_cb.my_bda[3], bnep_cb.my_bda[4], bnep_cb.my_bda[5]);
- BNEP_TRACE_DEBUG3 ("profile registered %d, trace %d, got_my_bd_addr %d",
+ BNEP_TRACE_DEBUG ("profile registered %d, trace %d, got_my_bd_addr %d",
bnep_cb.profile_registered, bnep_cb.trace_level, bnep_cb.got_my_bd_addr);
for (i = 0, p_bcb = bnep_cb.bcb; i < BNEP_MAX_CONNECTIONS; i++, p_bcb++)
@@ -1459,7 +1459,7 @@
p_bcb->rem_bda[0], p_bcb->rem_bda[1], p_bcb->rem_bda[2],
p_bcb->rem_bda[3], p_bcb->rem_bda[4], p_bcb->rem_bda[5]);
- BNEP_TRACE_DEBUG0 (buff);
+ BNEP_TRACE_DEBUG (buff);
}
#endif
}
diff --git a/stack/hid/hidh_api.c b/stack/hid/hidh_api.c
index 1868671..b0c3aa5 100644
--- a/stack/hid/hidh_api.c
+++ b/stack/hid/hidh_api.c
@@ -445,19 +445,19 @@
if( !hh_cb.reg_flag )
{
- HIDH_TRACE_ERROR0("HID_ERR_NOT_REGISTERED");
+ HIDH_TRACE_ERROR("HID_ERR_NOT_REGISTERED");
status = HID_ERR_NOT_REGISTERED;
}
if( (dev_handle >= HID_HOST_MAX_DEVICES) || (!hh_cb.devices[dev_handle].in_use) )
{
- HIDH_TRACE_ERROR0("HID_ERR_INVALID_PARAM");
+ HIDH_TRACE_ERROR("HID_ERR_INVALID_PARAM");
status = HID_ERR_INVALID_PARAM;
}
else if( hh_cb.devices[dev_handle].state != HID_DEV_CONNECTED )
{
- HIDH_TRACE_ERROR1("HID_ERR_NO_CONNECTION dev_handle %d", dev_handle);
+ HIDH_TRACE_ERROR("HID_ERR_NO_CONNECTION dev_handle %d", dev_handle);
status = HID_ERR_NO_CONNECTION;
}
@@ -504,42 +504,42 @@
if (!BTM_SetSecurityLevel (FALSE, serv_name, BTM_SEC_SERVICE_HIDH_SEC_CTRL,
sec_lvl, HID_PSM_CONTROL, BTM_SEC_PROTO_HID, HID_SEC_CHN))
{
- HIDH_TRACE_ERROR0 ("Security Registration 1 failed");
+ HIDH_TRACE_ERROR ("Security Registration 1 failed");
return (HID_ERR_NO_RESOURCES);
}
if (!BTM_SetSecurityLevel (TRUE, serv_name, BTM_SEC_SERVICE_HIDH_SEC_CTRL,
sec_lvl, HID_PSM_CONTROL, BTM_SEC_PROTO_HID, HID_SEC_CHN))
{
- HIDH_TRACE_ERROR0 ("Security Registration 2 failed");
+ HIDH_TRACE_ERROR ("Security Registration 2 failed");
return (HID_ERR_NO_RESOURCES);
}
if (!BTM_SetSecurityLevel (FALSE, serv_name, BTM_SEC_SERVICE_HIDH_NOSEC_CTRL,
BTM_SEC_NONE, HID_PSM_CONTROL, BTM_SEC_PROTO_HID, HID_NOSEC_CHN))
{
- HIDH_TRACE_ERROR0 ("Security Registration 3 failed");
+ HIDH_TRACE_ERROR ("Security Registration 3 failed");
return (HID_ERR_NO_RESOURCES);
}
if (!BTM_SetSecurityLevel (TRUE, serv_name, BTM_SEC_SERVICE_HIDH_NOSEC_CTRL,
BTM_SEC_NONE, HID_PSM_CONTROL, BTM_SEC_PROTO_HID, HID_NOSEC_CHN))
{
- HIDH_TRACE_ERROR0 ("Security Registration 4 failed");
+ HIDH_TRACE_ERROR ("Security Registration 4 failed");
return (HID_ERR_NO_RESOURCES);
}
if (!BTM_SetSecurityLevel (TRUE, serv_name, BTM_SEC_SERVICE_HIDH_INTR,
BTM_SEC_NONE, HID_PSM_INTERRUPT, BTM_SEC_PROTO_HID, 0))
{
- HIDH_TRACE_ERROR0 ("Security Registration 5 failed");
+ HIDH_TRACE_ERROR ("Security Registration 5 failed");
return (HID_ERR_NO_RESOURCES);
}
if (!BTM_SetSecurityLevel (FALSE, serv_name, BTM_SEC_SERVICE_HIDH_INTR,
BTM_SEC_NONE, HID_PSM_INTERRUPT, BTM_SEC_PROTO_HID, 0))
{
- HIDH_TRACE_ERROR0 ("Security Registration 6 failed");
+ HIDH_TRACE_ERROR ("Security Registration 6 failed");
return (HID_ERR_NO_RESOURCES);
}
@@ -570,7 +570,7 @@
if ((p_inq_info->results.dev_class[1] & BTM_COD_MAJOR_CLASS_MASK)
== BTM_COD_MAJOR_PERIPHERAL )
{
- HIDH_TRACE_DEBUG0("hid_known_hid_device:dev found in InqDB & COD matches HID dev");
+ HIDH_TRACE_DEBUG("hid_known_hid_device:dev found in InqDB & COD matches HID dev");
return TRUE;
}
}
@@ -581,7 +581,7 @@
if ((p_dev_rec != NULL) &&
((p_dev_rec->dev_class[1] & BTM_COD_MAJOR_CLASS_MASK) == BTM_COD_MAJOR_PERIPHERAL ))
{
- HIDH_TRACE_DEBUG0("hid_known_hid_device:dev found in SecDevDB & COD matches HID dev");
+ HIDH_TRACE_DEBUG("hid_known_hid_device:dev found in SecDevDB & COD matches HID dev");
return TRUE;
}
}
@@ -594,6 +594,6 @@
return TRUE;
}
/* Check if this device is marked as HID Device in IOP Dev */
- HIDH_TRACE_DEBUG0("hid_known_hid_device:remote is not HID device");
+ HIDH_TRACE_DEBUG("hid_known_hid_device:remote is not HID device");
return FALSE;
}
diff --git a/stack/hid/hidh_conn.c b/stack/hid/hidh_conn.c
index dd9d9f0..853e3ed 100644
--- a/stack/hid/hidh_conn.c
+++ b/stack/hid/hidh_conn.c
@@ -98,13 +98,13 @@
/* Now, register with L2CAP */
if (!L2CA_Register (HID_PSM_CONTROL, (tL2CAP_APPL_INFO *) &hst_reg_info))
{
- HIDH_TRACE_ERROR0 ("HID-Host Control Registration failed");
+ HIDH_TRACE_ERROR ("HID-Host Control Registration failed");
return (HID_ERR_L2CAP_FAILED) ;
}
if (!L2CA_Register (HID_PSM_INTERRUPT, (tL2CAP_APPL_INFO *) &hst_reg_info))
{
L2CA_Deregister( HID_PSM_CONTROL ) ;
- HIDH_TRACE_ERROR0 ("HID-Host Interrupt Registration failed");
+ HIDH_TRACE_ERROR ("HID-Host Interrupt Registration failed");
return (HID_ERR_L2CAP_FAILED) ;
}
@@ -130,7 +130,7 @@
{
tHID_CONN *p_hcon = &hh_cb.devices[dhandle].conn;
- HIDH_TRACE_EVENT0 ("HID-Host disconnect");
+ HIDH_TRACE_EVENT ("HID-Host disconnect");
if ((p_hcon->ctrl_cid != 0) || (p_hcon->intr_cid != 0))
{
@@ -209,7 +209,7 @@
UINT8 i = HID_HOST_MAX_DEVICES;
tHID_HOST_DEV_CTB *p_dev;
- HIDH_TRACE_EVENT2 ("HID-Host Rcvd L2CAP conn ind, PSM: 0x%04x CID 0x%x", psm, l2cap_cid);
+ HIDH_TRACE_EVENT ("HID-Host Rcvd L2CAP conn ind, PSM: 0x%04x CID 0x%x", psm, l2cap_cid);
/* always add incoming connection device into HID database by default */
if (HID_HostAddDev(bd_addr, HID_SEC_REQUIRED, &i) != HID_SUCCESS)
@@ -226,12 +226,12 @@
{
if (p_hcon->ctrl_cid == 0)
{
- HIDH_TRACE_WARNING0 ("HID-Host Rcvd INTR L2CAP conn ind, but no CTL channel");
+ HIDH_TRACE_WARNING ("HID-Host Rcvd INTR L2CAP conn ind, but no CTL channel");
bAccept = FALSE;
}
if (p_hcon->conn_state != HID_CONN_STATE_CONNECTING_INTR)
{
- HIDH_TRACE_WARNING1 ("HID-Host Rcvd INTR L2CAP conn ind, wrong state: %d",
+ HIDH_TRACE_WARNING ("HID-Host Rcvd INTR L2CAP conn ind, wrong state: %d",
p_hcon->conn_state);
bAccept = FALSE;
}
@@ -244,7 +244,7 @@
#else
if (p_hcon->conn_state != HID_CONN_STATE_UNUSED)
{
- HIDH_TRACE_WARNING1 ("HID-Host - Rcvd CTL L2CAP conn ind, wrong state: %d",
+ HIDH_TRACE_WARNING ("HID-Host - Rcvd CTL L2CAP conn ind, wrong state: %d",
p_hcon->conn_state);
bAccept = FALSE;
}
@@ -286,7 +286,7 @@
/* Send a Configuration Request. */
L2CA_ConfigReq (l2cap_cid, &hh_cb.l2cap_cfg);
- HIDH_TRACE_EVENT2 ("HID-Host Rcvd L2CAP conn ind, sent config req, PSM: 0x%04x CID 0x%x",
+ HIDH_TRACE_EVENT ("HID-Host Rcvd L2CAP conn ind, sent config req, PSM: 0x%04x CID 0x%x",
psm, l2cap_cid);
}
@@ -331,13 +331,13 @@
dhandle = ((UINT32)p_dev - (UINT32)&(hh_cb.devices[0]))/ sizeof(tHID_HOST_DEV_CTB);
if( res == BTM_SUCCESS && p_dev->conn.conn_state == HID_CONN_STATE_SECURITY )
{
- HIDH_TRACE_EVENT0 ("HID-Host Originator security pass.");
+ HIDH_TRACE_EVENT ("HID-Host Originator security pass.");
p_dev->conn.disc_reason = HID_SUCCESS; /* Authentication passed. Reset disc_reason (from HID_ERR_AUTH_FAILED) */
/* Transition to the next appropriate state, configuration */
p_dev->conn.conn_state = HID_CONN_STATE_CONFIG;
L2CA_ConfigReq (p_dev->conn.ctrl_cid, &hh_cb.l2cap_cfg);
- HIDH_TRACE_EVENT1 ("HID-Host Got Control conn cnf, sent cfg req, CID: 0x%x", p_dev->conn.ctrl_cid);
+ HIDH_TRACE_EVENT ("HID-Host Got Control conn cnf, sent cfg req, CID: 0x%x", p_dev->conn.ctrl_cid);
}
@@ -392,7 +392,7 @@
|| ((l2cap_cid == p_hcon->intr_cid) && (p_hcon->conn_state != HID_CONN_STATE_CONNECTING_INTR)
&& (p_hcon->conn_state != HID_CONN_STATE_DISCONNECTING)))
{
- HIDH_TRACE_WARNING1 ("HID-Host Rcvd unexpected conn cnf, CID 0x%x ", l2cap_cid);
+ HIDH_TRACE_WARNING ("HID-Host Rcvd unexpected conn cnf, CID 0x%x ", l2cap_cid);
return;
}
@@ -437,7 +437,7 @@
p_hcon->conn_state = HID_CONN_STATE_CONFIG;
/* Send a Configuration Request. */
L2CA_ConfigReq (l2cap_cid, &hh_cb.l2cap_cfg);
- HIDH_TRACE_EVENT1 ("HID-Host got Interrupt conn cnf, sent cfg req, CID: 0x%x", l2cap_cid);
+ HIDH_TRACE_EVENT ("HID-Host got Interrupt conn cnf, sent cfg req, CID: 0x%x", l2cap_cid);
}
return;
@@ -469,11 +469,11 @@
if (p_hcon == NULL)
{
- HIDH_TRACE_WARNING1 ("HID-Host Rcvd L2CAP cfg ind, unknown CID: 0x%x", l2cap_cid);
+ HIDH_TRACE_WARNING ("HID-Host Rcvd L2CAP cfg ind, unknown CID: 0x%x", l2cap_cid);
return;
}
- HIDH_TRACE_EVENT1 ("HID-Host Rcvd cfg ind, sent cfg cfm, CID: 0x%x", l2cap_cid);
+ HIDH_TRACE_EVENT ("HID-Host Rcvd cfg ind, sent cfg cfm, CID: 0x%x", l2cap_cid);
/* Remember the remote MTU size */
if ((!p_cfg->mtu_present) || (p_cfg->mtu > HID_HOST_MTU))
@@ -498,7 +498,7 @@
p_hcon->disc_reason = HID_L2CAP_CONN_FAIL; /* Reset initial reason for CLOSE_EVT: Connection Attempt was made but failed */
if ((p_hcon->intr_cid = L2CA_ConnectReq (HID_PSM_INTERRUPT, hh_cb.devices[dhandle].addr)) == 0)
{
- HIDH_TRACE_WARNING0 ("HID-Host INTR Originate failed");
+ HIDH_TRACE_WARNING ("HID-Host INTR Originate failed");
reason = HID_L2CAP_REQ_FAIL ;
p_hcon->conn_state = HID_CONN_STATE_UNUSED;
hidh_conn_disconnect (dhandle);
@@ -545,7 +545,7 @@
tHID_CONN *p_hcon = NULL;
UINT32 reason;
- HIDH_TRACE_EVENT2 ("HID-Host Rcvd cfg cfm, CID: 0x%x Result: %d", l2cap_cid, p_cfg->result);
+ HIDH_TRACE_EVENT ("HID-Host Rcvd cfg cfm, CID: 0x%x Result: %d", l2cap_cid, p_cfg->result);
/* Find CCB based on CID */
if( (dhandle = find_conn_by_cid(l2cap_cid)) < HID_HOST_MAX_DEVICES )
@@ -553,7 +553,7 @@
if (p_hcon == NULL)
{
- HIDH_TRACE_WARNING1 ("HID-Host Rcvd L2CAP cfg ind, unknown CID: 0x%x", l2cap_cid);
+ HIDH_TRACE_WARNING ("HID-Host Rcvd L2CAP cfg ind, unknown CID: 0x%x", l2cap_cid);
return;
}
@@ -576,7 +576,7 @@
p_hcon->disc_reason = HID_L2CAP_CONN_FAIL; /* Reset initial reason for CLOSE_EVT: Connection Attempt was made but failed */
if ((p_hcon->intr_cid = L2CA_ConnectReq (HID_PSM_INTERRUPT, hh_cb.devices[dhandle].addr)) == 0)
{
- HIDH_TRACE_WARNING0 ("HID-Host INTR Originate failed");
+ HIDH_TRACE_WARNING ("HID-Host INTR Originate failed");
reason = HID_L2CAP_REQ_FAIL ;
p_hcon->conn_state = HID_CONN_STATE_UNUSED;
hidh_conn_disconnect (dhandle);
@@ -630,14 +630,14 @@
if (p_hcon == NULL)
{
- HIDH_TRACE_WARNING1 ("HID-Host Rcvd L2CAP disc, unknown CID: 0x%x", l2cap_cid);
+ HIDH_TRACE_WARNING ("HID-Host Rcvd L2CAP disc, unknown CID: 0x%x", l2cap_cid);
return;
}
if (ack_needed)
L2CA_DisconnectRsp (l2cap_cid);
- HIDH_TRACE_EVENT1 ("HID-Host Rcvd L2CAP disc, CID: 0x%x", l2cap_cid);
+ HIDH_TRACE_EVENT ("HID-Host Rcvd L2CAP disc, CID: 0x%x", l2cap_cid);
p_hcon->conn_state = HID_CONN_STATE_DISCONNECTING;
@@ -710,11 +710,11 @@
if (p_hcon == NULL)
{
- HIDH_TRACE_WARNING1 ("HID-Host Rcvd L2CAP disc cfm, unknown CID: 0x%x", l2cap_cid);
+ HIDH_TRACE_WARNING ("HID-Host Rcvd L2CAP disc cfm, unknown CID: 0x%x", l2cap_cid);
return;
}
- HIDH_TRACE_EVENT1 ("HID-Host Rcvd L2CAP disc cfm, CID: 0x%x", l2cap_cid);
+ HIDH_TRACE_EVENT ("HID-Host Rcvd L2CAP disc cfm, CID: 0x%x", l2cap_cid);
if (l2cap_cid == p_hcon->ctrl_cid)
p_hcon->ctrl_cid = 0;
@@ -723,7 +723,7 @@
p_hcon->intr_cid = 0;
if (p_hcon->ctrl_cid)
{
- HIDH_TRACE_EVENT0 ("HID-Host Initiating L2CAP Ctrl disconnection");
+ HIDH_TRACE_EVENT ("HID-Host Initiating L2CAP Ctrl disconnection");
L2CA_DisconnectReq (p_hcon->ctrl_cid);
}
}
@@ -757,11 +757,11 @@
if (p_hcon == NULL)
{
- HIDH_TRACE_WARNING1 ("HID-Host Rcvd L2CAP congestion status, unknown CID: 0x%x", l2cap_cid);
+ HIDH_TRACE_WARNING ("HID-Host Rcvd L2CAP congestion status, unknown CID: 0x%x", l2cap_cid);
return;
}
- HIDH_TRACE_EVENT2 ("HID-Host Rcvd L2CAP congestion status, CID: 0x%x Cong: %d", l2cap_cid, congested);
+ HIDH_TRACE_EVENT ("HID-Host Rcvd L2CAP congestion status, CID: 0x%x Cong: %d", l2cap_cid, congested);
if (congested)
p_hcon->conn_flags |= HID_CONN_FLAGS_CONGESTED;
@@ -795,7 +795,7 @@
UINT8 dhandle;
tHID_CONN *p_hcon = NULL;
- HIDH_TRACE_DEBUG1 ("HID-Host hidh_l2cif_data_ind [l2cap_cid=0x%04x]", l2cap_cid);
+ HIDH_TRACE_DEBUG ("HID-Host hidh_l2cif_data_ind [l2cap_cid=0x%04x]", l2cap_cid);
/* Find CCB based on CID */
if ((dhandle = find_conn_by_cid(l2cap_cid)) < HID_HOST_MAX_DEVICES)
@@ -803,7 +803,7 @@
if (p_hcon == NULL)
{
- HIDH_TRACE_WARNING1 ("HID-Host Rcvd L2CAP data, unknown CID: 0x%x", l2cap_cid);
+ HIDH_TRACE_WARNING ("HID-Host Rcvd L2CAP data, unknown CID: 0x%x", l2cap_cid);
GKI_freebuf (p_msg);
return;
}
@@ -1036,7 +1036,7 @@
/* Check if L2CAP started the connection process */
if ((p_dev->conn.ctrl_cid = L2CA_ConnectReq (HID_PSM_CONTROL, p_dev->addr)) == 0)
{
- HIDH_TRACE_WARNING0 ("HID-Host Originate failed");
+ HIDH_TRACE_WARNING ("HID-Host Originate failed");
hh_cb.callback( dhandle, hh_cb.devices[dhandle].addr, HID_HDEV_EVT_CLOSE,
HID_ERR_L2CAP_FAILED, NULL ) ;
}
diff --git a/stack/pan/pan_api.c b/stack/pan/pan_api.c
index 29496f3..d9bafbb 100644
--- a/stack/pan/pan_api.c
+++ b/stack/pan/pan_api.c
@@ -147,14 +147,14 @@
if ((!(role & (PAN_ROLE_CLIENT | PAN_ROLE_GN_SERVER | PAN_ROLE_NAP_SERVER))) &&
role != PAN_ROLE_INACTIVE)
{
- PAN_TRACE_ERROR1 ("PAN role %d is invalid", role);
+ PAN_TRACE_ERROR ("PAN role %d is invalid", role);
return PAN_FAILURE;
}
/* If the current active role is same as the role being set do nothing */
if (pan_cb.role == role)
{
- PAN_TRACE_EVENT1 ("PAN role already was set to: %d", role);
+ PAN_TRACE_EVENT ("PAN role already was set to: %d", role);
return PAN_SUCCESS;
}
@@ -164,7 +164,7 @@
p_sec = sec_mask;
/* Register all the roles with SDP */
- PAN_TRACE_API1 ("PAN_SetRole() called with role 0x%x", role);
+ PAN_TRACE_API ("PAN_SetRole() called with role 0x%x", role);
#if (defined (PAN_SUPPORTS_ROLE_NAP) && PAN_SUPPORTS_ROLE_NAP == TRUE)
/* Check the service name */
if ((p_nap_name == NULL) || (*p_nap_name == 0))
@@ -265,7 +265,7 @@
pan_close_all_connections ();
pan_cb.role = role;
- PAN_TRACE_EVENT1 ("PAN role set to: %d", role);
+ PAN_TRACE_EVENT ("PAN role set to: %d", role);
return PAN_SUCCESS;
}
@@ -311,7 +311,7 @@
/* Check if PAN is active or not */
if (!(pan_cb.role & src_role))
{
- PAN_TRACE_ERROR1 ("PAN is not active for the role %d", src_role);
+ PAN_TRACE_ERROR ("PAN is not active for the role %d", src_role);
return PAN_FAILURE;
}
@@ -319,7 +319,7 @@
if ((src_role != PAN_ROLE_CLIENT && src_role != PAN_ROLE_GN_SERVER && src_role != PAN_ROLE_NAP_SERVER) ||
(dst_role != PAN_ROLE_CLIENT && dst_role != PAN_ROLE_GN_SERVER && dst_role != PAN_ROLE_NAP_SERVER))
{
- PAN_TRACE_ERROR2 ("Either source %d or destination role %d is invalid", src_role, dst_role);
+ PAN_TRACE_ERROR ("Either source %d or destination role %d is invalid", src_role, dst_role);
return PAN_FAILURE;
}
@@ -336,7 +336,7 @@
** because if there is already a connection we cannot accept
** another connection in PANU role
*/
- PAN_TRACE_ERROR0 ("Cannot make PANU connections when there are more than one connection");
+ PAN_TRACE_ERROR ("Cannot make PANU connections when there are more than one connection");
return PAN_INVALID_SRC_ROLE;
}
@@ -363,7 +363,7 @@
{
if (pan_cb.num_conns && pan_cb.active_role == PAN_ROLE_CLIENT && !pcb)
{
- PAN_TRACE_ERROR0 ("Device already have a connection in PANU role");
+ PAN_TRACE_ERROR ("Device already have a connection in PANU role");
return PAN_INVALID_SRC_ROLE;
}
@@ -383,7 +383,7 @@
/* The role combination is not valid */
else
{
- PAN_TRACE_ERROR2 ("Source %d and Destination roles %d are not valid combination",
+ PAN_TRACE_ERROR ("Source %d and Destination roles %d are not valid combination",
src_role, dst_role);
return PAN_FAILURE;
}
@@ -393,12 +393,12 @@
pcb = pan_allocate_pcb (rem_bda, BNEP_INVALID_HANDLE);
if (!pcb)
{
- PAN_TRACE_ERROR0 ("PAN Connection failed because of no resources");
+ PAN_TRACE_ERROR ("PAN Connection failed because of no resources");
return PAN_NO_RESOURCES;
}
BTM_SetOutService(rem_bda, BTM_SEC_SERVICE_BNEP_PANU, mx_chan_id);
- PAN_TRACE_API6 ("PAN_Connect() for BD Addr %x.%x.%x.%x.%x.%x",
+ PAN_TRACE_API ("PAN_Connect() for BD Addr %x.%x.%x.%x.%x.%x",
rem_bda[0], rem_bda[1], rem_bda[2], rem_bda[3], rem_bda[4], rem_bda[5]);
if (pcb->con_state == PAN_STATE_IDLE)
{
@@ -429,7 +429,7 @@
return result;
}
- PAN_TRACE_DEBUG1 ("PAN_Connect() current active role set to %d", src_role);
+ PAN_TRACE_DEBUG ("PAN_Connect() current active role set to %d", src_role);
pan_cb.prv_active_role = pan_cb.active_role;
pan_cb.active_role = src_role;
*handle = pcb->handle;
@@ -461,7 +461,7 @@
pcb = pan_get_pcb_by_handle (handle);
if(!pcb)
{
- PAN_TRACE_ERROR1 ("PAN connection not found for the handle %d", handle);
+ PAN_TRACE_ERROR ("PAN connection not found for the handle %d", handle);
return PAN_FAILURE;
}
@@ -476,11 +476,11 @@
if (result != BNEP_SUCCESS)
{
- PAN_TRACE_EVENT0 ("Error in closing PAN connection");
+ PAN_TRACE_EVENT ("Error in closing PAN connection");
return PAN_FAILURE;
}
- PAN_TRACE_EVENT0 ("PAN connection closed");
+ PAN_TRACE_EVENT ("PAN connection closed");
return PAN_SUCCESS;
}
@@ -512,7 +512,7 @@
BT_HDR *buffer;
if (pan_cb.role == PAN_ROLE_INACTIVE || !pan_cb.num_conns) {
- PAN_TRACE_ERROR1("%s PAN is not active, data write failed.", __func__);
+ PAN_TRACE_ERROR("%s PAN is not active, data write failed.", __func__);
return PAN_FAILURE;
}
@@ -531,7 +531,7 @@
buffer = (BT_HDR *)GKI_getpoolbuf(PAN_POOL_ID);
if (!buffer) {
- PAN_TRACE_ERROR1("%s unable to acquire buffer from pool.", __func__);
+ PAN_TRACE_ERROR("%s unable to acquire buffer from pool.", __func__);
return PAN_NO_RESOURCES;
}
@@ -574,7 +574,7 @@
if (pan_cb.role == PAN_ROLE_INACTIVE || (!(pan_cb.num_conns)))
{
- PAN_TRACE_ERROR0 ("PAN is not active Data write failed");
+ PAN_TRACE_ERROR ("PAN is not active Data write failed");
GKI_freebuf (p_buf);
return PAN_FAILURE;
}
@@ -604,7 +604,7 @@
if (i == MAX_PAN_CONNS)
{
- PAN_TRACE_ERROR0 ("PAN Don't have any user connections");
+ PAN_TRACE_ERROR ("PAN Don't have any user connections");
GKI_freebuf (p_buf);
return PAN_FAILURE;
}
@@ -612,16 +612,16 @@
result = BNEP_WriteBuf (pan_cb.pcb[i].handle, dst, p_buf, protocol, src, ext);
if (result == BNEP_IGNORE_CMD)
{
- PAN_TRACE_DEBUG0 ("PAN ignored data write for PANU connection");
+ PAN_TRACE_DEBUG ("PAN ignored data write for PANU connection");
return result;
}
else if (result != BNEP_SUCCESS)
{
- PAN_TRACE_ERROR0 ("PAN failed to write data for the PANU connection");
+ PAN_TRACE_ERROR ("PAN failed to write data for the PANU connection");
return result;
}
- PAN_TRACE_DEBUG0 ("PAN successfully wrote data for the PANU connection");
+ PAN_TRACE_DEBUG ("PAN successfully wrote data for the PANU connection");
return PAN_SUCCESS;
}
@@ -629,14 +629,14 @@
pcb = pan_get_pcb_by_handle (handle);
if (!pcb)
{
- PAN_TRACE_ERROR0 ("PAN Buf write for wrong handle");
+ PAN_TRACE_ERROR ("PAN Buf write for wrong handle");
GKI_freebuf (p_buf);
return PAN_FAILURE;
}
if (pcb->con_state != PAN_STATE_CONNECTED)
{
- PAN_TRACE_ERROR0 ("PAN Buf write when conn is not active");
+ PAN_TRACE_ERROR ("PAN Buf write when conn is not active");
GKI_freebuf (p_buf);
return PAN_FAILURE;
}
@@ -644,16 +644,16 @@
result = BNEP_WriteBuf (pcb->handle, dst, p_buf, protocol, src, ext);
if (result == BNEP_IGNORE_CMD)
{
- PAN_TRACE_DEBUG0 ("PAN ignored data buf write to PANU");
+ PAN_TRACE_DEBUG ("PAN ignored data buf write to PANU");
return result;
}
else if (result != BNEP_SUCCESS)
{
- PAN_TRACE_ERROR0 ("PAN failed to send data buf to the PANU");
+ PAN_TRACE_ERROR ("PAN failed to send data buf to the PANU");
return result;
}
- PAN_TRACE_DEBUG0 ("PAN successfully sent data buf to the PANU");
+ PAN_TRACE_DEBUG ("PAN successfully sent data buf to the PANU");
return PAN_SUCCESS;
}
@@ -687,18 +687,18 @@
pcb = pan_get_pcb_by_handle (handle);
if(!pcb)
{
- PAN_TRACE_ERROR1 ("PAN connection not found for the handle %d", handle);
+ PAN_TRACE_ERROR ("PAN connection not found for the handle %d", handle);
return PAN_FAILURE;
}
result = BNEP_SetProtocolFilters (pcb->handle, num_filters, p_start_array, p_end_array);
if (result != BNEP_SUCCESS)
{
- PAN_TRACE_ERROR1 ("PAN failed to set protocol filters for handle %d", handle);
+ PAN_TRACE_ERROR ("PAN failed to set protocol filters for handle %d", handle);
return result;
}
- PAN_TRACE_API1 ("PAN successfully sent protocol filters for handle %d", handle);
+ PAN_TRACE_API ("PAN successfully sent protocol filters for handle %d", handle);
return PAN_SUCCESS;
#else
return PAN_FAILURE;
@@ -736,7 +736,7 @@
pcb = pan_get_pcb_by_handle (handle);
if(!pcb)
{
- PAN_TRACE_ERROR1 ("PAN connection not found for the handle %d", handle);
+ PAN_TRACE_ERROR ("PAN connection not found for the handle %d", handle);
return PAN_FAILURE;
}
@@ -744,11 +744,11 @@
num_mcast_filters, p_start_array, p_end_array);
if (result != BNEP_SUCCESS)
{
- PAN_TRACE_ERROR1 ("PAN failed to set multicast filters for handle %d", handle);
+ PAN_TRACE_ERROR ("PAN failed to set multicast filters for handle %d", handle);
return result;
}
- PAN_TRACE_API1 ("PAN successfully sent multicast filters for handle %d", handle);
+ PAN_TRACE_API ("PAN successfully sent multicast filters for handle %d", handle);
return PAN_SUCCESS;
#else
return PAN_FAILURE;
diff --git a/stack/pan/pan_main.c b/stack/pan/pan_main.c
index bfaced6..8306df3 100644
--- a/stack/pan/pan_main.c
+++ b/stack/pan/pan_main.c
@@ -141,7 +141,7 @@
if (wrong_uuid)
{
- PAN_TRACE_ERROR0 ("PAN Connection failed because of wrong remote UUID ");
+ PAN_TRACE_ERROR ("PAN Connection failed because of wrong remote UUID ");
BNEP_ConnectResp (handle, BNEP_CONN_FAILED_SRC_UUID);
return;
}
@@ -175,17 +175,17 @@
if (wrong_uuid)
{
- PAN_TRACE_ERROR0 ("PAN Connection failed because of wrong local UUID ");
+ PAN_TRACE_ERROR ("PAN Connection failed because of wrong local UUID ");
BNEP_ConnectResp (handle, BNEP_CONN_FAILED_DST_UUID);
return;
}
- PAN_TRACE_EVENT5 ("pan_conn_ind_cb - for handle %d, current role %d, dst uuid 0x%x, src uuid 0x%x, role change %s",
+ PAN_TRACE_EVENT ("pan_conn_ind_cb - for handle %d, current role %d, dst uuid 0x%x, src uuid 0x%x, role change %s",
handle, pan_cb.role, local_uuid->uu.uuid16, remote_uuid->uu.uuid16, is_role_change?"YES":"NO");
/* The acceptable UUID size is only 2 */
if (remote_uuid->len != 2)
{
- PAN_TRACE_ERROR1 ("PAN Connection failed because of wrong UUID size %d", remote_uuid->len);
+ PAN_TRACE_ERROR ("PAN Connection failed because of wrong UUID size %d", remote_uuid->len);
BNEP_ConnectResp (handle, BNEP_CONN_FAILED_UUID_SIZE);
return;
}
@@ -196,7 +196,7 @@
remote_uuid->uu.uuid16 != UUID_SERVCLASS_NAP &&
remote_uuid->uu.uuid16 != UUID_SERVCLASS_GN)
{
- PAN_TRACE_ERROR1 ("Src UUID 0x%x is not valid", remote_uuid->uu.uuid16);
+ PAN_TRACE_ERROR ("Src UUID 0x%x is not valid", remote_uuid->uu.uuid16);
BNEP_ConnectResp (handle, BNEP_CONN_FAILED_SRC_UUID);
return;
}
@@ -206,7 +206,7 @@
local_uuid->uu.uuid16 != UUID_SERVCLASS_NAP &&
local_uuid->uu.uuid16 != UUID_SERVCLASS_GN)
{
- PAN_TRACE_ERROR1 ("Dst UUID 0x%x is not valid", remote_uuid->uu.uuid16);
+ PAN_TRACE_ERROR ("Dst UUID 0x%x is not valid", remote_uuid->uu.uuid16);
BNEP_ConnectResp (handle, BNEP_CONN_FAILED_DST_UUID);
return;
}
@@ -219,7 +219,7 @@
((!(pan_cb.role & UUID_SERVCLASS_NAP))
&& local_uuid->uu.uuid16 == UUID_SERVCLASS_NAP))
{
- PAN_TRACE_ERROR1 ("PAN Connection failed because of unsupported destination UUID 0x%x", local_uuid->uu.uuid16);
+ PAN_TRACE_ERROR ("PAN Connection failed because of unsupported destination UUID 0x%x", local_uuid->uu.uuid16);
BNEP_ConnectResp (handle, BNEP_CONN_FAILED_DST_UUID);
return;
}
@@ -243,7 +243,7 @@
/* There are connections other than this one
** so we cann't accept PANU role. Reject
*/
- PAN_TRACE_ERROR0 ("Dst UUID should be either GN or NAP only because there are other connections");
+ PAN_TRACE_ERROR ("Dst UUID should be either GN or NAP only because there are other connections");
BNEP_ConnectResp (handle, BNEP_CONN_FAILED_DST_UUID);
return;
}
@@ -251,7 +251,7 @@
/* If it is already in connected state check for bridging status */
if (pcb->con_state == PAN_STATE_CONNECTED)
{
- PAN_TRACE_EVENT2 ("PAN Role changing New Src 0x%x Dst 0x%x",
+ PAN_TRACE_EVENT ("PAN Role changing New Src 0x%x Dst 0x%x",
remote_uuid->uu.uuid16, local_uuid->uu.uuid16);
pcb->prv_src_uuid = pcb->src_uuid;
@@ -282,23 +282,23 @@
(local_uuid->uu.uuid16 == UUID_SERVCLASS_PANU ||
pan_cb.active_role == PAN_ROLE_CLIENT))
{
- PAN_TRACE_ERROR0 ("PAN already have a connection and can't be user");
+ PAN_TRACE_ERROR ("PAN already have a connection and can't be user");
BNEP_ConnectResp (handle, BNEP_CONN_FAILED_DST_UUID);
return;
}
}
/* This is a new connection */
- PAN_TRACE_DEBUG1 ("New connection indication for handle %d", handle);
+ PAN_TRACE_DEBUG ("New connection indication for handle %d", handle);
pcb = pan_allocate_pcb (p_bda, handle);
if (!pcb)
{
- PAN_TRACE_ERROR0 ("PAN no control block for new connection");
+ PAN_TRACE_ERROR ("PAN no control block for new connection");
BNEP_ConnectResp (handle, BNEP_CONN_FAILED);
return;
}
- PAN_TRACE_EVENT1 ("PAN connection destination UUID is 0x%x", local_uuid->uu.uuid16);
+ PAN_TRACE_EVENT ("PAN connection destination UUID is 0x%x", local_uuid->uu.uuid16);
/* Set the latest active PAN role */
pan_cb.active_role = req_role;
pcb->src_uuid = local_uuid->uu.uuid16;
@@ -336,11 +336,11 @@
UINT8 peer_role;
UNUSED(rem_bda);
- PAN_TRACE_EVENT2 ("pan_connect_state_cb - for handle %d, result %d", handle, result);
+ PAN_TRACE_EVENT ("pan_connect_state_cb - for handle %d, result %d", handle, result);
pcb = pan_get_pcb_by_handle (handle);
if (!pcb)
{
- PAN_TRACE_ERROR1 ("PAN State change indication for wrong handle %d", handle);
+ PAN_TRACE_ERROR ("PAN State change indication for wrong handle %d", handle);
return;
}
@@ -356,7 +356,7 @@
(pcb->con_flags & PAN_FLAGS_CONN_COMPLETED))
{
/* restore the original values */
- PAN_TRACE_EVENT0 ("restoring the connection state to active");
+ PAN_TRACE_EVENT ("restoring the connection state to active");
pcb->con_state = PAN_STATE_CONNECTED;
pcb->con_flags &= (~PAN_FLAGS_CONN_COMPLETED);
@@ -406,7 +406,7 @@
/* Create bridge if the destination role is NAP */
if (pan_cb.pan_bridge_req_cb && pcb->src_uuid == UUID_SERVCLASS_NAP)
{
- PAN_TRACE_EVENT0 ("PAN requesting for bridge");
+ PAN_TRACE_EVENT ("PAN requesting for bridge");
(*pan_cb.pan_bridge_req_cb) (pcb->rem_bda, TRUE);
}
}
@@ -455,17 +455,17 @@
** send it to the host system
*/
- PAN_TRACE_EVENT1 ("pan_data_ind_cb - for handle %d", handle);
+ PAN_TRACE_EVENT ("pan_data_ind_cb - for handle %d", handle);
pcb = pan_get_pcb_by_handle (handle);
if (!pcb)
{
- PAN_TRACE_ERROR1 ("PAN Data indication for wrong handle %d", handle);
+ PAN_TRACE_ERROR ("PAN Data indication for wrong handle %d", handle);
return;
}
if (pcb->con_state != PAN_STATE_CONNECTED)
{
- PAN_TRACE_ERROR2 ("PAN Data indication in wrong state %d for handle %d",
+ PAN_TRACE_ERROR ("PAN Data indication in wrong state %d for handle %d",
pcb->con_state, handle);
return;
}
@@ -473,7 +473,7 @@
/* Check if it is broadcast packet */
if (dst[0] & 0x01)
{
- PAN_TRACE_DEBUG2 ("PAN received broadcast packet on handle %d, src uuid 0x%x",
+ PAN_TRACE_DEBUG ("PAN received broadcast packet on handle %d, src uuid 0x%x",
handle, pcb->src_uuid);
for (i=0; i<MAX_PAN_CONNS; i++)
{
@@ -554,14 +554,14 @@
pcb = pan_get_pcb_by_handle (handle);
if (!pcb)
{
- PAN_TRACE_ERROR1 ("PAN Data buffer indication for wrong handle %d", handle);
+ PAN_TRACE_ERROR ("PAN Data buffer indication for wrong handle %d", handle);
GKI_freebuf (p_buf);
return;
}
if (pcb->con_state != PAN_STATE_CONNECTED)
{
- PAN_TRACE_ERROR2 ("PAN Data indication in wrong state %d for handle %d",
+ PAN_TRACE_ERROR ("PAN Data indication in wrong state %d for handle %d",
pcb->con_state, handle);
GKI_freebuf (p_buf);
return;
@@ -570,7 +570,7 @@
p_data = (UINT8 *)(p_buf + 1) + p_buf->offset;
len = p_buf->len;
- PAN_TRACE_EVENT4 ("pan_data_buf_ind_cb - for handle %d, protocol 0x%x, length %d, ext %d",
+ PAN_TRACE_EVENT ("pan_data_buf_ind_cb - for handle %d, protocol 0x%x, length %d, ext %d",
handle, protocol, len, ext);
if (pcb->src_uuid == UUID_SERVCLASS_NAP)
@@ -583,7 +583,7 @@
{
if (dst[0] & 0x01)
{
- PAN_TRACE_DEBUG2 ("PAN received broadcast packet on handle %d, src uuid 0x%x",
+ PAN_TRACE_DEBUG ("PAN received broadcast packet on handle %d, src uuid 0x%x",
handle, pcb->src_uuid);
for (i=0; i<MAX_PAN_CONNS; i++)
{
@@ -610,10 +610,10 @@
dst_pcb = pan_get_pcb_by_addr (dst);
if (dst_pcb)
{
- PAN_TRACE_EVENT0 ("pan_data_buf_ind_cb - destination PANU found and sending the data");
+ PAN_TRACE_EVENT ("pan_data_buf_ind_cb - destination PANU found and sending the data");
result = BNEP_WriteBuf (dst_pcb->handle, dst, p_buf, protocol, src, ext);
if (result != BNEP_SUCCESS && result != BNEP_IGNORE_CMD)
- PAN_TRACE_ERROR1 ("Failed to write data for PAN connection handle %d", dst_pcb->handle);
+ PAN_TRACE_ERROR ("Failed to write data for PAN connection handle %d", dst_pcb->handle);
return;
}
}
@@ -682,7 +682,7 @@
UINT8 *p_filters)
{
#if (defined (BNEP_SUPPORTS_PROT_FILTERS) && BNEP_SUPPORTS_PROT_FILTERS == TRUE)
- PAN_TRACE_EVENT4 ("pan_proto_filt_ind_cb - called for handle %d with ind %d, result %d, num %d",
+ PAN_TRACE_EVENT ("pan_proto_filt_ind_cb - called for handle %d with ind %d, result %d, num %d",
handle, indication, result, num_filters);
if (pan_cb.pan_pfilt_ind_cb)
@@ -720,7 +720,7 @@
UINT8 *p_filters)
{
#if (defined (BNEP_SUPPORTS_MULTI_FILTERS) && BNEP_SUPPORTS_MULTI_FILTERS == TRUE)
- PAN_TRACE_EVENT4 ("pan_mcast_filt_ind_cb - called for handle %d with ind %d, result %d, num %d",
+ PAN_TRACE_EVENT ("pan_mcast_filt_ind_cb - called for handle %d with ind %d, result %d, num %d",
handle, indication, result, num_filters);
if (pan_cb.pan_mfilt_ind_cb)
diff --git a/stack/pan/pan_utils.c b/stack/pan/pan_utils.c
index 9ebbb75..7a550fa 100644
--- a/stack/pan/pan_utils.c
+++ b/stack/pan/pan_utils.c
@@ -71,7 +71,7 @@
if (sdp_handle == 0)
{
- PAN_TRACE_ERROR0 ("PAN_SetRole - could not create SDP record");
+ PAN_TRACE_ERROR ("PAN_SetRole - could not create SDP record");
return 0;
}
@@ -133,7 +133,7 @@
|| (!BTM_SetSecurityLevel (FALSE, p_name, BTM_SEC_SERVICE_BNEP_NAP,
sec_mask, BT_PSM_BNEP, BTM_SEC_PROTO_BNEP, UUID_SERVCLASS_NAP)))
{
- PAN_TRACE_ERROR0 ("PAN Security Registration failed for PANU");
+ PAN_TRACE_ERROR ("PAN Security Registration failed for PANU");
}
}
#endif
@@ -145,7 +145,7 @@
|| (!BTM_SetSecurityLevel (FALSE, p_name, BTM_SEC_SERVICE_BNEP_GN,
sec_mask, BT_PSM_BNEP, BTM_SEC_PROTO_BNEP, UUID_SERVCLASS_GN)))
{
- PAN_TRACE_ERROR0 ("PAN Security Registration failed for GN");
+ PAN_TRACE_ERROR ("PAN Security Registration failed for GN");
}
}
#endif
@@ -157,7 +157,7 @@
|| (!BTM_SetSecurityLevel (FALSE, p_name, BTM_SEC_SERVICE_BNEP_PANU,
sec_mask, BT_PSM_BNEP, BTM_SEC_PROTO_BNEP, UUID_SERVCLASS_PANU)))
{
- PAN_TRACE_ERROR0 ("PAN Security Registration failed for PANU");
+ PAN_TRACE_ERROR ("PAN Security Registration failed for PANU");
}
}
#endif
@@ -332,7 +332,7 @@
char buff[200];
tPAN_CONN *p_pcb;
- PAN_TRACE_DEBUG3 ("PAN role %x, active role %d, num_conns %d",
+ PAN_TRACE_DEBUG ("PAN role %x, active role %d, num_conns %d",
pan_cb.role, pan_cb.active_role, pan_cb.num_conns);
for (i = 0, p_pcb = pan_cb.pcb; i < MAX_PAN_CONNS; i++, p_pcb++)
@@ -342,7 +342,7 @@
p_pcb->rem_bda[0], p_pcb->rem_bda[1], p_pcb->rem_bda[2],
p_pcb->rem_bda[3], p_pcb->rem_bda[4], p_pcb->rem_bda[5]);
- PAN_TRACE_DEBUG0 (buff);
+ PAN_TRACE_DEBUG (buff);
}
#endif
}