summaryrefslogtreecommitdiff
path: root/cesar/ce/rx/bitloading/test/src/test_fsm.c
diff options
context:
space:
mode:
authordufour2009-09-16 14:21:47 +0000
committerdufour2009-09-16 14:21:47 +0000
commit46b98924047be664d0ed89660d9c7787eb0999a9 (patch)
tree853e4dde34edc3bb3d92f1a14a2f56dda73e4f03 /cesar/ce/rx/bitloading/test/src/test_fsm.c
parent64602a1b9a3d6da47cc92a4104e53db3f098e3e8 (diff)
* mac/common, ce, cp:
- clean tone map functions : - cosmetic changes (renames function, move and reorder files), - add some assert and clean a few things in code (not important !), - update some comments. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@5582 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/ce/rx/bitloading/test/src/test_fsm.c')
-rw-r--r--cesar/ce/rx/bitloading/test/src/test_fsm.c48
1 files changed, 24 insertions, 24 deletions
diff --git a/cesar/ce/rx/bitloading/test/src/test_fsm.c b/cesar/ce/rx/bitloading/test/src/test_fsm.c
index a3d1d125c8..7274a79df2 100644
--- a/cesar/ce/rx/bitloading/test/src/test_fsm.c
+++ b/cesar/ce/rx/bitloading/test/src/test_fsm.c
@@ -211,9 +211,9 @@ test_suite_ce_rx_bl_nsr_sum (test_t t)
ce_rx_bl_initial_non_optimized (ber_pt, &ti, &bl, tm, opti, &tone_en);
uint tone, i = 0, j = 0;
uint tone_diff = 0;
-#define MAC_COMMON_TONEMAP_READ_OPEN {
-#define MAC_COMMON_TONEMAP_READ_CLOSE }
- MAC_COMMON_TONEMAP_READ_BEGIN (tm, ti.tonemask, tone)
+#define TONEMAP_READ_OPEN {
+#define TONEMAP_READ_CLOSE }
+ TONEMAP_READ_BEGIN (tm, ti.tonemask, tone)
{
if (CE_BIT_PER_MOD[tone]
!= bl_initial_on_mean_from_sound_nsr_no_iteration[i][0])
@@ -222,15 +222,15 @@ test_suite_ce_rx_bl_nsr_sum (test_t t)
j++;
i++;
}
- MAC_COMMON_TONEMAP_READ_CLOSE
+ TONEMAP_READ_CLOSE
else
- MAC_COMMON_TONEMAP_READ_OPEN
+ TONEMAP_READ_OPEN
{
i++;
}
- MAC_COMMON_TONEMAP_READ_END;
-#undef MAC_COMMON_TONEMAP_READ_OPEN
-#undef MAC_COMMON_TONEMAP_READ_CLOSE
+ TONEMAP_READ_END;
+#undef TONEMAP_READ_OPEN
+#undef TONEMAP_READ_CLOSE
test_fail_if (tone_diff != 0, "%d computed tone(s) differs from test "
"vector", tone_diff);
} test_end;
@@ -254,24 +254,24 @@ test_suite_ce_rx_bl_nsr_sum (test_t t)
ce_rx_bl_initial_optimized (ber_pt, &ti, &bl, tm, opti);
uint tone, i = 0;
uint tone_diff = 0;
-#define MAC_COMMON_TONEMAP_READ_OPEN {
-#define MAC_COMMON_TONEMAP_READ_CLOSE }
- MAC_COMMON_TONEMAP_READ_BEGIN (tm, ti.tonemask, tone)
+#define TONEMAP_READ_OPEN {
+#define TONEMAP_READ_CLOSE }
+ TONEMAP_READ_BEGIN (tm, ti.tonemask, tone)
{
if (CE_BIT_PER_MOD[tone] !=
bl_initial_on_mean_from_sound_nsr[i][0])
tone_diff++;
i++;
}
- MAC_COMMON_TONEMAP_READ_CLOSE
+ TONEMAP_READ_CLOSE
else
- MAC_COMMON_TONEMAP_READ_OPEN
+ TONEMAP_READ_OPEN
{
i++;
}
- MAC_COMMON_TONEMAP_READ_END;
-#undef MAC_COMMON_TONEMAP_READ_OPEN
-#undef MAC_COMMON_TONEMAP_READ_CLOSE
+ TONEMAP_READ_END;
+#undef TONEMAP_READ_OPEN
+#undef TONEMAP_READ_CLOSE
test_fail_if (tone_diff != 0, "%d computed tone(s) differs from test "
"vector", tone_diff);
} test_end;
@@ -449,23 +449,23 @@ test_suite_ce_rx_bl_initial (test_t t)
tonemap_t *tm = ce_rx_bl_initial_opitmized_iterative (&ti, &bl);
test_fail_if (tm->fecrate != PHY_FEC_RATE_16_21);
uint tone, i = 0;
-#define MAC_COMMON_TONEMAP_READ_OPEN {
-#define MAC_COMMON_TONEMAP_READ_CLOSE }
- MAC_COMMON_TONEMAP_READ_BEGIN (tm, ti.tonemask, tone)
+#define TONEMAP_READ_OPEN {
+#define TONEMAP_READ_CLOSE }
+ TONEMAP_READ_BEGIN (tm, ti.tonemask, tone)
{
if (CE_BIT_PER_MOD[tone] != bl_initial_final[i][0])
tone_diff++;
i++;
}
- MAC_COMMON_TONEMAP_READ_CLOSE
+ TONEMAP_READ_CLOSE
else
- MAC_COMMON_TONEMAP_READ_OPEN
+ TONEMAP_READ_OPEN
{
i++;
}
- MAC_COMMON_TONEMAP_READ_END;
-#undef MAC_COMMON_TONEMAP_READ_OPEN
-#undef MAC_COMMON_TONEMAP_READ_CLOSE
+ TONEMAP_READ_END;
+#undef TONEMAP_READ_OPEN
+#undef TONEMAP_READ_CLOSE
tonemap_free (tm);
test_fail_if (tone_diff != 0);
} test_end;