summaryrefslogtreecommitdiff
path: root/cesar/ce/rx/bitloading/src/bitloading.c
diff options
context:
space:
mode:
authordufour2010-06-11 10:00:35 +0000
committerdufour2010-06-11 10:00:35 +0000
commitd08d8b41d936f682759b1fd7e0987e8997f643eb (patch)
treed0aab5312ad2cfa5a5a7b10370bcb21da1070ab5 /cesar/ce/rx/bitloading/src/bitloading.c
parent7c9b654b5773ba2c25cbcc7b12a8d8c79e2fc34e (diff)
cesar/ce/rx/bl: support different polynomials based on tonemask, refs #1649
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@7194 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/ce/rx/bitloading/src/bitloading.c')
-rw-r--r--cesar/ce/rx/bitloading/src/bitloading.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/cesar/ce/rx/bitloading/src/bitloading.c b/cesar/ce/rx/bitloading/src/bitloading.c
index da97deabbd..194eb84193 100644
--- a/cesar/ce/rx/bitloading/src/bitloading.c
+++ b/cesar/ce/rx/bitloading/src/bitloading.c
@@ -241,7 +241,8 @@ ce_rx_bl_compute_tone_map_iterative (const u64 bpt_initial[PHY_FEC_RATE_NB],
/* Allocate a tone map for this FEC rate. */
tm[fec_rate] = tonemap_alloc ();
/* Get initial BER consign from initial bits per tone. */
- ber_cur = ce_rx_bl_ber_pt_bpt (fec_rate, bpt_initial[fec_rate]);
+ ber_cur = ce_rx_bl_ber_pt_bpt (fec_rate, tonemask->carrier_nb,
+ bpt_initial[fec_rate]);
/* Apply BER target margin. */
if (ber_cur > ce_rx_bl_ber_margin_[fec_rate])
ber_cur = ber_cur - ce_rx_bl_ber_margin_[fec_rate];
@@ -270,8 +271,9 @@ ce_rx_bl_compute_tone_map_iterative (const u64 bpt_initial[PHY_FEC_RATE_NB],
/ tm[fec_rate]->bits_per_symbol;
/* Get new BER consign. */
ber_cur = ce_rx_bl_ber_pt_bpt
- (fec_rate, (tm[fec_rate]->bits_per_symbol *
- CE_RX_BL_BPT_QUANT_FACTOR) / tone_en);
+ (fec_rate, tonemask->carrier_nb,
+ (tm[fec_rate]->bits_per_symbol *
+ CE_RX_BL_BPT_QUANT_FACTOR) / tone_en);
/* Apply BER target margin. */
if (ber_cur > ce_rx_bl_ber_margin_[fec_rate])
ber_cur = ber_cur - ce_rx_bl_ber_margin_[fec_rate];