From fd43428ce1580b21eae6f33a70fffb73db375b5b Mon Sep 17 00:00:00 2001 From: Jalil Chemseddine Date: Wed, 23 May 2012 17:50:32 +0200 Subject: cesar/ce/rx/bl: no restart of CE TX when CE RX restarts, closes #2754 --- cesar/ce/rx/bitloading/src/transition.c | 6 ------ cesar/ce/rx/bitloading/test/src/test_fsm.c | 11 ----------- 2 files changed, 17 deletions(-) (limited to 'cesar') diff --git a/cesar/ce/rx/bitloading/src/transition.c b/cesar/ce/rx/bitloading/src/transition.c index 0f08301454..6813b554f9 100644 --- a/cesar/ce/rx/bitloading/src/transition.c +++ b/cesar/ce/rx/bitloading/src/transition.c @@ -117,12 +117,6 @@ ce_rx_bl__common__restart_ce (ce_rx_t *ce_rx, sta_t *sta) /* Send MME to restart CE. */ ce_rx_cp_send_mme_restart_initial_ce (ce_rx, sta); - - /* In TX, reset default tone map and remove tone maps. */ - /* FIXME: this is a dirty hack: we force the TX to re-estimate the - * channel, in order to transmit the MME to the other side. - * In reality, we need to use the SACKI. */ - tonemaps_reset (sta->tx_tonemaps, &ce_rx->tonemap_release_list); } /** diff --git a/cesar/ce/rx/bitloading/test/src/test_fsm.c b/cesar/ce/rx/bitloading/test/src/test_fsm.c index 1565b0cd6d..55f199b6fb 100644 --- a/cesar/ce/rx/bitloading/test/src/test_fsm.c +++ b/cesar/ce/rx/bitloading/test/src/test_fsm.c @@ -573,9 +573,6 @@ test_ce_rx_bl_fsm_base (test_t t) /* Reset CE in RX. */ SCENARIO_EVENT (tonemaps_reset, .tms = sta.rx_tonemaps), - /* Dirty hack, reset CE in TX. */ - SCENARIO_EVENT (tonemaps_reset, - .tms = sta.tx_tonemaps), SCENARIO_END, }; for (i = 0; i < COUNT (sub_sc_ce_restart); i++) @@ -683,10 +680,6 @@ test_ce_rx_bl_fsm_base (test_t t) scenario_test[pos++] = (scenario_entry_t) SCENARIO_EVENT (tonemaps_reset, .tms = sta.rx_tonemaps); - /* Dirty hack, reset CE in TX. */ - scenario_test[pos++] = (scenario_entry_t) - SCENARIO_EVENT (tonemaps_reset, - .tms = sta.tx_tonemaps); scenario_test[pos++] = (scenario_entry_t) SCENARIO_END; stats_pb += measure.total_pb_count; @@ -790,10 +783,6 @@ test_ce_rx_bl_fsm_base (test_t t) scenario_test[pos++] = (scenario_entry_t) SCENARIO_EVENT (tonemaps_reset, .tms = sta.rx_tonemaps); - /* Dirty hack, reset CE in TX. */ - scenario_test[pos++] = (scenario_entry_t) - SCENARIO_EVENT (tonemaps_reset, - .tms = sta.tx_tonemaps); scenario_test[pos++] = (scenario_entry_t) SCENARIO_END; -- cgit v1.2.3