summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Schodet2013-04-09 17:05:43 +0200
committerNicolas Schodet2013-04-25 10:29:01 +0200
commit4af4c01afcd961253f900bd646991a46e2ec4e49 (patch)
treebe43a3905ff225f95399102e5d3a5899be61f6ac
parenta72d7b35124d9b755309aabd18e5a4d911e718ef (diff)
cesar/mac/pbproc/test/pbproc: prepare interval usage for RX, refs #3909
-rw-r--r--cesar/mac/pbproc/test/pbproc/inc/utils.h6
-rw-r--r--cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c2
-rw-r--r--cesar/mac/pbproc/test/pbproc/src/tx_data.c2
-rw-r--r--cesar/mac/pbproc/test/pbproc/src/utils.c12
4 files changed, 14 insertions, 8 deletions
diff --git a/cesar/mac/pbproc/test/pbproc/inc/utils.h b/cesar/mac/pbproc/test/pbproc/inc/utils.h
index acc429839d..2d68db0ad2 100644
--- a/cesar/mac/pbproc/test/pbproc/inc/utils.h
+++ b/cesar/mac/pbproc/test/pbproc/inc/utils.h
@@ -53,6 +53,7 @@ utils_sta_prepare_default_tonemap (test_pbproc_t *tp, bool tx, uint tei,
/**
* Prepare tonemaps intervals.
* \param tp test context
+ * \param tx work on TX tonemaps
* \param tei STA TEI
* \param intervals list of intervals to prepare
* \param default_tmi new default TMI
@@ -61,8 +62,9 @@ utils_sta_prepare_default_tonemap (test_pbproc_t *tp, bool tx, uint tei,
* utils_sta_prepare_default_tonemap should have been called before.
*/
uint
-utils_sta_prepare_intervals (test_pbproc_t *tp, uint tei,
- utils_interval_t *intervals, uint default_tmi);
+utils_sta_prepare_intervals (test_pbproc_t *tp, bool tx, uint tei,
+ const utils_interval_t *intervals,
+ uint default_tmi);
void
utils_prepare_encryption (test_pbproc_t *tp, bool encrypted, bool sta_auth,
diff --git a/cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c b/cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c
index 1ee5f37735..66bd56e790 100644
--- a/cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c
+++ b/cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c
@@ -167,7 +167,7 @@ prep_mpdu_test_f (test_t t, test_pbproc_t *tp, u32 date,
if (params->intervals)
{
intervals_version = utils_sta_prepare_intervals (
- tp, dtei, params->intervals, PHY_MOD_ROBO);
+ tp, true, dtei, params->intervals, PHY_MOD_ROBO);
interval = params->interval;
}
tonemap_sound_reason_code_t sound_reason_code =
diff --git a/cesar/mac/pbproc/test/pbproc/src/tx_data.c b/cesar/mac/pbproc/test/pbproc/src/tx_data.c
index cc246c6804..6f46ab5db4 100644
--- a/cesar/mac/pbproc/test/pbproc/src/tx_data.c
+++ b/cesar/mac/pbproc/test/pbproc/src/tx_data.c
@@ -389,7 +389,7 @@ tx_data_burst_test (test_t t, test_pbproc_t *tp, u32 date, uint mfs_seg_nb,
}
}
if (intervals)
- utils_sta_prepare_intervals (tp, dtei, intervals, PHY_MOD_ROBO);
+ utils_sta_prepare_intervals (tp, true, dtei, intervals, PHY_MOD_ROBO);
/* Ask for channel data to enable sound transmission. */
u32 chandata_conf[1] = { 0 };
pbproc_set_chandata_conf (
diff --git a/cesar/mac/pbproc/test/pbproc/src/utils.c b/cesar/mac/pbproc/test/pbproc/src/utils.c
index c047433b4b..505ada1fd3 100644
--- a/cesar/mac/pbproc/test/pbproc/src/utils.c
+++ b/cesar/mac/pbproc/test/pbproc/src/utils.c
@@ -168,16 +168,20 @@ utils_sta_prepare_default_tonemap (test_pbproc_t *tp, bool tx, uint tei,
}
uint
-utils_sta_prepare_intervals (test_pbproc_t *tp, uint tei,
- utils_interval_t *intervals,
+utils_sta_prepare_intervals (test_pbproc_t *tp, bool tx, uint tei,
+ const utils_interval_t *intervals,
uint default_tmi)
{
uint intervals_version;
- utils_interval_t *i;
+ const utils_interval_t *i;
dbg_assert (tp);
sta_t *sta = mac_store_sta_get (tp->store, tei);
dbg_assert (sta);
- tonemaps_t *tms = sta->tx_tonemaps;
+ tonemaps_t *tms;
+ if (tx)
+ tms = sta->tx_tonemaps;
+ else
+ tms = sta->rx_tonemaps;
dbg_assert (tms->default_tmi < TONEMAP_INDEX_NB);
for (i = intervals; i->end_offset_tck; i++)
{