summaryrefslogtreecommitdiff
path: root/cesar/ce/rx/bitloading/test
diff options
context:
space:
mode:
authorNicolas Schodet2013-04-18 11:27:40 +0200
committerNicolas Schodet2013-04-25 10:29:01 +0200
commitd9e2326c66d565e9d2d34b27ab306c62e86e702b (patch)
treeda61b7baec2c732c945d134019967534fcd1dffb /cesar/ce/rx/bitloading/test
parent736fea895a05301595e77c20c1ff2a432b7250b1 (diff)
cesar/mac/common, cesar/ce/rx: get rid of mac_interval_measure_shift_tolerance_
Diffstat (limited to 'cesar/ce/rx/bitloading/test')
-rw-r--r--cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c1
-rw-r--r--cesar/ce/rx/bitloading/test/intervals/src/test_intervals_fsm.c1
-rw-r--r--cesar/ce/rx/bitloading/test/src/test_intervals.c12
3 files changed, 6 insertions, 8 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 da96df089b..8a0ed2b7bb 100644
--- a/cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c
+++ b/cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c
@@ -32,7 +32,6 @@
u8 mac_interval_fsm_count_ = 6;
u8 mac_interval_repetition_count_ = 4;
-u16 mac_interval_measure_shift_tolerance_ = 0;
/**
* The configuration of the BER module.
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 dd40bba3ae..65e006298e 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
@@ -32,7 +32,6 @@
u8 mac_interval_fsm_count_ = 6;
u8 mac_interval_repetition_count_ = 4;
-u16 mac_interval_measure_shift_tolerance_ = 0;
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;
diff --git a/cesar/ce/rx/bitloading/test/src/test_intervals.c b/cesar/ce/rx/bitloading/test/src/test_intervals.c
index 13d7196c12..5111517ead 100644
--- a/cesar/ce/rx/bitloading/test/src/test_intervals.c
+++ b/cesar/ce/rx/bitloading/test/src/test_intervals.c
@@ -223,9 +223,9 @@ test_suite_ce_rx_bl_intervals_measure_to_interval (test_t t)
int i = ce_rx_bl_intervals_measure_to_interval (
tms,
a == 0 ? 0 : a * bp / 24
- - mac_interval_measure_shift_tolerance_,
+ - MAC_TCK_TO_ATU (MAC_TM_TOLERANCE_TCK),
(a + 1) * bp / 24
- + mac_interval_measure_shift_tolerance_ - 1);
+ + MAC_TCK_TO_ATU (MAC_TM_TOLERANCE_TCK) - 1);
test_fail_if (i != a);
}
tonemaps_release (tms);
@@ -246,8 +246,8 @@ test_suite_ce_rx_bl_intervals_measure_to_interval (test_t t)
int i = ce_rx_bl_intervals_measure_to_interval (
tms,
- bp / 24 - mac_interval_measure_shift_tolerance_ - 1,
- 2 * bp / 24 + mac_interval_measure_shift_tolerance_ - 1);
+ bp / 24 - MAC_TCK_TO_ATU (MAC_TM_TOLERANCE_TCK) - 1,
+ 2 * bp / 24 + MAC_TCK_TO_ATU (MAC_TM_TOLERANCE_TCK) - 1);
test_fail_if (i != -1);
tonemaps_release (tms);
} test_end;
@@ -267,8 +267,8 @@ test_suite_ce_rx_bl_intervals_measure_to_interval (test_t t)
int i = ce_rx_bl_intervals_measure_to_interval (
tms,
- bp / 24 - mac_interval_measure_shift_tolerance_,
- 2 * bp / 24 + mac_interval_measure_shift_tolerance_);
+ bp / 24 - MAC_TCK_TO_ATU (MAC_TM_TOLERANCE_TCK),
+ 2 * bp / 24 + MAC_TCK_TO_ATU (MAC_TM_TOLERANCE_TCK));
test_fail_if (i != -1);
tonemaps_release (tms);
} test_end;