summaryrefslogtreecommitdiff
path: root/cesar/ce/rx/bitloading/test
diff options
context:
space:
mode:
Diffstat (limited to 'cesar/ce/rx/bitloading/test')
-rw-r--r--cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c16
-rw-r--r--cesar/ce/rx/bitloading/test/intervals/src/test_intervals_fsm.c41
-rw-r--r--cesar/ce/rx/bitloading/test/src/test_intervals.c42
3 files changed, 48 insertions, 51 deletions
diff --git a/cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c b/cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c
index f1904019da..ad78abe640 100644
--- a/cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c
+++ b/cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c
@@ -16,6 +16,7 @@
#include "ce/rx/bitloading/fsm/event.h"
#include "ce/rx/bitloading/inc/ber.h"
#include "ce/rx/bitloading/inc/pber.h"
+#include "ce/rx/bitloading/intervals.h"
#include "ce/rx/inc/measure.h"
#include "ce/common/mod.h"
#include "mac/common/sta.h"
@@ -30,9 +31,6 @@
#include <cyg/kernel/kapi.h>
#include <string.h>
-u8 mac_interval_fsm_count_ = 6;
-u8 mac_interval_repetition_count_ = 4;
-
/**
* The configuration of the BER module.
*/
@@ -100,8 +98,8 @@ test_ce_rx_bl_fsm_IDLE (test_t t)
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_clear, .tms = &rx_tms);
int j;
- int total_ints = mac_interval_fsm_count_ *
- mac_interval_repetition_count_;
+ int total_ints = ce_rx_bl_intervals_fsm_count_ *
+ ce_rx_bl_intervals_repetition_count_;
for (j = 0; j < total_ints; j++)
{
@@ -110,7 +108,7 @@ test_ce_rx_bl_fsm_IDLE (test_t t)
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_commit_changes, .tms = &rx_tms,
- .group_intervals_nb = mac_interval_fsm_count_);
+ .group_intervals_nb = ce_rx_bl_intervals_fsm_count_);
/* - check MMe is sent */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
@@ -187,8 +185,8 @@ test_ce_rx_bl_fsm_INITIAL (test_t t)
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_clear, .tms = &rx_tms);
int j;
- int total_ints = mac_interval_fsm_count_ *
- mac_interval_repetition_count_;
+ int total_ints = ce_rx_bl_intervals_fsm_count_ *
+ ce_rx_bl_intervals_repetition_count_;
for (j = 0; j < total_ints; j++)
{
@@ -197,7 +195,7 @@ test_ce_rx_bl_fsm_INITIAL (test_t t)
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_commit_changes, .tms = &rx_tms,
- .group_intervals_nb = mac_interval_fsm_count_);
+ .group_intervals_nb = ce_rx_bl_intervals_fsm_count_);
/* - check MMe is sent */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
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 d732a32fce..6a7f697ba7 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
@@ -16,6 +16,7 @@
#include "ce/rx/bitloading/fsm/event.h"
#include "ce/rx/bitloading/inc/ber.h"
#include "ce/rx/bitloading/inc/pber.h"
+#include "ce/rx/bitloading/intervals.h"
#include "ce/rx/inc/measure.h"
#include "ce/common/mod.h"
#include "mac/common/sta.h"
@@ -30,8 +31,6 @@
#include <cyg/kernel/kapi.h>
#include <string.h>
-u8 mac_interval_fsm_count_ = 6;
-u8 mac_interval_repetition_count_ = 4;
uint ce_rx_bl_pb_false_factor_ = CE_RX_BL_PB_FALSE_FACTOR;
uint ce_rx_bl_pb_total_factor_ = CE_RX_BL_PB_TOTAL_FACTOR;
uint ce_rx_bl_min_pb_per_frame_ = CE_RX_BL_MIN_PB_PER_FRAME;
@@ -60,7 +59,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
scenario_globals_t globals = {
.ce = &ce,
};
- int total_ints = mac_interval_fsm_count_ * mac_interval_repetition_count_;
+ int total_ints = ce_rx_bl_intervals_fsm_count_ * ce_rx_bl_intervals_repetition_count_;
ce_rx_measure_mbox_t measure;
u8 tested_tmi = TONEMAP_INDEX_NEGOTIATED_FIRST;
@@ -103,7 +102,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
int j;
for (j = 0; j < total_ints; j++)
{
- if (j % mac_interval_fsm_count_ == tested_fsm_id)
+ if (j % ce_rx_bl_intervals_fsm_count_ == tested_fsm_id)
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_append, .tms = &rx_tms,
.tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE);
@@ -113,7 +112,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_commit_changes, .tms = &rx_tms,
- .group_intervals_nb = mac_interval_fsm_count_);
+ .group_intervals_nb = ce_rx_bl_intervals_fsm_count_);
/* - check MMe is sent */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
@@ -150,7 +149,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
int j;
for (j = 0; j < total_ints; j++)
{
- if (j % mac_interval_fsm_count_ == tested_fsm_id)
+ if (j % ce_rx_bl_intervals_fsm_count_ == tested_fsm_id)
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_append, .tms = &rx_tms,
.tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE);
@@ -160,7 +159,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_commit_changes, .tms = &rx_tms,
- .group_intervals_nb = mac_interval_fsm_count_);
+ .group_intervals_nb = ce_rx_bl_intervals_fsm_count_);
/* - check MMe is sent */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
@@ -199,7 +198,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
int j;
for (j = 0; j < total_ints; j++)
{
- if (j % mac_interval_fsm_count_ == tested_fsm_id)
+ if (j % ce_rx_bl_intervals_fsm_count_ == tested_fsm_id)
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_append, .tms = &rx_tms,
.tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE);
@@ -209,7 +208,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_commit_changes, .tms = &rx_tms,
- .group_intervals_nb = mac_interval_fsm_count_);
+ .group_intervals_nb = ce_rx_bl_intervals_fsm_count_);
/* - check MMe is sent */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
@@ -370,7 +369,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
int j;
for (j = 0; j < total_ints; j++)
{
- if (j % mac_interval_fsm_count_ == tested_fsm_id)
+ if (j % ce_rx_bl_intervals_fsm_count_ == tested_fsm_id)
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_append, .tms = &rx_tms,
.tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE);
@@ -380,7 +379,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_commit_changes, .tms = &rx_tms,
- .group_intervals_nb = mac_interval_fsm_count_);
+ .group_intervals_nb = ce_rx_bl_intervals_fsm_count_);
/* - check MMe is sent */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
@@ -427,7 +426,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
int j;
for (j = 0; j < total_ints; j++)
{
- if (j % mac_interval_fsm_count_ == tested_fsm_id)
+ if (j % ce_rx_bl_intervals_fsm_count_ == tested_fsm_id)
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_append, .tms = &rx_tms,
.tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE);
@@ -437,7 +436,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_commit_changes, .tms = &rx_tms,
- .group_intervals_nb = mac_interval_fsm_count_);
+ .group_intervals_nb = ce_rx_bl_intervals_fsm_count_);
/* - check MMe is sent */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
@@ -485,7 +484,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
int j;
for (j = 0; j < total_ints; j++)
{
- if (j % mac_interval_fsm_count_ == tested_fsm_id)
+ if (j % ce_rx_bl_intervals_fsm_count_ == tested_fsm_id)
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_append, .tms = &rx_tms,
.tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE);
@@ -495,7 +494,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_commit_changes, .tms = &rx_tms,
- .group_intervals_nb = mac_interval_fsm_count_);
+ .group_intervals_nb = ce_rx_bl_intervals_fsm_count_);
/* - check MMe is sent */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
@@ -518,7 +517,7 @@ test_ce_rx_bl_fsm_INTERVAL_SOUND (test_t t)
config.tonemask_info.tonemap_robo[PHY_MOD_ROBO].bits_per_symbol = 42;
bsu_aclf_t aclf;
*((bsu_aclf_bp_t*) &aclf.beacon_period_theo_tck) = BSU_ACLF_BP_50HZ_TCK;
- int total_ints = mac_interval_fsm_count_ * mac_interval_repetition_count_;
+ int total_ints = ce_rx_bl_intervals_fsm_count_ * ce_rx_bl_intervals_repetition_count_;
ce_rx_t ce = { .mac_config = &config, .aclf = &aclf, .tck_per_rtc = 1};
scenario_globals_t globals = {
@@ -592,7 +591,7 @@ test_ce_rx_bl_fsm_INTERVAL_SOUND (test_t t)
int j;
for (j = 0; j < total_ints; j++)
{
- if (j % mac_interval_fsm_count_ == tested_fsm_id)
+ if (j % ce_rx_bl_intervals_fsm_count_ == tested_fsm_id)
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_append, .tms = &rx_tms, .tmi = DEFAULT_NEW_TMI);
else
@@ -601,7 +600,7 @@ test_ce_rx_bl_fsm_INTERVAL_SOUND (test_t t)
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_commit_changes, .tms = &rx_tms,
- .group_intervals_nb = mac_interval_fsm_count_);
+ .group_intervals_nb = ce_rx_bl_intervals_fsm_count_);
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
ce_rx_cp_send_mme_new_tone_map,
@@ -641,7 +640,7 @@ test_ce_rx_bl_fsm_INTERVAL_SOUND_WAIT (test_t t)
config.tonemask_info.tonemap_robo[PHY_MOD_ROBO].bits_per_symbol = 42;
bsu_aclf_t aclf;
*((bsu_aclf_bp_t*) &aclf.beacon_period_theo_tck) = BSU_ACLF_BP_50HZ_TCK;
- int total_ints = mac_interval_fsm_count_ * mac_interval_repetition_count_;
+ int total_ints = ce_rx_bl_intervals_fsm_count_ * ce_rx_bl_intervals_repetition_count_;
ce_rx_t ce = { .mac_config = &config, .aclf = &aclf, .tck_per_rtc = 1};
scenario_globals_t globals = {
@@ -714,7 +713,7 @@ test_ce_rx_bl_fsm_INTERVAL_SOUND_WAIT (test_t t)
int j;
for (j = 0; j < total_ints; j++)
{
- if (j % mac_interval_fsm_count_ == tested_fsm_id)
+ if (j % ce_rx_bl_intervals_fsm_count_ == tested_fsm_id)
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_append, .tms = &rx_tms, .tmi = DEFAULT_NEW_TMI);
else
@@ -723,7 +722,7 @@ test_ce_rx_bl_fsm_INTERVAL_SOUND_WAIT (test_t t)
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
mac_interval_commit_changes, .tms = &rx_tms,
- .group_intervals_nb = mac_interval_fsm_count_);
+ .group_intervals_nb = ce_rx_bl_intervals_fsm_count_);
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
ce_rx_cp_send_mme_new_tone_map,
diff --git a/cesar/ce/rx/bitloading/test/src/test_intervals.c b/cesar/ce/rx/bitloading/test/src/test_intervals.c
index 0f80a1e5b6..3468efd333 100644
--- a/cesar/ce/rx/bitloading/test/src/test_intervals.c
+++ b/cesar/ce/rx/bitloading/test/src/test_intervals.c
@@ -46,7 +46,7 @@ test_suite_ce_rx_bl_intervals_init (test_t t)
{
ce_rx_bitloading_intervals_t *its = ce_rx_bl_intervals_alloc (42);
int i;
- for (i = 0; i < mac_interval_fsm_count_; i++)
+ for (i = 0; i < ce_rx_bl_intervals_fsm_count_; i++)
{
ce_rx_bitloading_t *b = (ce_rx_bitloading_t *)
blk_table_get (its->blk_table, i);
@@ -68,13 +68,13 @@ test_suite_ce_rx_bl_intervals_init (test_t t)
void
test_suite_ce_rx_bl_intervals_get_tmi_used_list (test_t t)
{
- uint old_fsm_nb = mac_interval_fsm_count_;
- uint old_repetition_nb = mac_interval_repetition_count_;
+ uint old_fsm_nb = ce_rx_bl_intervals_fsm_count_;
+ uint old_repetition_nb = ce_rx_bl_intervals_repetition_count_;
/* This tests only works if the number of intervals is known, so I prefer
* to manage this locally. */
- mac_interval_fsm_count_ = 6;
- mac_interval_repetition_count_ = 4;
+ ce_rx_bl_intervals_fsm_count_ = 6;
+ ce_rx_bl_intervals_repetition_count_ = 4;
sta_t sta;
@@ -113,8 +113,8 @@ test_suite_ce_rx_bl_intervals_get_tmi_used_list (test_t t)
/* Clean. */
tonemaps_release (sta.rx_tonemaps);
ce_rx_bl_intervals_free (sta.intervals);
- mac_interval_fsm_count_ = old_fsm_nb;
- mac_interval_repetition_count_ = old_repetition_nb;
+ ce_rx_bl_intervals_fsm_count_ = old_fsm_nb;
+ ce_rx_bl_intervals_repetition_count_ = old_repetition_nb;
}
/**
@@ -299,7 +299,7 @@ test_suite_ce_rx_bl_intervals_measure_to_event_master_test (
{
for (i = 1; i <= 24; i++)
mac_interval_append (tms, bp_atu * i / 24, i);
- mac_interval_commit_changes (tms, mac_interval_fsm_count_);
+ mac_interval_commit_changes (tms, ce_rx_bl_intervals_fsm_count_);
}
sta.rx_tonemaps = tms;
sta.intervals = NULL;
@@ -504,16 +504,16 @@ test_suite_ce_rx_bl_intervals_update_tmi (test_t t)
sta_init (&sta, 42);
sta.intervals = ce_rx_bl_intervals_alloc (0);
- for (i = 0; i < mac_interval_fsm_count_; i++)
+ for (i = 0; i < ce_rx_bl_intervals_fsm_count_; i++)
sta.intervals->tmi[i] = i;
ce_rx_bl_intervals_update_tmi (&sta, BSU_ACLF_BP_50HZ_TCK);
tonemap_intervals_t *ints = sta.rx_tonemaps->intervals;
- test_fail_if (ints->intervals_nb != mac_interval_fsm_count_
- * mac_interval_repetition_count_);
+ test_fail_if (ints->intervals_nb != ce_rx_bl_intervals_fsm_count_
+ * ce_rx_bl_intervals_repetition_count_);
for (i = 0; i < ints->intervals_nb; i++)
test_fail_unless
- (i % mac_interval_fsm_count_ == ints->interval[i].tmi);
+ (i % ce_rx_bl_intervals_fsm_count_ == ints->interval[i].tmi);
ce_rx_bl_intervals_free (sta.intervals);
sta.intervals = NULL;
sta_uninit (&sta);
@@ -556,8 +556,8 @@ test_suite_ce_rx_bl_intervals_update_default_tm (test_t t)
{
test_case_begin (t, "Update global default tonemap.");
- uint old_fsm_nb = mac_interval_fsm_count_;
- uint old_repetition_nb = mac_interval_repetition_count_;
+ uint old_fsm_nb = ce_rx_bl_intervals_fsm_count_;
+ uint old_repetition_nb = ce_rx_bl_intervals_repetition_count_;
sta_t sta;
tonemap_t tm;
@@ -570,8 +570,8 @@ test_suite_ce_rx_bl_intervals_update_default_tm (test_t t)
/* This tests only works if the number of intervals is known, so I prefer
* to manage this locally. */
/* Start with one interval. */
- mac_interval_fsm_count_ = 1;
- mac_interval_repetition_count_ = 1;
+ ce_rx_bl_intervals_fsm_count_ = 1;
+ ce_rx_bl_intervals_repetition_count_ = 1;
sta.intervals = ce_rx_bl_intervals_alloc (4);
@@ -618,8 +618,8 @@ test_suite_ce_rx_bl_intervals_update_default_tm (test_t t)
ce_rx_bl_intervals_free (sta.intervals);
/* Now, test with several intervals. */
- mac_interval_fsm_count_ = 6;
- mac_interval_repetition_count_ = 4;
+ ce_rx_bl_intervals_fsm_count_ = 6;
+ ce_rx_bl_intervals_repetition_count_ = 4;
sta.intervals = ce_rx_bl_intervals_alloc (4);
@@ -634,7 +634,7 @@ test_suite_ce_rx_bl_intervals_update_default_tm (test_t t)
test_fail_if (sta.rx_tonemaps->default_tmi != 4);
test_fail_if (sta.rx_tonemaps->tm[4]->released != 0);
- for (i = 0; i < mac_interval_fsm_count_; i++)
+ for (i = 0; i < ce_rx_bl_intervals_fsm_count_; i++)
sta.intervals->tmi[i] = 5;
ce_rx_bl_intervals_update_default_tm (&sta);
test_fail_if (sta.rx_tonemaps->default_tmi != 5);
@@ -670,8 +670,8 @@ test_suite_ce_rx_bl_intervals_update_default_tm (test_t t)
sta.rx_tonemaps->tm[4] = NULL;
tonemaps_release (sta.rx_tonemaps);
ce_rx_bl_intervals_free (sta.intervals);
- mac_interval_fsm_count_ = old_fsm_nb;
- mac_interval_repetition_count_ = old_repetition_nb;
+ ce_rx_bl_intervals_fsm_count_ = old_fsm_nb;
+ ce_rx_bl_intervals_repetition_count_ = old_repetition_nb;
}
void