summaryrefslogtreecommitdiff
path: root/cesar/ce/rx
diff options
context:
space:
mode:
authorCyril Jourdan2013-03-21 17:14:48 +0100
committerCyril Jourdan2013-04-18 16:35:46 +0200
commit19ef0bacf31a4793103180bcd9d61cec125db08a (patch)
treeb897d85263311d76c96ce7ef8080579ec6f54b4e /cesar/ce/rx
parent8f777c37334c700ac983634f475d3c6850dfdcba (diff)
cesar/ce: use tonemap index defines
Diffstat (limited to 'cesar/ce/rx')
-rw-r--r--cesar/ce/rx/bitloading/src/intervals.c2
-rw-r--r--cesar/ce/rx/bitloading/test/intervals/src/test_intervals_fsm.c40
2 files changed, 27 insertions, 15 deletions
diff --git a/cesar/ce/rx/bitloading/src/intervals.c b/cesar/ce/rx/bitloading/src/intervals.c
index 332f66937a..87fe0d583a 100644
--- a/cesar/ce/rx/bitloading/src/intervals.c
+++ b/cesar/ce/rx/bitloading/src/intervals.c
@@ -148,7 +148,7 @@ ce_rx_bl_intervals_reset (ce_rx_t *ce_rx, sta_t *sta, int fsm_id)
tonemap_disable (sta->rx_tonemaps, *tmi);
/* Set sound flag for this interval. */
- *tmi = 0xFE;
+ *tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE;
/* Reset high PB error rate counter. */
bl->high_pb_error_rate_frame_counter = 0;
diff --git a/cesar/ce/rx/bitloading/test/intervals/src/test_intervals_fsm.c b/cesar/ce/rx/bitloading/test/intervals/src/test_intervals_fsm.c
index cf8c279f02..f637586caa 100644
--- a/cesar/ce/rx/bitloading/test/intervals/src/test_intervals_fsm.c
+++ b/cesar/ce/rx/bitloading/test/intervals/src/test_intervals_fsm.c
@@ -96,7 +96,8 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
tonemap_disable, .tms = &rx_tms, .tmi = tested_tmi);
- /* - check the interval is updated with 0xFE */
+ /* - check the interval is updated with
+ * TONEMAP_INDEX_INTERVAL_UNAVAILABLE */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_clear, .tms = &rx_tms);
int j;
@@ -104,7 +105,8 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
{
if (j % mac_interval_fsm_count_ == tested_fsm_id)
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
- mac_interval_append, .tms = &rx_tms, .tmi = 0xFE);
+ mac_interval_append, .tms = &rx_tms,
+ .tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE);
else
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_append, .tms = &rx_tms, .tmi = tested_tmi);
@@ -139,7 +141,8 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
.branch = ce_rx_bl_fsm_next (INTERVAL_TRACKING, interval_sound));
/* Check intervals are reset:
- * - check the interval is updated with 0xFE */
+ * - check the interval is updated with
+ * TONEMAP_INDEX_INTERVAL_UNAVAILABLE */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_clear, .tms = &rx_tms);
int j;
@@ -147,7 +150,8 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
{
if (j % mac_interval_fsm_count_ == tested_fsm_id)
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
- mac_interval_append, .tms = &rx_tms, .tmi = 0xFE);
+ mac_interval_append, .tms = &rx_tms,
+ .tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE);
else
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_append, .tms = &rx_tms, .tmi = tested_tmi);
@@ -185,7 +189,8 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
.branch = ce_rx_bl_fsm_next (INTERVAL_TRACKING, interval_sound));
/* Check intervals are reset:
- * - check the interval is updated with 0xFE */
+ * - check the interval is updated with
+ * TONEMAP_INDEX_INTERVAL_UNAVAILABLE */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_clear, .tms = &rx_tms);
int j;
@@ -193,7 +198,8 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
{
if (j % mac_interval_fsm_count_ == tested_fsm_id)
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
- mac_interval_append, .tms = &rx_tms, .tmi = 0xFE);
+ mac_interval_append, .tms = &rx_tms,
+ .tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE);
else
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_append, .tms = &rx_tms, .tmi = tested_tmi);
@@ -352,7 +358,8 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
ce_rx_bl_ber_sliding_mean_update,
.bl = sta.intervals->intervals[tested_fsm_id]);
- /* - check the interval is updated with 0xFE */
+ /* - check the interval is updated with
+ * TONEMAP_INDEX_INTERVAL_UNAVAILABLE */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_clear, .tms = &rx_tms);
int j;
@@ -360,7 +367,8 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
{
if (j % mac_interval_fsm_count_ == tested_fsm_id)
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
- mac_interval_append, .tms = &rx_tms, .tmi = 0xFE);
+ mac_interval_append, .tms = &rx_tms,
+ .tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE);
else
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_append, .tms = &rx_tms, .tmi = tested_tmi);
@@ -405,7 +413,8 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
.bl = sta.intervals->intervals[tested_fsm_id]);
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (ce_rx_bl_ber_pt_robo);
- /* - check the interval is updated with 0xFE */
+ /* - check the interval is updated with
+ * TONEMAP_INDEX_INTERVAL_UNAVAILABLE */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_clear, .tms = &rx_tms);
int j;
@@ -413,7 +422,8 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
{
if (j % mac_interval_fsm_count_ == tested_fsm_id)
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
- mac_interval_append, .tms = &rx_tms, .tmi = 0xFE);
+ mac_interval_append, .tms = &rx_tms,
+ .tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE);
else
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_append, .tms = &rx_tms, .tmi = tested_tmi);
@@ -459,7 +469,8 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
ce_rx_bl_ber_sliding_mean_update,
.bl = sta.intervals->intervals[tested_fsm_id]);
- /* - check the interval is updated with 0xFE */
+ /* - check the interval is updated with
+ * TONEMAP_INDEX_INTERVAL_UNAVAILABLE */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_clear, .tms = &rx_tms);
int j;
@@ -467,7 +478,8 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
{
if (j % mac_interval_fsm_count_ == tested_fsm_id)
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
- mac_interval_append, .tms = &rx_tms, .tmi = 0xFE);
+ mac_interval_append, .tms = &rx_tms,
+ .tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE);
else
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_append, .tms = &rx_tms, .tmi = tested_tmi);
@@ -563,7 +575,7 @@ test_ce_rx_bl_fsm_INTERVAL_SOUND (test_t t)
ce_rx_bl_ber_sliding_mean_update,
.bl = sta.intervals->intervals[tested_fsm_id]);
- /* - check the interval is updated with 0xFE */
+ /* - check the interval is updated with DEFAULT_NEW_TMI */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_clear, .tms = &rx_tms);
int j;
@@ -684,7 +696,7 @@ test_ce_rx_bl_fsm_INTERVAL_SOUND_WAIT (test_t t)
ce_rx_bl_ber_sliding_mean_update,
.bl = sta.intervals->intervals[tested_fsm_id]);
- /* - check the interval is updated with 0xFE */
+ /* - check the interval is updated with DEFAULT_NEW_TMI */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_clear, .tms = &rx_tms);
int j;