summaryrefslogtreecommitdiff
path: root/cesar/ce
diff options
context:
space:
mode:
authordufour2009-10-16 13:28:30 +0000
committerdufour2009-10-16 13:28:30 +0000
commite422cbffbffe435df7b42880aa84a767466ddcfc (patch)
tree547b76fc1e18eb06610313ca5189e3ee19036404 /cesar/ce
parent4d878f9ce254252f4958300932005fd96e72cb35 (diff)
cesar/ce/tx: add traces to know if CE MME are well decoded
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@6161 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/ce')
-rw-r--r--cesar/ce/tx/src/mme.c38
-rw-r--r--cesar/ce/tx/src/tx.c1
2 files changed, 37 insertions, 2 deletions
diff --git a/cesar/ce/tx/src/mme.c b/cesar/ce/tx/src/mme.c
index 4d100a7f79..b08013e1cd 100644
--- a/cesar/ce/tx/src/mme.c
+++ b/cesar/ce/tx/src/mme.c
@@ -15,6 +15,7 @@
#include "cp/pwl/pwl.h"
#include "hal/phy/defs.h"
#include "cp/inc/context.h"
+#include "cp/inc/trace.h"
#include "cp/mme.h"
#include "cp/msg/msg.h"
#include "mac/common/timings.h"
@@ -521,6 +522,7 @@ ce_tx_cm_chan_est_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
if (!ce_tx_cm_chan_est_ind_receive_begin (ctx, &mme->bitstream,
&header))
{
+ CP_TRACE (CE_TX_MME_DECODE_ERROR, 0x1);
/* Error while decoding MME. */
blk_release (sta_s);
return false;
@@ -531,6 +533,7 @@ ce_tx_cm_chan_est_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
if (!ce_tx_mme_read_tmi_av_list (ctx, &mme->bitstream, &ntmi,
&tmi_av_list))
{
+ CP_TRACE (CE_TX_MME_DECODE_ERROR, 0x2);
/* Error while decoding MME. */
blk_release (sta_s);
return false;
@@ -542,6 +545,7 @@ ce_tx_cm_chan_est_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
* the intervals? Is it useful? */
if (!ntmi)
{
+ CP_TRACE (CE_TX_MME_DECODE_ERROR, 0x3);
sta_s_tx_tonemap->default_tmi = TONEMAP_INDEX_INITIAL_START;
/* Cleaning will be done later (see ce_tx_clean_tonemaps). */
blk_release (sta_s);
@@ -551,6 +555,7 @@ ce_tx_cm_chan_est_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
/* Check default TMI is in the valid list of TMI. */
if ((header.cp_tmi_av > 3) && !(tmi_av_list & (1 << header.cp_tmi_av)))
{
+ CP_TRACE (CE_TX_MME_DECODE_ERROR, 0x4);
blk_release (sta_s);
return false;
}
@@ -559,6 +564,7 @@ ce_tx_cm_chan_est_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
if (!ce_tx_mme_read_interval_list (ctx, &mme->bitstream,
sta_s_tx_tonemap))
{
+ CP_TRACE (CE_TX_MME_DECODE_ERROR, 0x5);
blk_release (sta_s);
/* Error while decoding MME. */
return false;
@@ -568,6 +574,7 @@ ce_tx_cm_chan_est_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
u8 new_tmi_av;
if (!ce_tx_mme_read_tmi (ctx, &mme->bitstream, &new_tmi_av))
{
+ CP_TRACE (CE_TX_MME_DECODE_ERROR, 0x6);
blk_release (sta_s);
/* Error while decoding MME. */
return false;
@@ -578,6 +585,7 @@ ce_tx_cm_chan_est_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
/* New TMI should be in the valid list of TMI. */
if (!(tmi_av_list & (1 << new_tmi_av)))
{
+ CP_TRACE (CE_TX_MME_DECODE_ERROR, 0x7);
blk_release (sta_s);
return false;
}
@@ -590,6 +598,7 @@ ce_tx_cm_chan_est_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
|| !cp_msg_mme_read_end_check (ctx, mme))
/* Error while decoding MME. */
{
+ CP_TRACE (CE_TX_MME_DECODE_ERROR, 0x8);
tonemap_free (new_tone_map);
blk_release (sta_s);
return false;
@@ -603,6 +612,7 @@ ce_tx_cm_chan_est_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
/* Clean if needed. */
if (tone_map_tmp)
tonemap_free (tone_map_tmp);
+ CP_TRACE (CE_TX_NEW_TONEMAP, new_tmi_av);
}
else
{
@@ -610,6 +620,7 @@ ce_tx_cm_chan_est_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
if (!cp_msg_mme_read_end_check (ctx, mme)
|| new_tmi_av != 0)
{
+ CP_TRACE (CE_TX_MME_DECODE_ERROR, 0x9);
/* New TMI is ROBO?! */
blk_release (sta_s);
return false;
@@ -618,6 +629,7 @@ ce_tx_cm_chan_est_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
}
else
{
+ CP_TRACE (CE_TX_MME_DECODE_ERROR, 0x10);
/* Empty MME while decoding. */
blk_release (sta_s);
return false;
@@ -637,7 +649,13 @@ ce_tx_cm_chan_est_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
if (header.cp_tmi_av > 3 && !sta_s_tx_tonemap->tm[header.cp_tmi_av])
sta_s_tx_tonemap->default_tmi = TONEMAP_INDEX_INITIAL_ERROR;
else
- sta_s_tx_tonemap->default_tmi = header.cp_tmi_av;
+ {
+ if (sta_s_tx_tonemap->default_tmi != header.cp_tmi_av)
+ {
+ CP_TRACE (CE_TX_NEW_DEFAULT_TMI, header.cp_tmi_av);
+ sta_s_tx_tonemap->default_tmi = header.cp_tmi_av;
+ }
+ }
/* Reset bitmap field for sound complete. */
sta_s_tx_tonemap->tm_sound_complete_bitmap = 0;
/* Update intervals list. */
@@ -688,6 +706,7 @@ ce_tx_cm_tm_update_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
/* Get the default tone map index. */
if (!ce_tx_mme_read_tmi (ctx, &mme->bitstream, &default_tmi))
{
+ CP_TRACE (CE_TX_MME_DECODE_ERROR, 0x50);
/* Error while decoding MME. */
blk_release (sta_s);
return false;
@@ -698,6 +717,7 @@ ce_tx_cm_tm_update_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
if (!ce_tx_mme_read_tmi_av_list (ctx, &mme->bitstream, &ntmi,
&tmi_av_list))
{
+ CP_TRACE (CE_TX_MME_DECODE_ERROR, 0x51);
/* Error while decoding MME. */
blk_release (sta_s);
return false;
@@ -717,6 +737,7 @@ ce_tx_cm_tm_update_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
/* Check default TMI is in the valid list of TMI. */
if ((default_tmi > 3) && !(tmi_av_list & (1 << default_tmi)))
{
+ CP_TRACE (CE_TX_MME_DECODE_ERROR, 0x52);
/* Default TMI not enabled. */
blk_release (sta_s);
return false;
@@ -726,6 +747,7 @@ ce_tx_cm_tm_update_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
if (!ce_tx_mme_read_interval_list (ctx, &mme->bitstream,
sta_s_tx_tonemap))
{
+ CP_TRACE (CE_TX_MME_DECODE_ERROR, 0x53);
/* Error while decoding MME. */
blk_release (sta_s);
return false;
@@ -736,6 +758,7 @@ ce_tx_cm_tm_update_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
if (!ce_tx_mme_read_tmi (ctx, &mme->bitstream, &old_tmi)
|| !sta_s_tx_tonemap->tm[old_tmi])
{
+ CP_TRACE (CE_TX_MME_DECODE_ERROR, 0x54);
/* Error while decoding MME. */
blk_release (sta_s);
return false;
@@ -745,6 +768,7 @@ ce_tx_cm_tm_update_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
u8 new_tmi;
if (!ce_tx_mme_read_tmi (ctx, &mme->bitstream, &new_tmi))
{
+ CP_TRACE (CE_TX_MME_DECODE_ERROR, 0x55);
/* Error while decoding MME. */
blk_release (sta_s);
return false;
@@ -755,6 +779,7 @@ ce_tx_cm_tm_update_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
/* New TMI should be in the valid list of TMI. */
if (!(tmi_av_list & (1 << new_tmi)))
{
+ CP_TRACE (CE_TX_MME_DECODE_ERROR, 0x56);
blk_release (sta_s);
return false;
}
@@ -766,6 +791,7 @@ ce_tx_cm_tm_update_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
sta_s_tx_tonemap->tm[old_tmi])
|| !cp_msg_mme_read_end_check (ctx, mme))
{
+ CP_TRACE (CE_TX_MME_DECODE_ERROR, 0x57);
/* Error. */
tonemap_free (new_tone_map);
blk_release (sta_s);
@@ -779,12 +805,14 @@ ce_tx_cm_tm_update_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
/* Clean if needed. */
if (tone_map_tmp)
tonemap_free (tone_map_tmp);
+ CP_TRACE (CE_TX_NEW_TONEMAP, new_tmi);
}
else
{
if (!cp_msg_mme_read_end_check (ctx, mme)
|| new_tmi != 0)
{
+ CP_TRACE (CE_TX_MME_DECODE_ERROR, 0x58);
/* New TMI is ROBO?! */
blk_release (sta_s);
return false;
@@ -802,7 +830,13 @@ ce_tx_cm_tm_update_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
if (default_tmi > 3 && !sta_s_tx_tonemap->tm[default_tmi])
sta_s_tx_tonemap->default_tmi = TONEMAP_INDEX_INITIAL_ERROR;
else
- sta_s_tx_tonemap->default_tmi = default_tmi;
+ {
+ if (sta_s_tx_tonemap->default_tmi != default_tmi)
+ {
+ CP_TRACE (CE_TX_NEW_DEFAULT_TMI, default_tmi);
+ sta_s_tx_tonemap->default_tmi = default_tmi;
+ }
+ }
/* Reset bitmap field for sound complete. */
sta_s_tx_tonemap->tm_sound_complete_bitmap = 0;
/* Update intervals list. */
diff --git a/cesar/ce/tx/src/tx.c b/cesar/ce/tx/src/tx.c
index b24d81a578..4ae9619c5d 100644
--- a/cesar/ce/tx/src/tx.c
+++ b/cesar/ce/tx/src/tx.c
@@ -14,6 +14,7 @@
#include "common/std.h"
#include "cp/inc/context.h"
+#include "cp/inc/trace.h"
#include "cp/mme.h"
#include "cp/sta/mgr/sta_own_data.h"
#include "cp/sta/mgr/sta_mgr.h"