summaryrefslogtreecommitdiff
path: root/hal/phy
diff options
context:
space:
mode:
authorschodet2008-01-28 13:36:09 +0000
committerschodet2008-01-28 13:36:09 +0000
commita27da22d829cfd9bf7bdd36f9e7a1039e3fd9232 (patch)
treeb980ece341caacce73d641f7110ffd17545d33f1 /hal/phy
parent6618601dc5694a3c266be852caceae336a671bb0 (diff)
* lib/trace:
- new lighter trace declaration syntax. - new TIMESTAMP option. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@1339 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'hal/phy')
-rw-r--r--hal/phy/maximus/inc/maximus_phy_ctx.h2
-rw-r--r--hal/phy/maximus/inc/maximus_trace.h87
-rw-r--r--hal/phy/maximus/src/maximus_trace.c47
3 files changed, 65 insertions, 71 deletions
diff --git a/hal/phy/maximus/inc/maximus_phy_ctx.h b/hal/phy/maximus/inc/maximus_phy_ctx.h
index b5dfd3dab8..10ffdec43b 100644
--- a/hal/phy/maximus/inc/maximus_phy_ctx.h
+++ b/hal/phy/maximus/inc/maximus_phy_ctx.h
@@ -268,8 +268,6 @@ struct phy_t
#if CONFIG_TRACE
/** PHY trace. */
trace_buffer_t trace;
- /** PHY trace name space. */
- trace_namespace_t trace_namespace;
#endif /* !CONFIG_TRACE */
};
/* Forward declaration in hal/phy/forward.h. */
diff --git a/hal/phy/maximus/inc/maximus_trace.h b/hal/phy/maximus/inc/maximus_trace.h
index 77668a07b2..f8abb3090c 100644
--- a/hal/phy/maximus/inc/maximus_trace.h
+++ b/hal/phy/maximus/inc/maximus_trace.h
@@ -20,56 +20,53 @@
#if CONFIG_TRACE
-#define MAXIMUS_PHY_ID(id, ord, args) \
- MAXIMUS_PHY_TRACE_ ## id = TRACE_ID (ord, args)
-
enum
{
- MAXIMUS_PHY_ID (INIT, 1, 0),
- MAXIMUS_PHY_ID (SET_TONEMASK, 2, 1),
- MAXIMUS_PHY_ID (UNINIT, 3, 0),
- MAXIMUS_PHY_ID (RESET, 4, 0),
- MAXIMUS_PHY_ID (CLOCK_SET_NUMERATOR, 5, 1),
- MAXIMUS_PHY_ID (SET_TONEMAP, 6, 2),
- MAXIMUS_PHY_ID (TX_FC10, 11, 1),
- MAXIMUS_PHY_ID (TX_PARAM, 12, 7),
- MAXIMUS_PHY_ID (TX_FRAME, 13, 4),
- MAXIMUS_PHY_ID (RX_PARAM, 21, 1),
- MAXIMUS_PHY_ID (RX_ACTIVATE, 22, 2),
- MAXIMUS_PHY_ID (RX_ACTIVATE_NOW, 23, 1),
- MAXIMUS_PHY_ID (RX_PREPARE, 24, 7),
- MAXIMUS_PHY_ID (EXTRA_TIMER_PROGRAM, 31, 1),
- MAXIMUS_PHY_ID (EXTRA_TIMER_CANCEL, 32, 0),
- MAXIMUS_PHY_ID (ACCESS_CONF_CB, 41, 0),
- MAXIMUS_PHY_ID (RX_FC_CB, 42, 1),
- MAXIMUS_PHY_ID (DEFERRED_CB, 43, 0),
- MAXIMUS_PHY_ID (EXTRA_TIMER_CB, 44, 0),
+ MAXIMUS_PHY_TRACE_INIT,
+ MAXIMUS_PHY_TRACE_SET_TONEMASK,
+ MAXIMUS_PHY_TRACE_UNINIT,
+ MAXIMUS_PHY_TRACE_RESET,
+ MAXIMUS_PHY_TRACE_CLOCK_SET_NUMERATOR,
+ MAXIMUS_PHY_TRACE_SET_TONEMAP,
+ MAXIMUS_PHY_TRACE_TX_FC10,
+ MAXIMUS_PHY_TRACE_TX_PARAM,
+ MAXIMUS_PHY_TRACE_TX_FRAME,
+ MAXIMUS_PHY_TRACE_RX_PARAM,
+ MAXIMUS_PHY_TRACE_RX_ACTIVATE,
+ MAXIMUS_PHY_TRACE_RX_ACTIVATE_NOW,
+ MAXIMUS_PHY_TRACE_RX_PREPARE,
+ MAXIMUS_PHY_TRACE_EXTRA_TIMER_PROGRAM,
+ MAXIMUS_PHY_TRACE_EXTRA_TIMER_CANCEL,
+ MAXIMUS_PHY_TRACE_ACCESS_CONF_CB,
+ MAXIMUS_PHY_TRACE_RX_FC_CB,
+ MAXIMUS_PHY_TRACE_DEFERRED_CB,
+ MAXIMUS_PHY_TRACE_EXTRA_TIMER_CB,
- MAXIMUS_PHY_ID (ACCESS_BACKOFF_START, 101, 2),
- MAXIMUS_PHY_ID (ACCESS_BACKOFF_UPDATE, 102, 1),
- MAXIMUS_PHY_ID (ACCESS_TIMER_PROGRAM, 103, 1),
- MAXIMUS_PHY_ID (ACCESS_TIMER_CANCEL, 104, 0),
- MAXIMUS_PHY_ID (ACCESS_CB, 105, 0),
+ MAXIMUS_PHY_TRACE_ACCESS_BACKOFF_START,
+ MAXIMUS_PHY_TRACE_ACCESS_BACKOFF_UPDATE,
+ MAXIMUS_PHY_TRACE_ACCESS_TIMER_PROGRAM,
+ MAXIMUS_PHY_TRACE_ACCESS_TIMER_CANCEL,
+ MAXIMUS_PHY_TRACE_ACCESS_CB,
- MAXIMUS_PHY_ID (PBDMA_START, 151, 4),
- MAXIMUS_PHY_ID (PBDMA_UPDATE, 152, 2),
- MAXIMUS_PHY_ID (PBDMA_START_CHANDATA, 153, 0),
- MAXIMUS_PHY_ID (PBDMA_CB, 154, 1),
+ MAXIMUS_PHY_TRACE_PBDMA_START,
+ MAXIMUS_PHY_TRACE_PBDMA_UPDATE,
+ MAXIMUS_PHY_TRACE_PBDMA_START_CHANDATA,
+ MAXIMUS_PHY_TRACE_PBDMA_CB,
- MAXIMUS_PHY_ID (M_PRP0, 201, 1),
- MAXIMUS_PHY_ID (M_PRP1, 202, 1),
- MAXIMUS_PHY_ID (M_PRP_END, 203, 4),
- MAXIMUS_PHY_ID (M_SLOT, 204, 2),
- MAXIMUS_PHY_ID (M_PRE_DETECT, 205, 1),
- MAXIMUS_PHY_ID (M_FC_DETECT, 206, 1),
- MAXIMUS_PHY_ID (M_RECV_MPDU_PAYLOAD, 207, 1),
- MAXIMUS_PHY_ID (M_RECV_CHANDATA, 208, 1),
- MAXIMUS_PHY_ID (M_TX_FRAME, 209, 1),
- MAXIMUS_PHY_ID (M_TX_PRE, 210, 1),
- MAXIMUS_PHY_ID (M_TX_FC, 211, 1),
- MAXIMUS_PHY_ID (M_TX_SYMBOLS, 212, 1),
- MAXIMUS_PHY_ID (M_TX_MPDU, 213, 1),
- MAXIMUS_PHY_ID (M_RX_ACTIVATE, 214, 1),
+ MAXIMUS_PHY_TRACE_M_PRP0,
+ MAXIMUS_PHY_TRACE_M_PRP1,
+ MAXIMUS_PHY_TRACE_M_PRP_END,
+ MAXIMUS_PHY_TRACE_M_SLOT,
+ MAXIMUS_PHY_TRACE_M_PRE_DETECT,
+ MAXIMUS_PHY_TRACE_M_FC_DETECT,
+ MAXIMUS_PHY_TRACE_M_RECV_MPDU_PAYLOAD,
+ MAXIMUS_PHY_TRACE_M_RECV_CHANDATA,
+ MAXIMUS_PHY_TRACE_M_TX_FRAME,
+ MAXIMUS_PHY_TRACE_M_TX_PRE,
+ MAXIMUS_PHY_TRACE_M_TX_FC,
+ MAXIMUS_PHY_TRACE_M_TX_SYMBOLS,
+ MAXIMUS_PHY_TRACE_M_TX_MPDU,
+ MAXIMUS_PHY_TRACE_M_RX_ACTIVATE,
};
BEGIN_DECLS
diff --git a/hal/phy/maximus/src/maximus_trace.c b/hal/phy/maximus/src/maximus_trace.c
index 8982abf141..7b05bd9284 100644
--- a/hal/phy/maximus/src/maximus_trace.c
+++ b/hal/phy/maximus/src/maximus_trace.c
@@ -14,14 +14,14 @@
#include "inc/maximus_phy_ctx.h"
-#define MAXIMUS_PHY_TRACE_EVENT(id, format) \
- TRACE_EVENT (MAXIMUS_PHY_TRACE_ ## id, format)
+#define MAXIMUS_PHY_TRACE_EVENT(id, format, args...) \
+ TRACE_EVENT (MAXIMUS_PHY_TRACE_ ## id, format, ## args)
void
maximus_phy_trace_init (phy_t *ctx)
{
- uint i;
- static trace_event_id_t event_ids[] =
+ static trace_namespace_t namespace;
+ static const trace_event_id_t event_ids[] =
{
MAXIMUS_PHY_TRACE_EVENT (INIT, "init"),
MAXIMUS_PHY_TRACE_EVENT (SET_TONEMASK, "set tonemask carrier_nb=%u"),
@@ -70,34 +70,33 @@ maximus_phy_trace_init (phy_t *ctx)
"pbdma start chandata"),
MAXIMUS_PHY_TRACE_EVENT (PBDMA_CB, "pbdma cb %x"),
- MAXIMUS_PHY_TRACE_EVENT (M_PRP0, " prp0 %x"),
- MAXIMUS_PHY_TRACE_EVENT (M_PRP1, " prp1 %x"),
- MAXIMUS_PHY_TRACE_EVENT (M_PRP_END, " prp end %x cap_sent=%u "
- "cap_medium=%u cap_mpdu=%u"),
- MAXIMUS_PHY_TRACE_EVENT (M_SLOT, " slot %x count=%d"),
- MAXIMUS_PHY_TRACE_EVENT (M_PRE_DETECT, " pre detect %x"),
- MAXIMUS_PHY_TRACE_EVENT (M_FC_DETECT, " fc detect %x"),
- MAXIMUS_PHY_TRACE_EVENT (M_RECV_MPDU_PAYLOAD, " recv payload %x"),
- MAXIMUS_PHY_TRACE_EVENT (M_RECV_CHANDATA, " recv chandata %x"),
- MAXIMUS_PHY_TRACE_EVENT (M_TX_FRAME, " tx frame %x"),
- MAXIMUS_PHY_TRACE_EVENT (M_TX_PRE, " tx pre %x"),
- MAXIMUS_PHY_TRACE_EVENT (M_TX_FC, " tx fc %x"),
+ MAXIMUS_PHY_TRACE_EVENT (M_PRP0, " prp0", TIMESTAMP),
+ MAXIMUS_PHY_TRACE_EVENT (M_PRP1, " prp1", TIMESTAMP),
+ MAXIMUS_PHY_TRACE_EVENT (M_PRP_END, " prp end cap_sent=%u "
+ "cap_medium=%u cap_mpdu=%u", TIMESTAMP),
+ MAXIMUS_PHY_TRACE_EVENT (M_SLOT, " slot count=%d", TIMESTAMP),
+ MAXIMUS_PHY_TRACE_EVENT (M_PRE_DETECT, " pre detect", TIMESTAMP),
+ MAXIMUS_PHY_TRACE_EVENT (M_FC_DETECT, " fc detect", TIMESTAMP),
+ MAXIMUS_PHY_TRACE_EVENT (M_RECV_MPDU_PAYLOAD, " recv payload",
+ TIMESTAMP),
+ MAXIMUS_PHY_TRACE_EVENT (M_RECV_CHANDATA, " recv chandata",
+ TIMESTAMP),
+ MAXIMUS_PHY_TRACE_EVENT (M_TX_FRAME, " tx frame", TIMESTAMP),
+ MAXIMUS_PHY_TRACE_EVENT (M_TX_PRE, " tx pre", TIMESTAMP),
+ MAXIMUS_PHY_TRACE_EVENT (M_TX_FC, " tx fc", TIMESTAMP),
MAXIMUS_PHY_TRACE_EVENT (M_TX_SYMBOLS, " tx symb_nb=%u"),
- MAXIMUS_PHY_TRACE_EVENT (M_TX_MPDU, " tx mpdu %x"),
- MAXIMUS_PHY_TRACE_EVENT (M_RX_ACTIVATE, " rx activate %x"),
+ MAXIMUS_PHY_TRACE_EVENT (M_TX_MPDU, " tx mpdu", TIMESTAMP),
+ MAXIMUS_PHY_TRACE_EVENT (M_RX_ACTIVATE, " rx activate", TIMESTAMP),
};
dbg_assert (ctx);
- trace_namespace_init (&ctx->trace_namespace);
- for (i = 0; i < COUNT (event_ids); i++)
- trace_namespace_register_event_id (&ctx->trace_namespace,
- &event_ids[i]);
- trace_buffer_add (&ctx->trace, 8, 16, true, &ctx->trace_namespace);
+ trace_namespace_init (&namespace, event_ids, COUNT (event_ids));
+ trace_buffer_add (&ctx->trace, "phy", 8, 16, true, &namespace);
}
void
maximus_phy_trace_uninit (phy_t *ctx)
{
+ dbg_assert (ctx);
trace_buffer_remove (&ctx->trace);
- trace_namespace_uninit (&ctx->trace_namespace);
}