From b8658bab5f611eedd6618e58e850706496463a37 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Fri, 19 Apr 2013 14:30:18 +0200 Subject: cesar/ce, cesar/mac/common: move CE globals to CE --- cesar/ce/rx/bitloading/fsm/src/fsm.c | 2 +- cesar/ce/rx/bitloading/intervals.h | 26 ++++++++++---- cesar/ce/rx/bitloading/src/intervals.c | 21 ++++++----- cesar/ce/rx/bitloading/src/transition.c | 2 +- .../ce/rx/bitloading/test/intervals/src/test_fsm.c | 16 ++++----- .../test/intervals/src/test_intervals_fsm.c | 41 +++++++++++---------- cesar/ce/rx/bitloading/test/src/test_intervals.c | 42 +++++++++++----------- cesar/ce/rx/src/rx.c | 5 +-- cesar/ce/rx/test/src/test_rx.c | 2 +- 9 files changed, 85 insertions(+), 72 deletions(-) (limited to 'cesar/ce') diff --git a/cesar/ce/rx/bitloading/fsm/src/fsm.c b/cesar/ce/rx/bitloading/fsm/src/fsm.c index 9f9e3dba56..8fab52c793 100644 --- a/cesar/ce/rx/bitloading/fsm/src/fsm.c +++ b/cesar/ce/rx/bitloading/fsm/src/fsm.c @@ -126,7 +126,7 @@ ce_rx_bl_fsm_measure_to_event (sta_t *sta, { /* We are on an interval. */ has_interval = CE_RX_FSM_MEASURE_TO_EVENT_TYPE_INTERVAL; - measure->fsm_id = interval % mac_interval_fsm_count_; + measure->fsm_id = interval % ce_rx_bl_intervals_fsm_count_; } } diff --git a/cesar/ce/rx/bitloading/intervals.h b/cesar/ce/rx/bitloading/intervals.h index 810c48e766..d568db3788 100644 --- a/cesar/ce/rx/bitloading/intervals.h +++ b/cesar/ce/rx/bitloading/intervals.h @@ -70,6 +70,12 @@ typedef struct ce_rx_bitloading_intervals_t blk_table_t *blk_table; } ce_rx_bitloading_intervals_t; +/** Number of allocated FSM. */ +extern u8 ce_rx_bl_intervals_fsm_count_; + +/** Number of FSM repetition in the beacon period. */ +extern u8 ce_rx_bl_intervals_repetition_count_; + BEGIN_DECLS /** @@ -84,20 +90,20 @@ ce_rx_bl_intervals_alloc (u8 default_tmi) dbg_assert (sizeof (ce_rx_bitloading_intervals_t) <= BLK_SIZE); /* Check we don't have too many intervals. */ - dbg_assert (mac_interval_repetition_count_ - * mac_interval_fsm_count_ <= TONEMAP_INTERVAL_NB); + dbg_assert (ce_rx_bl_intervals_repetition_count_ + * ce_rx_bl_intervals_fsm_count_ <= TONEMAP_INTERVAL_NB); /* Check we don't have too many fsm. */ - dbg_assert (mac_interval_fsm_count_ <= CE_RX_INTERVAL_MAX_FSM_COUNT); + dbg_assert (ce_rx_bl_intervals_fsm_count_ <= CE_RX_INTERVAL_MAX_FSM_COUNT); /* Allocate structure. */ ce_rx_bitloading_intervals_t* its = blk_alloc (); its->blk_table = blk_table_init (sizeof (ce_rx_bitloading_t), - mac_interval_fsm_count_); + ce_rx_bl_intervals_fsm_count_); int i; /* Initialize all bit-loading structures for each FSM. */ - for (i = 0; i < mac_interval_fsm_count_; i++) + for (i = 0; i < ce_rx_bl_intervals_fsm_count_; i++) { /* Set interval address. */ its->intervals[i] = (ce_rx_bitloading_t *) blk_table_get @@ -109,6 +115,8 @@ ce_rx_bl_intervals_alloc (u8 default_tmi) /* Set default TMI value. */ its->tmi[i] = default_tmi; } + for (; i < CE_RX_INTERVAL_MAX_FSM_COUNT; i++) + its->intervals[i] = NULL; return its; } @@ -122,10 +130,14 @@ ce_rx_bl_intervals_free (ce_rx_bitloading_intervals_t *its) dbg_assert_ptr (its); int i; /* Initialize all bit-loading structures for each FSM. */ - for (i = 0; i < mac_interval_fsm_count_; i++) + for (i = 0; i < CE_RX_INTERVAL_MAX_FSM_COUNT; i++) { /* Uninitialize bit-loading structures. */ - ce_rx_bitloading_uninit (its->intervals[i]); + if (its->intervals[i]) + { + ce_rx_bitloading_uninit (its->intervals[i]); + its->intervals[i] = NULL; + } } blk_table_free (its->blk_table); blk_release (its); diff --git a/cesar/ce/rx/bitloading/src/intervals.c b/cesar/ce/rx/bitloading/src/intervals.c index 9a951dff09..e536cfa02f 100644 --- a/cesar/ce/rx/bitloading/src/intervals.c +++ b/cesar/ce/rx/bitloading/src/intervals.c @@ -22,6 +22,9 @@ #include "ce/rx/cp/inc/cp.h" #include "ce_rx_bl_fsm_defs.h" +u8 ce_rx_bl_intervals_fsm_count_ = 6; +u8 ce_rx_bl_intervals_repetition_count_ = 4; + u32 ce_rx_bl_intervals_get_tmi_used_list (sta_t *sta, bool check_default) { @@ -36,7 +39,7 @@ ce_rx_bl_intervals_get_tmi_used_list (sta_t *sta, bool check_default) if (check_default && tms->default_tmi < TONEMAP_INDEX_NB) result |= (1 << tms->default_tmi); /* Check tonemaps used on different intervals. */ - for (i = 0; i < mac_interval_fsm_count_; i++) + for (i = 0; i < ce_rx_bl_intervals_fsm_count_; i++) { if (its->tmi[i] < TONEMAP_INDEX_NB) result |= (1 << its->tmi[i]); @@ -131,8 +134,8 @@ ce_rx_bl_intervals_update_tmi (sta_t *sta, const bsu_aclf_bp_t bp_tck) ce_rx_bitloading_intervals_t *its = sta->intervals; u16 bp_atu = MAC_TCK_TO_ATU (bp_tck); - int total_ints = mac_interval_fsm_count_ - * mac_interval_repetition_count_; + int total_ints = ce_rx_bl_intervals_fsm_count_ + * ce_rx_bl_intervals_repetition_count_; mac_interval_clear (sta->rx_tonemaps); for (i = 0; i < total_ints - 1; i++) @@ -140,7 +143,7 @@ ce_rx_bl_intervals_update_tmi (sta_t *sta, const bsu_aclf_bp_t bp_tck) res = mac_interval_append ( sta->rx_tonemaps, bp_atu * (i + 1) / total_ints, - its->tmi[i % mac_interval_fsm_count_]); + its->tmi[i % ce_rx_bl_intervals_fsm_count_]); dbg_assert (res == i + 1); } /* Last interval duration is increased to fit with max theoretical beacon @@ -148,9 +151,9 @@ ce_rx_bl_intervals_update_tmi (sta_t *sta, const bsu_aclf_bp_t bp_tck) res = mac_interval_append ( sta->rx_tonemaps, bp_atu + MAC_TCK_TO_ATU (HPAV_BEACON_BTO_MAX_TCK), - its->tmi[(total_ints - 1) % mac_interval_fsm_count_]); + its->tmi[(total_ints - 1) % ce_rx_bl_intervals_fsm_count_]); dbg_assert (res == total_ints); - mac_interval_commit_changes (sta->rx_tonemaps, mac_interval_fsm_count_); + mac_interval_commit_changes (sta->rx_tonemaps, ce_rx_bl_intervals_fsm_count_); } void @@ -170,7 +173,7 @@ ce_rx_bl_intervals_update_default_tm (sta_t *sta) /* If some intervals are currently restarting, we must determine what * impact it will have on future default tonemap. */ - for (i = 0; i < mac_interval_fsm_count_; i++) + for (i = 0; i < ce_rx_bl_intervals_fsm_count_; i++) { if (bl_ints->tmi[i] == TONEMAP_SRC_INTERVAL_UNAVAILABLE || bl_ints->tmi[i] == TONEMAP_SRC_INTERVAL_UNUSABLE) @@ -229,7 +232,7 @@ ce_rx_bl_intervals_reset (ce_rx_t *ce_rx, sta_t *sta, int fsm_id) dbg_assert (sta); dbg_assert (sta->intervals); dbg_assert (sta->rx_tonemaps); - dbg_assert (fsm_id >= 0 && fsm_id < mac_interval_fsm_count_); + dbg_assert (fsm_id >= 0 && fsm_id < ce_rx_bl_intervals_fsm_count_); ce_rx_bitloading_t *bl = sta->intervals->intervals[fsm_id]; u8 *tmi = &sta->intervals->tmi[fsm_id]; @@ -272,7 +275,7 @@ ce_rx_bl_intervals_start (ce_rx_t *ce_rx, sta_t *sta) dbg_assert ( ce_rx->mac_config->tonemask_info.tonemap_robo[PHY_MOD_ROBO].one_pb_data_tck <= (ce_rx->aclf->beacon_period_theo_tck + HPAV_BEACON_BTO_MAX_TCK) - / (mac_interval_repetition_count_ * mac_interval_fsm_count_) + / (ce_rx_bl_intervals_repetition_count_ * ce_rx_bl_intervals_fsm_count_) + HPAV_BEACON_BTO_MAX_TCK); /* Allocate intervals structure. */ diff --git a/cesar/ce/rx/bitloading/src/transition.c b/cesar/ce/rx/bitloading/src/transition.c index dff786f495..e433979fa9 100644 --- a/cesar/ce/rx/bitloading/src/transition.c +++ b/cesar/ce/rx/bitloading/src/transition.c @@ -637,7 +637,7 @@ ce_rx_bl_fsm__INTERVAL_TRACKING__interval_sound ( dbg_assert (data.measure); u8 fsm_id = data.measure->fsm_id; - dbg_assert (fsm_id <= mac_interval_fsm_count_); + dbg_assert (fsm_id <= ce_rx_bl_intervals_fsm_count_); /* We didn't requested sound on this interval so we reset the interval in * order to be synchronized with remote station. */ 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 f1904019da..ad78abe640 100644 --- a/cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c +++ b/cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c @@ -16,6 +16,7 @@ #include "ce/rx/bitloading/fsm/event.h" #include "ce/rx/bitloading/inc/ber.h" #include "ce/rx/bitloading/inc/pber.h" +#include "ce/rx/bitloading/intervals.h" #include "ce/rx/inc/measure.h" #include "ce/common/mod.h" #include "mac/common/sta.h" @@ -30,9 +31,6 @@ #include #include -u8 mac_interval_fsm_count_ = 6; -u8 mac_interval_repetition_count_ = 4; - /** * The configuration of the BER module. */ @@ -100,8 +98,8 @@ test_ce_rx_bl_fsm_IDLE (test_t t) fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_clear, .tms = &rx_tms); int j; - int total_ints = mac_interval_fsm_count_ * - mac_interval_repetition_count_; + int total_ints = ce_rx_bl_intervals_fsm_count_ * + ce_rx_bl_intervals_repetition_count_; for (j = 0; j < total_ints; j++) { @@ -110,7 +108,7 @@ test_ce_rx_bl_fsm_IDLE (test_t t) } fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_commit_changes, .tms = &rx_tms, - .group_intervals_nb = mac_interval_fsm_count_); + .group_intervals_nb = ce_rx_bl_intervals_fsm_count_); /* - check MMe is sent */ fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( @@ -187,8 +185,8 @@ test_ce_rx_bl_fsm_INITIAL (test_t t) fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_clear, .tms = &rx_tms); int j; - int total_ints = mac_interval_fsm_count_ * - mac_interval_repetition_count_; + int total_ints = ce_rx_bl_intervals_fsm_count_ * + ce_rx_bl_intervals_repetition_count_; for (j = 0; j < total_ints; j++) { @@ -197,7 +195,7 @@ test_ce_rx_bl_fsm_INITIAL (test_t t) } fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_commit_changes, .tms = &rx_tms, - .group_intervals_nb = mac_interval_fsm_count_); + .group_intervals_nb = ce_rx_bl_intervals_fsm_count_); /* - check MMe is sent */ fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( 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 d732a32fce..6a7f697ba7 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 @@ -16,6 +16,7 @@ #include "ce/rx/bitloading/fsm/event.h" #include "ce/rx/bitloading/inc/ber.h" #include "ce/rx/bitloading/inc/pber.h" +#include "ce/rx/bitloading/intervals.h" #include "ce/rx/inc/measure.h" #include "ce/common/mod.h" #include "mac/common/sta.h" @@ -30,8 +31,6 @@ #include #include -u8 mac_interval_fsm_count_ = 6; -u8 mac_interval_repetition_count_ = 4; 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; @@ -60,7 +59,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t) scenario_globals_t globals = { .ce = &ce, }; - int total_ints = mac_interval_fsm_count_ * mac_interval_repetition_count_; + int total_ints = ce_rx_bl_intervals_fsm_count_ * ce_rx_bl_intervals_repetition_count_; ce_rx_measure_mbox_t measure; u8 tested_tmi = TONEMAP_INDEX_NEGOTIATED_FIRST; @@ -103,7 +102,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t) int j; for (j = 0; j < total_ints; j++) { - if (j % mac_interval_fsm_count_ == tested_fsm_id) + if (j % ce_rx_bl_intervals_fsm_count_ == tested_fsm_id) fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_append, .tms = &rx_tms, .tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE); @@ -113,7 +112,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t) } fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_commit_changes, .tms = &rx_tms, - .group_intervals_nb = mac_interval_fsm_count_); + .group_intervals_nb = ce_rx_bl_intervals_fsm_count_); /* - check MMe is sent */ fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( @@ -150,7 +149,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t) int j; for (j = 0; j < total_ints; j++) { - if (j % mac_interval_fsm_count_ == tested_fsm_id) + if (j % ce_rx_bl_intervals_fsm_count_ == tested_fsm_id) fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_append, .tms = &rx_tms, .tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE); @@ -160,7 +159,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t) } fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_commit_changes, .tms = &rx_tms, - .group_intervals_nb = mac_interval_fsm_count_); + .group_intervals_nb = ce_rx_bl_intervals_fsm_count_); /* - check MMe is sent */ fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( @@ -199,7 +198,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t) int j; for (j = 0; j < total_ints; j++) { - if (j % mac_interval_fsm_count_ == tested_fsm_id) + if (j % ce_rx_bl_intervals_fsm_count_ == tested_fsm_id) fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_append, .tms = &rx_tms, .tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE); @@ -209,7 +208,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t) } fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_commit_changes, .tms = &rx_tms, - .group_intervals_nb = mac_interval_fsm_count_); + .group_intervals_nb = ce_rx_bl_intervals_fsm_count_); /* - check MMe is sent */ fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( @@ -370,7 +369,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t) int j; for (j = 0; j < total_ints; j++) { - if (j % mac_interval_fsm_count_ == tested_fsm_id) + if (j % ce_rx_bl_intervals_fsm_count_ == tested_fsm_id) fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_append, .tms = &rx_tms, .tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE); @@ -380,7 +379,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t) } fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_commit_changes, .tms = &rx_tms, - .group_intervals_nb = mac_interval_fsm_count_); + .group_intervals_nb = ce_rx_bl_intervals_fsm_count_); /* - check MMe is sent */ fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( @@ -427,7 +426,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t) int j; for (j = 0; j < total_ints; j++) { - if (j % mac_interval_fsm_count_ == tested_fsm_id) + if (j % ce_rx_bl_intervals_fsm_count_ == tested_fsm_id) fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_append, .tms = &rx_tms, .tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE); @@ -437,7 +436,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t) } fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_commit_changes, .tms = &rx_tms, - .group_intervals_nb = mac_interval_fsm_count_); + .group_intervals_nb = ce_rx_bl_intervals_fsm_count_); /* - check MMe is sent */ fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( @@ -485,7 +484,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t) int j; for (j = 0; j < total_ints; j++) { - if (j % mac_interval_fsm_count_ == tested_fsm_id) + if (j % ce_rx_bl_intervals_fsm_count_ == tested_fsm_id) fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_append, .tms = &rx_tms, .tmi = TONEMAP_INDEX_INTERVAL_UNAVAILABLE); @@ -495,7 +494,7 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t) } fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_commit_changes, .tms = &rx_tms, - .group_intervals_nb = mac_interval_fsm_count_); + .group_intervals_nb = ce_rx_bl_intervals_fsm_count_); /* - check MMe is sent */ fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( @@ -518,7 +517,7 @@ test_ce_rx_bl_fsm_INTERVAL_SOUND (test_t t) config.tonemask_info.tonemap_robo[PHY_MOD_ROBO].bits_per_symbol = 42; bsu_aclf_t aclf; *((bsu_aclf_bp_t*) &aclf.beacon_period_theo_tck) = BSU_ACLF_BP_50HZ_TCK; - int total_ints = mac_interval_fsm_count_ * mac_interval_repetition_count_; + int total_ints = ce_rx_bl_intervals_fsm_count_ * ce_rx_bl_intervals_repetition_count_; ce_rx_t ce = { .mac_config = &config, .aclf = &aclf, .tck_per_rtc = 1}; scenario_globals_t globals = { @@ -592,7 +591,7 @@ test_ce_rx_bl_fsm_INTERVAL_SOUND (test_t t) int j; for (j = 0; j < total_ints; j++) { - if (j % mac_interval_fsm_count_ == tested_fsm_id) + if (j % ce_rx_bl_intervals_fsm_count_ == tested_fsm_id) fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_append, .tms = &rx_tms, .tmi = DEFAULT_NEW_TMI); else @@ -601,7 +600,7 @@ test_ce_rx_bl_fsm_INTERVAL_SOUND (test_t t) } fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_commit_changes, .tms = &rx_tms, - .group_intervals_nb = mac_interval_fsm_count_); + .group_intervals_nb = ce_rx_bl_intervals_fsm_count_); fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( ce_rx_cp_send_mme_new_tone_map, @@ -641,7 +640,7 @@ test_ce_rx_bl_fsm_INTERVAL_SOUND_WAIT (test_t t) config.tonemask_info.tonemap_robo[PHY_MOD_ROBO].bits_per_symbol = 42; bsu_aclf_t aclf; *((bsu_aclf_bp_t*) &aclf.beacon_period_theo_tck) = BSU_ACLF_BP_50HZ_TCK; - int total_ints = mac_interval_fsm_count_ * mac_interval_repetition_count_; + int total_ints = ce_rx_bl_intervals_fsm_count_ * ce_rx_bl_intervals_repetition_count_; ce_rx_t ce = { .mac_config = &config, .aclf = &aclf, .tck_per_rtc = 1}; scenario_globals_t globals = { @@ -714,7 +713,7 @@ test_ce_rx_bl_fsm_INTERVAL_SOUND_WAIT (test_t t) int j; for (j = 0; j < total_ints; j++) { - if (j % mac_interval_fsm_count_ == tested_fsm_id) + if (j % ce_rx_bl_intervals_fsm_count_ == tested_fsm_id) fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_append, .tms = &rx_tms, .tmi = DEFAULT_NEW_TMI); else @@ -723,7 +722,7 @@ test_ce_rx_bl_fsm_INTERVAL_SOUND_WAIT (test_t t) } fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( mac_interval_commit_changes, .tms = &rx_tms, - .group_intervals_nb = mac_interval_fsm_count_); + .group_intervals_nb = ce_rx_bl_intervals_fsm_count_); fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT ( ce_rx_cp_send_mme_new_tone_map, diff --git a/cesar/ce/rx/bitloading/test/src/test_intervals.c b/cesar/ce/rx/bitloading/test/src/test_intervals.c index 0f80a1e5b6..3468efd333 100644 --- a/cesar/ce/rx/bitloading/test/src/test_intervals.c +++ b/cesar/ce/rx/bitloading/test/src/test_intervals.c @@ -46,7 +46,7 @@ test_suite_ce_rx_bl_intervals_init (test_t t) { ce_rx_bitloading_intervals_t *its = ce_rx_bl_intervals_alloc (42); int i; - for (i = 0; i < mac_interval_fsm_count_; i++) + for (i = 0; i < ce_rx_bl_intervals_fsm_count_; i++) { ce_rx_bitloading_t *b = (ce_rx_bitloading_t *) blk_table_get (its->blk_table, i); @@ -68,13 +68,13 @@ test_suite_ce_rx_bl_intervals_init (test_t t) void test_suite_ce_rx_bl_intervals_get_tmi_used_list (test_t t) { - uint old_fsm_nb = mac_interval_fsm_count_; - uint old_repetition_nb = mac_interval_repetition_count_; + uint old_fsm_nb = ce_rx_bl_intervals_fsm_count_; + uint old_repetition_nb = ce_rx_bl_intervals_repetition_count_; /* This tests only works if the number of intervals is known, so I prefer * to manage this locally. */ - mac_interval_fsm_count_ = 6; - mac_interval_repetition_count_ = 4; + ce_rx_bl_intervals_fsm_count_ = 6; + ce_rx_bl_intervals_repetition_count_ = 4; sta_t sta; @@ -113,8 +113,8 @@ test_suite_ce_rx_bl_intervals_get_tmi_used_list (test_t t) /* Clean. */ tonemaps_release (sta.rx_tonemaps); ce_rx_bl_intervals_free (sta.intervals); - mac_interval_fsm_count_ = old_fsm_nb; - mac_interval_repetition_count_ = old_repetition_nb; + ce_rx_bl_intervals_fsm_count_ = old_fsm_nb; + ce_rx_bl_intervals_repetition_count_ = old_repetition_nb; } /** @@ -299,7 +299,7 @@ test_suite_ce_rx_bl_intervals_measure_to_event_master_test ( { for (i = 1; i <= 24; i++) mac_interval_append (tms, bp_atu * i / 24, i); - mac_interval_commit_changes (tms, mac_interval_fsm_count_); + mac_interval_commit_changes (tms, ce_rx_bl_intervals_fsm_count_); } sta.rx_tonemaps = tms; sta.intervals = NULL; @@ -504,16 +504,16 @@ test_suite_ce_rx_bl_intervals_update_tmi (test_t t) sta_init (&sta, 42); sta.intervals = ce_rx_bl_intervals_alloc (0); - for (i = 0; i < mac_interval_fsm_count_; i++) + for (i = 0; i < ce_rx_bl_intervals_fsm_count_; i++) sta.intervals->tmi[i] = i; ce_rx_bl_intervals_update_tmi (&sta, BSU_ACLF_BP_50HZ_TCK); tonemap_intervals_t *ints = sta.rx_tonemaps->intervals; - test_fail_if (ints->intervals_nb != mac_interval_fsm_count_ - * mac_interval_repetition_count_); + test_fail_if (ints->intervals_nb != ce_rx_bl_intervals_fsm_count_ + * ce_rx_bl_intervals_repetition_count_); for (i = 0; i < ints->intervals_nb; i++) test_fail_unless - (i % mac_interval_fsm_count_ == ints->interval[i].tmi); + (i % ce_rx_bl_intervals_fsm_count_ == ints->interval[i].tmi); ce_rx_bl_intervals_free (sta.intervals); sta.intervals = NULL; sta_uninit (&sta); @@ -556,8 +556,8 @@ test_suite_ce_rx_bl_intervals_update_default_tm (test_t t) { test_case_begin (t, "Update global default tonemap."); - uint old_fsm_nb = mac_interval_fsm_count_; - uint old_repetition_nb = mac_interval_repetition_count_; + uint old_fsm_nb = ce_rx_bl_intervals_fsm_count_; + uint old_repetition_nb = ce_rx_bl_intervals_repetition_count_; sta_t sta; tonemap_t tm; @@ -570,8 +570,8 @@ test_suite_ce_rx_bl_intervals_update_default_tm (test_t t) /* This tests only works if the number of intervals is known, so I prefer * to manage this locally. */ /* Start with one interval. */ - mac_interval_fsm_count_ = 1; - mac_interval_repetition_count_ = 1; + ce_rx_bl_intervals_fsm_count_ = 1; + ce_rx_bl_intervals_repetition_count_ = 1; sta.intervals = ce_rx_bl_intervals_alloc (4); @@ -618,8 +618,8 @@ test_suite_ce_rx_bl_intervals_update_default_tm (test_t t) ce_rx_bl_intervals_free (sta.intervals); /* Now, test with several intervals. */ - mac_interval_fsm_count_ = 6; - mac_interval_repetition_count_ = 4; + ce_rx_bl_intervals_fsm_count_ = 6; + ce_rx_bl_intervals_repetition_count_ = 4; sta.intervals = ce_rx_bl_intervals_alloc (4); @@ -634,7 +634,7 @@ test_suite_ce_rx_bl_intervals_update_default_tm (test_t t) test_fail_if (sta.rx_tonemaps->default_tmi != 4); test_fail_if (sta.rx_tonemaps->tm[4]->released != 0); - for (i = 0; i < mac_interval_fsm_count_; i++) + for (i = 0; i < ce_rx_bl_intervals_fsm_count_; i++) sta.intervals->tmi[i] = 5; ce_rx_bl_intervals_update_default_tm (&sta); test_fail_if (sta.rx_tonemaps->default_tmi != 5); @@ -670,8 +670,8 @@ test_suite_ce_rx_bl_intervals_update_default_tm (test_t t) sta.rx_tonemaps->tm[4] = NULL; tonemaps_release (sta.rx_tonemaps); ce_rx_bl_intervals_free (sta.intervals); - mac_interval_fsm_count_ = old_fsm_nb; - mac_interval_repetition_count_ = old_repetition_nb; + ce_rx_bl_intervals_fsm_count_ = old_fsm_nb; + ce_rx_bl_intervals_repetition_count_ = old_repetition_nb; } void diff --git a/cesar/ce/rx/src/rx.c b/cesar/ce/rx/src/rx.c index 805298376c..d0a013f9eb 100644 --- a/cesar/ce/rx/src/rx.c +++ b/cesar/ce/rx/src/rx.c @@ -23,6 +23,7 @@ #include "mac/common/interval.h" #include "lib/stats.h" #include "ce/rx/bitloading/pber.h" +#include "ce/rx/bitloading/intervals.h" #include "ce/rx/bitloading/inc/pber.h" #include "ce/rx/bitloading/inc/nsr.h" #include "ce/rx/bitloading/inc/ber.h" @@ -96,11 +97,11 @@ ce_rx_init (mac_store_t *mac_store, sar_t *sar, pbproc_t *pbproc, LIB_STATS_ACCESS_READ_WRITE, LIB_STATS_DEBUG); lib_stats_set_stat_value_notype ("CE_RX_INTERVALS_FSM_NB", - &mac_interval_fsm_count_, + &ce_rx_bl_intervals_fsm_count_, LIB_STATS_ACCESS_READ_WRITE, LIB_STATS_DEBUG); lib_stats_set_stat_value_notype ("CE_RX_INTERVALS_REPETITION_NB", - &mac_interval_repetition_count_, + &ce_rx_bl_intervals_repetition_count_, LIB_STATS_ACCESS_READ_WRITE, LIB_STATS_DEBUG); /* Bitloading config. */ diff --git a/cesar/ce/rx/test/src/test_rx.c b/cesar/ce/rx/test/src/test_rx.c index 7e117661de..4a0187556d 100644 --- a/cesar/ce/rx/test/src/test_rx.c +++ b/cesar/ce/rx/test/src/test_rx.c @@ -137,7 +137,7 @@ ce_rx_bl_fsm_measure_to_event (sta_t *sta, { /* We are on an interval. */ has_interval = CE_RX_FSM_MEASURE_TO_EVENT_TYPE_INTERVAL; - measure->fsm_id = interval % mac_interval_fsm_count_; + measure->fsm_id = interval % ce_rx_bl_intervals_fsm_count_; } /* Is this measure a Sound ? */ -- cgit v1.2.3