summaryrefslogtreecommitdiff
path: root/cesar/ce/rx/bitloading
diff options
context:
space:
mode:
authorJérémy Dufour2012-09-10 16:06:34 +0200
committerJérémy Dufour2012-09-12 16:20:49 +0200
commit071f5953161741199a649c3cec959be11e242248 (patch)
tree3a635c01b7be22e6edac5e9157d49744c106c339 /cesar/ce/rx/bitloading
parent5dce311ff9faada993bdb09a4cdd71bc09e582a4 (diff)
cesar/ce/rx/bl: disable BER margin update, closes #2376
For the moment being BMU is disabled by setting the biggest tunnel possible. See #3351 for more information.
Diffstat (limited to 'cesar/ce/rx/bitloading')
-rw-r--r--cesar/ce/rx/bitloading/inc/ber_margin_update.h4
-rw-r--r--cesar/ce/rx/bitloading/test/src/test_ber_margin_update.c3
-rw-r--r--cesar/ce/rx/bitloading/test/src/test_fsm.c3
3 files changed, 8 insertions, 2 deletions
diff --git a/cesar/ce/rx/bitloading/inc/ber_margin_update.h b/cesar/ce/rx/bitloading/inc/ber_margin_update.h
index 8d4de1f887..4394ddc542 100644
--- a/cesar/ce/rx/bitloading/inc/ber_margin_update.h
+++ b/cesar/ce/rx/bitloading/inc/ber_margin_update.h
@@ -112,8 +112,8 @@ ce_rx_bl_bmu_conf_init (tonemask_info_t *tonemask_info)
ce_rx_bl_bmu_conf.ber_margin_limit[i][CE_RX_BL_BMU_BER_MAX] = ber - 1;
}
/* Set Pber limits. */
- ce_rx_bl_bmu_conf.pber_limit[CE_RX_BL_BMU_MIN] = 1;
- ce_rx_bl_bmu_conf.pber_limit[CE_RX_BL_BMU_MAX] = 3300;
+ ce_rx_bl_bmu_conf.pber_limit[CE_RX_BL_BMU_MIN] = 0;
+ ce_rx_bl_bmu_conf.pber_limit[CE_RX_BL_BMU_MAX] = (uint) -1;
/* Plus polynomial. */
ce_rx_bl_bmu_conf.poly[CE_RX_BL_BMU_POLY_PLUS][0] = 1374389535ll;
ce_rx_bl_bmu_conf.poly[CE_RX_BL_BMU_POLY_PLUS][1] = -(4*4503874506616ll)/5;
diff --git a/cesar/ce/rx/bitloading/test/src/test_ber_margin_update.c b/cesar/ce/rx/bitloading/test/src/test_ber_margin_update.c
index 2e97b61017..4526c54fa3 100644
--- a/cesar/ce/rx/bitloading/test/src/test_ber_margin_update.c
+++ b/cesar/ce/rx/bitloading/test/src/test_ber_margin_update.c
@@ -96,6 +96,9 @@ test_ce_rx_bl_bmu (test_t t)
bool bl_max = false;
s64 ber_margin_old = 0;
s64 ber_target = 0;
+ /* Force BMU configuration with TNS config (see #3351). */
+ ce_rx_bl_bmu_conf.pber_limit[CE_RX_BL_BMU_MIN] = 1;
+ ce_rx_bl_bmu_conf.pber_limit[CE_RX_BL_BMU_MAX] = 3300;
bmu.pb_counter = ce_rx_bl_bmu_conf.pb_count_min + 1;
for (fecrate = 0; fecrate < 2; fecrate++)
{
diff --git a/cesar/ce/rx/bitloading/test/src/test_fsm.c b/cesar/ce/rx/bitloading/test/src/test_fsm.c
index 4fc48628f3..6d69104d5b 100644
--- a/cesar/ce/rx/bitloading/test/src/test_fsm.c
+++ b/cesar/ce/rx/bitloading/test/src/test_fsm.c
@@ -252,6 +252,9 @@ test_ce_rx_bl_fsm_base (test_t t)
/* Initialize BMU configuration.*/
ce_rx_bl_bmu_conf_init (&config.tonemask_info);
+ /* Force BMU configuration with TNS config (see #3351). */
+ ce_rx_bl_bmu_conf.pber_limit[CE_RX_BL_BMU_MIN] = 1;
+ ce_rx_bl_bmu_conf.pber_limit[CE_RX_BL_BMU_MAX] = 3300;
sta_t sta;
tonemaps_t rx_tms, tx_tms;