summaryrefslogtreecommitdiff
path: root/cesar/mac/pbproc
diff options
context:
space:
mode:
authorschodet2009-09-22 11:50:20 +0000
committerNicolas Schodet2009-10-08 22:51:48 +0200
commit95dfd817f184ba2d591ddae8daad92d9e6f27d54 (patch)
tree42acf974496007214cefa36e0cc58e68bf78e3eb /cesar/mac/pbproc
parentb4534682f2e4b011e928085caf392c3905507978 (diff)
* mac/pbproc/test/pbproc_eoc:
- port av changes.
Diffstat (limited to 'cesar/mac/pbproc')
-rw-r--r--cesar/mac/pbproc/test/pbproc_eoc/inc/scenario_defs.h1
-rw-r--r--cesar/mac/pbproc/test/pbproc_eoc/src/phy.c4
-rw-r--r--cesar/mac/pbproc/test/pbproc_eoc/src/rx_data.c6
-rw-r--r--cesar/mac/pbproc/test/pbproc_eoc/src/tx_data.c16
4 files changed, 18 insertions, 9 deletions
diff --git a/cesar/mac/pbproc/test/pbproc_eoc/inc/scenario_defs.h b/cesar/mac/pbproc/test/pbproc_eoc/inc/scenario_defs.h
index abb7227100..1875aaa878 100644
--- a/cesar/mac/pbproc/test/pbproc_eoc/inc/scenario_defs.h
+++ b/cesar/mac/pbproc/test/pbproc_eoc/inc/scenario_defs.h
@@ -195,6 +195,7 @@ typedef struct
uint nb_total;
uint nb_ready;
uint nb_pb_it;
+ bool chandata;
bool now;
} scenario_event_phy_pbdma_start_t;
diff --git a/cesar/mac/pbproc/test/pbproc_eoc/src/phy.c b/cesar/mac/pbproc/test/pbproc_eoc/src/phy.c
index d8e6a09175..9a26a712f1 100644
--- a/cesar/mac/pbproc/test/pbproc_eoc/src/phy.c
+++ b/cesar/mac/pbproc/test/pbproc_eoc/src/phy.c
@@ -222,13 +222,15 @@ phy_access_backoff_prp_won (phy_t *ctx)
void
phy_pbdma_start (phy_t *ctx, bool bypass_aes, const u32 nek[4], uint nb_total,
- uint nb_ready, uint nb_pb_it, phy_pb_t *first_pb, bool now)
+ uint nb_ready, uint nb_pb_it, phy_pb_t *first_pb,
+ phy_chandata_t *first_chandata, bool now)
{
scenario_event (phy_pbdma_start, params);
test_fail_unless (bypass_aes == params->bypass_aes);
test_fail_unless (nb_total == params->nb_total);
test_fail_unless (nb_ready == params->nb_ready);
test_fail_unless (nb_pb_it == params->nb_pb_it);
+ test_fail_unless ((first_chandata ? true : false) == params->chandata);
test_fail_unless (now == params->now);
ctx->pbdma_nb_total = nb_total;
ctx->pbdma_first_pb = first_pb;
diff --git a/cesar/mac/pbproc/test/pbproc_eoc/src/rx_data.c b/cesar/mac/pbproc/test/pbproc_eoc/src/rx_data.c
index b75f3ae3c1..3582775996 100644
--- a/cesar/mac/pbproc/test/pbproc_eoc/src/rx_data.c
+++ b/cesar/mac/pbproc/test/pbproc_eoc/src/rx_data.c
@@ -200,7 +200,9 @@ rx_data_burst_test_mpdu_sr (test_t t, test_pbproc_t *tp,
SCENARIO_EVENT (phy_pbdma_start, .bypass_aes = !m->encrypted || drop,
.nb_total = m->pb_nb, .nb_ready = m->pb_nb,
.nb_pb_it = m->pb_nb == nb_pb_it && burst->chandata_nb
- && !drop ? 0 : nb_pb_it, .now = true),
+ && !drop ? 0 : nb_pb_it,
+ .chandata = burst->chandata_nb && !drop ? true
+ : false, .now = true),
SCENARIO_ACTION_COND (m->pb_nb != nb_pb_it, phy_pbdma, .pb_it = true,
.crc_bitmap = m->crc_error,
.crc_bitmap_bits = nb_pb_it),
@@ -668,7 +670,7 @@ rx_beacon_test (test_t t, test_pbproc_t *tp, u32 date, uint symb_nb)
.tonemap_index = 0, .symbol_nb = symb_nb),
SCENARIO_EVENT (phy_pbdma_start, .bypass_aes = true,
.nb_total = 1, .nb_ready = 1, .nb_pb_it = 1,
- .now = true),
+ .chandata = false, .now = true),
SCENARIO_ACTION (phy_pbdma, .pb_it = true, .end_rx_pb = true),
SCENARIO_EVENT (ca_access_vcs_restart,
.start_date = date + pre_fc_fl_tck,
diff --git a/cesar/mac/pbproc/test/pbproc_eoc/src/tx_data.c b/cesar/mac/pbproc/test/pbproc_eoc/src/tx_data.c
index 742afad34b..c0be2c1952 100644
--- a/cesar/mac/pbproc/test/pbproc_eoc/src/tx_data.c
+++ b/cesar/mac/pbproc/test/pbproc_eoc/src/tx_data.c
@@ -71,7 +71,7 @@ tx_data_test (test_t t, test_pbproc_t *tp, u32 date, uint mfs_seg_nb,
SCENARIO_EVENT (phy_pbdma_start, .bypass_aes = true,
.nb_total = data_seg_nb_total,
.nb_ready = initial_pb_nb, .nb_pb_it = 0,
- .now = false),
+ .chandata = false, .now = false),
SCENARIO_EVENT (phy_tx_param, .fc_mode = PHY_FC_MODE_AV_1,
.short_ppdu = false, .mod = PHY_MOD_ROBO,
.fecrate = PHY_FEC_RATE_1_2,
@@ -146,7 +146,7 @@ tx_data_woack_test (test_t t, test_pbproc_t *tp, u32 date, uint mfs_seg_nb,
SCENARIO_EVENT (phy_pbdma_start, .bypass_aes = true,
.nb_total = data_seg_nb_total,
.nb_ready = initial_pb_nb, .nb_pb_it = 0,
- .now = false),
+ .chandata = false, .now = false),
SCENARIO_EVENT (phy_tx_param, .fc_mode = PHY_FC_MODE_AV_1,
.short_ppdu = false, .mod = PHY_MOD_ROBO,
.fecrate = PHY_FEC_RATE_1_2,
@@ -267,7 +267,8 @@ tx_data_beacon_test (test_t t, test_pbproc_t *tp, u32 date, uint duration_tck,
SCENARIO_EVENT (ca_access_hold),
SCENARIO_EVENT (phy_tx_fc10, .fc10 = 0x2f00),
SCENARIO_EVENT (phy_pbdma_start, .bypass_aes = true, .nb_total = 1,
- .nb_ready = 1, .nb_pb_it = 0, .now = false),
+ .nb_ready = 1, .nb_pb_it = 0, .chandata = false,
+ .now = false),
SCENARIO_EVENT (phy_tx_param, .fc_mode = PHY_FC_MODE_HYBRID_1,
.short_ppdu = false, .mod = PHY_MOD_MINI_ROBO,
.fecrate = PHY_FEC_RATE_1_2,
@@ -404,7 +405,8 @@ tx_data_cancel_test (test_t t, test_pbproc_t *tp, bool prp_won, bool rx_fc)
.prp_won = true, .slot_count = 6),
SCENARIO_EVENT (ca_access_hold),
SCENARIO_EVENT (phy_pbdma_start, .bypass_aes = true, .nb_total = 1,
- .nb_ready = 1, .nb_pb_it = 0, .now = false),
+ .nb_ready = 1, .nb_pb_it = 0, .chandata = false,
+ .now = false),
SCENARIO_EVENT (phy_tx_param, .fc_mode = PHY_FC_MODE_AV_1,
.short_ppdu = false, .mod = PHY_MOD_ROBO,
.fecrate = PHY_FEC_RATE_1_2,
@@ -438,7 +440,8 @@ tx_data_cancel_test (test_t t, test_pbproc_t *tp, bool prp_won, bool rx_fc)
.prp_won = true, .slot_count = 6),
SCENARIO_EVENT (ca_access_hold),
SCENARIO_EVENT (phy_pbdma_start, .bypass_aes = true, .nb_total = 1,
- .nb_ready = 1, .nb_pb_it = 0, .now = false),
+ .nb_ready = 1, .nb_pb_it = 0, .chandata = false,
+ .now = false),
SCENARIO_EVENT (phy_tx_param, .fc_mode = PHY_FC_MODE_AV_1,
.short_ppdu = false, .mod = PHY_MOD_ROBO,
.fecrate = PHY_FEC_RATE_1_2,
@@ -455,7 +458,8 @@ tx_data_cancel_test (test_t t, test_pbproc_t *tp, bool prp_won, bool rx_fc)
SCENARIO_EVENT (ca_mfs_update, .mfs = mfs),
SCENARIO_EVENT (ca_access_hold),
SCENARIO_EVENT (phy_pbdma_start, .bypass_aes = true, .nb_total = 1,
- .nb_ready = 1, .nb_pb_it = 0, .now = false),
+ .nb_ready = 1, .nb_pb_it = 0, .chandata = false,
+ .now = false),
SCENARIO_EVENT (phy_tx_param, .fc_mode = PHY_FC_MODE_AV_1,
.short_ppdu = false, .mod = PHY_MOD_ROBO,
.fecrate = PHY_FEC_RATE_1_2,