summaryrefslogtreecommitdiff
path: root/cesar
diff options
context:
space:
mode:
authorNélio Laranjeiro2011-02-02 15:26:14 +0100
committerNélio Laranjeiro2011-02-02 15:26:14 +0100
commit1cfc94286102c1a866bf33f4d8966ba33ddda465 (patch)
tree27ea13ace891d8e88263e0c433c97ccb2bd18d5f /cesar
parent4d787c5b1c304c9c96549869e6e05c7e49b18e35 (diff)
parent41983c772d41a2e73f058facf046f9bae4ac75ac (diff)
Merge branch 'master' into av
Diffstat (limited to 'cesar')
-rw-r--r--cesar/ce/rx/inc/trace.h2
-rw-r--r--cesar/ce/rx/src/trace.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/cesar/ce/rx/inc/trace.h b/cesar/ce/rx/inc/trace.h
index 60646ea9e9..c3630c6062 100644
--- a/cesar/ce/rx/inc/trace.h
+++ b/cesar/ce/rx/inc/trace.h
@@ -40,7 +40,7 @@ enum
CE_RX_TRACE_BL_INITIAL,
CE_RX_TRACE_SEND_TONEMAP,
CE_RX_TRACE_SEND_TONEMAP_REFRESH,
- CE_RX_TRACE_SEND_RESTART,
+ CE_RX_TRACE_SEND_RESTART_CE,
CE_RX_TRACE_FSM_FROM_TO,
CE_RX_TRACE_TONEMAP,
CE_RX_TRACE_INITIAL_WORSE_THAN_ROBO,
diff --git a/cesar/ce/rx/src/trace.c b/cesar/ce/rx/src/trace.c
index 80be5bf598..1ac3b52432 100644
--- a/cesar/ce/rx/src/trace.c
+++ b/cesar/ce/rx/src/trace.c
@@ -84,7 +84,7 @@ ce_rx_trace_init (ce_rx_t *ctx)
TIMESTAMP),
TRACE_EVENT (CE_RX_TRACE_SEND_TONEMAP_REFRESH, "tei %d: "
"send tm refresh", TIMESTAMP),
- TRACE_EVENT (CE_RX_TRACE_SEND_RESTART, "tei %d: "
+ TRACE_EVENT (CE_RX_TRACE_SEND_RESTART_CE, "tei %d: "
"send ce restart", TIMESTAMP),
TRACE_EVENT (CE_RX_TRACE_FSM_FROM_TO, "tei %d: "
"[fsm] %S == %E ==> %S", TIMESTAMP),