summaryrefslogtreecommitdiff
path: root/cesar/mac
diff options
context:
space:
mode:
authorNicolas Schodet2011-11-18 17:43:46 +0100
committerNicolas Schodet2011-11-22 17:07:56 +0100
commit89845c5b7c67a3f333eceafa490e82ae7e516266 (patch)
treee0ceeae09af8b73eaea94729adfd9397d9137cb2 /cesar/mac
parente32c6ef6b7b0f1e2bdcc1af0838adca3491d7be3 (diff)
cesar/mac/pbproc: disable again robo mode for bursts, closes #2844
This reverts commit 327205498f7bd0bae531eafc47ac70e19493030e.
Diffstat (limited to 'cesar/mac')
-rw-r--r--cesar/mac/pbproc/src/prep_mpdu.c1
-rw-r--r--cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c3
-rw-r--r--cesar/mac/pbproc/test/pbproc/src/tx_data.c26
3 files changed, 2 insertions, 28 deletions
diff --git a/cesar/mac/pbproc/src/prep_mpdu.c b/cesar/mac/pbproc/src/prep_mpdu.c
index c2e399d6ee..563de903c5 100644
--- a/cesar/mac/pbproc/src/prep_mpdu.c
+++ b/cesar/mac/pbproc/src/prep_mpdu.c
@@ -467,6 +467,7 @@ pbproc_prep_mpdu (pbproc_t *ctx, mfs_tx_t *mfs)
{
if (prep->wack
&& symb_nb >= 2
+ && tmi >= PHY_MOD_ROBO_NB
&& old_max_seg_nb > max_seg_nb + 1
&& data_tck + 25 * 2000 < access_duration_tck)
{
diff --git a/cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c b/cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c
index 77c2dab44a..95ac99efc2 100644
--- a/cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c
+++ b/cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c
@@ -592,8 +592,7 @@ prep_mpdu_basic_test_case (test_t t)
test_begin (t, "robo unicast data limit dur max")
{
prep_mpdu_test (t, &tp, 0, .mfs_seg_nb = 30, .duration_symb_nb = 95,
- .symb_nb = 38, .main_seg_nb_total = 2,
- .mpdu_count = 1);
+ .symb_nb = 38, .main_seg_nb_total = 2);
} test_end;
test_begin (t, "robo unicast data limit seg")
{
diff --git a/cesar/mac/pbproc/test/pbproc/src/tx_data.c b/cesar/mac/pbproc/test/pbproc/src/tx_data.c
index 9acbf03aa3..fbe9bd3a00 100644
--- a/cesar/mac/pbproc/test/pbproc/src/tx_data.c
+++ b/cesar/mac/pbproc/test/pbproc/src/tx_data.c
@@ -819,8 +819,6 @@ tx_data_bursts_test_case (test_t t)
{ 100000, 5, 0 },
{ 200000, 6, 0 },
{ 300000, TONEMAP_INDEX_INTERVAL_UNUSABLE, 0 },
- { 400000, PHY_MOD_HS_ROBO, 0 },
- { 500000, 5, 0 },
{ 0, 0, 0 }
};
test_begin (t, "max fl")
@@ -833,16 +831,6 @@ tx_data_bursts_test_case (test_t t)
50, 83, 16, 26,
6, 6, NULL, false, false);
} test_end;
- test_begin (t, "max fl robo")
- {
- tx_data_burst_test (t, &tp, 5162132, 2 + 2,
- MAC_PREAMBLE_TCK + MAC_FC_AV_TCK
- + MAC_PAYLOAD_TCK (95, MAC_DX417_TCK)
- + MAC_RIFS_DEFAULT_TCK + MAC_PREAMBLE_TCK
- + MAC_FC_AV_TCK,
- 38, 2, 38, 2,
- PHY_MOD_ROBO, PHY_MOD_ROBO, NULL, false, false);
- } test_end;
test_begin (t, "interval max fl, seg limit")
{
tx_data_burst_test (t, &tp,
@@ -857,20 +845,6 @@ tx_data_bursts_test_case (test_t t)
50, 83, 16, 26,
5, 6, intervals, false, false);
} test_end;
- test_begin (t, "interval max fl robo, seg limit")
- {
- tx_data_burst_test (t, &tp,
- 400000 - (MAC_PREAMBLE_TCK + MAC_FC_AV_TCK
- + MAC_PAYLOAD_TCK (50, MAC_DX417_TCK)
- + MAC_BIFS_TCK),
- 5 + 26,
- MAC_PREAMBLE_TCK + MAC_FC_AV_TCK
- + MAC_PAYLOAD_TCK (95, MAC_DX417_TCK)
- + MAC_RIFS_DEFAULT_TCK + MAC_PREAMBLE_TCK
- + MAC_FC_AV_TCK,
- 50, 5, 16, 26,
- PHY_MOD_HS_ROBO, 5, intervals, false, false);
- } test_end;
test_begin (t, "interval max fl, interrupt on sound")
{
tx_data_burst_test (t, &tp,