summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilenko Jelisavcic2010-01-12 09:52:24 +0100
committerMilenko Jelisavcic2010-01-12 09:52:24 +0100
commit09cb09861e02443d496c209bf0c03e0f3e9c2ac6 (patch)
tree77141d97726973bee093836f51280f617e2fcfe1
parent608c5bc9478db40c9e06f01314621f1a83a080e8 (diff)
mac/pbproc/test/pbproc_eoc [eoc] fix unitary test, no refs
-rw-r--r--cesar/mac/pbproc/test/pbproc_eoc/inc/scenario_defs.h18
-rw-r--r--cesar/mac/pbproc/test/pbproc_eoc/src/phy.c99
-rw-r--r--cesar/mac/pbproc/test/pbproc_eoc/src/prep_mpdu.c16
-rw-r--r--cesar/mac/pbproc/test/pbproc_eoc/src/rx_data.c46
-rw-r--r--cesar/mac/pbproc/test/pbproc_eoc/src/rx_sound.c8
-rw-r--r--cesar/mac/pbproc/test/pbproc_eoc/src/test_pbproc.c10
-rw-r--r--cesar/mac/pbproc/test/pbproc_eoc/src/tx_data.c45
-rw-r--r--cesar/mac/pbproc/test/pbproc_eoc/src/tx_sound.c7
-rw-r--r--cesar/mac/pbproc/test/pbproc_eoc/src/utils.c9
9 files changed, 117 insertions, 141 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 9a707a4f82..88834bd8cd 100644
--- a/cesar/mac/pbproc/test/pbproc_eoc/inc/scenario_defs.h
+++ b/cesar/mac/pbproc/test/pbproc_eoc/inc/scenario_defs.h
@@ -88,6 +88,7 @@ scenario_action_pbproc_activate_cb (scenario_globals_t *globals,
phy_set_tonemap, \
phy_tx_fc10, \
phy_tx_param, \
+ phy_tx_param_short, \
phy_tx_param_sound, \
phy_tx_frame, \
phy_tx_prepare, \
@@ -95,6 +96,7 @@ scenario_action_pbproc_activate_cb (scenario_globals_t *globals,
phy_rx_param, \
phy_rx_activate, \
phy_rx_prepare, \
+ phy_rx_prepare_short, \
phy_rx_prepare_sound, \
phy_pbdma_start, \
phy_pbdma_update, \
@@ -114,10 +116,7 @@ scenario_action_pbproc_activate_cb (scenario_globals_t *globals,
pbproc_rx_cb, \
pbproc_rx_beacon_cb
-typedef struct
-{
- uint tonemap_index;
-} scenario_event_phy_set_tonemap_t;
+typedef scenario_empty_t scenario_event_phy_set_tonemap_t;
typedef struct
{
@@ -128,17 +127,20 @@ typedef struct
typedef struct
{
phy_fc_mode_t fc_mode;
- bool short_ppdu;
phy_mod_t mod;
phy_fecrate_t fecrate;
phy_pb_size_t pb_size;
phy_gil_t gil;
- uint tonemap_index;
} scenario_event_phy_tx_param_t;
typedef struct
{
phy_fc_mode_t fc_mode;
+} scenario_event_phy_tx_param_short_t;
+
+typedef struct
+{
+ phy_fc_mode_t fc_mode;
uint nb_pb;
phy_mod_t mod;
phy_fecrate_t fecrate;
@@ -171,15 +173,15 @@ typedef struct
typedef struct
{
- bool short_ppdu;
phy_mod_t mod;
phy_fecrate_t fecrate;
phy_pb_size_t pb_size;
phy_gil_t gil;
- uint tonemap_index;
uint symbol_nb;
} scenario_event_phy_rx_prepare_t;
+typedef scenario_empty_t scenario_event_phy_rx_prepare_short_t;
+
typedef struct
{
uint nb_pb;
diff --git a/cesar/mac/pbproc/test/pbproc_eoc/src/phy.c b/cesar/mac/pbproc/test/pbproc_eoc/src/phy.c
index cc3487279f..ca2e719d29 100644
--- a/cesar/mac/pbproc/test/pbproc_eoc/src/phy.c
+++ b/cesar/mac/pbproc/test/pbproc_eoc/src/phy.c
@@ -63,10 +63,9 @@ phy_set_tonemask (phy_t *ctx, u32 *tonemask, uint carrier_nb)
}
void
-phy_set_tonemap (phy_t *ctx, uint tonemap_index, blk_t *tonemap)
+phy_set_tonemap (phy_t *ctx, blk_t *tonemap)
{
- scenario_event (phy_set_tonemap, params);
- test_fail_unless (tonemap_index == params->tonemap_index);
+ scenario_event (phy_set_tonemap);
/* Test tonemap? */
}
@@ -79,36 +78,38 @@ phy_tx_fc10 (phy_t *ctx, u32 date, u32 fc_10)
}
void
-phy_tx_param (phy_t *ctx, phy_fc_mode_t fc_mode, bool short_ppdu,
- phy_mod_t mod, phy_fecrate_t fecrate, phy_pb_size_t pb_size,
- phy_gil_t gil, uint tonemap_index)
+phy_tx_param (phy_t *ctx, phy_fc_mode_t fc_mode, u32 mod_fecrate_pb_size,
+ phy_gil_t gil)
{
+ phy_mod_t mod = BF_GET (PHY_COMBO_PARAMS__MOD, mod_fecrate_pb_size);
+ phy_fecrate_t fecrate = BF_GET (PHY_COMBO_PARAMS__FECRATE,
+ mod_fecrate_pb_size);
+ phy_pb_size_t pb_size = BF_GET (PHY_COMBO_PARAMS__PB_SIZE,
+ mod_fecrate_pb_size);
scenario_event (phy_tx_param, params);
test_fail_unless (fc_mode == params->fc_mode);
- test_fail_unless (short_ppdu == params->short_ppdu);
- if (short_ppdu)
- {
- test_fail_unless (mod == PHY_MOD_NONE);
- test_fail_unless (fecrate == PHY_FEC_RATE_NONE);
- test_fail_unless (pb_size == PHY_PB_SIZE_NONE);
- test_fail_unless (gil == PHY_GIL_NB);
- test_fail_unless (tonemap_index == 0);
- }
- else
- {
- test_fail_unless (mod == params->mod);
- test_fail_unless (fecrate == params->fecrate);
- test_fail_unless (pb_size == params->pb_size);
- test_fail_unless (gil == params->gil);
- test_fail_unless (tonemap_index == params->tonemap_index);
- }
+ test_fail_unless (mod == params->mod);
+ test_fail_unless (fecrate == params->fecrate);
+ test_fail_unless (pb_size == params->pb_size);
+ test_fail_unless (gil == params->gil);
+}
+
+void
+phy_tx_param_short (phy_t *ctx, phy_fc_mode_t fc_mode)
+{
+ scenario_event (phy_tx_param_short, params);
+ test_fail_unless (fc_mode == params->fc_mode);
}
void
phy_tx_param_sound (phy_t *ctx, phy_fc_mode_t fc_mode, uint nb_pb,
- phy_mod_t mod, phy_fecrate_t fecrate,
- phy_pb_size_t pb_size, phy_gil_t gil)
+ u32 mod_fecrate_pb_size, phy_gil_t gil)
{
+ phy_mod_t mod = BF_GET (PHY_COMBO_PARAMS__MOD, mod_fecrate_pb_size);
+ phy_fecrate_t fecrate = BF_GET (PHY_COMBO_PARAMS__FECRATE,
+ mod_fecrate_pb_size);
+ phy_pb_size_t pb_size = BF_GET (PHY_COMBO_PARAMS__PB_SIZE,
+ mod_fecrate_pb_size);
scenario_event (phy_tx_param_sound, params);
test_fail_unless (fc_mode == params->fc_mode);
test_fail_unless (nb_pb == params->nb_pb);
@@ -161,37 +162,37 @@ phy_rx_activate (phy_t *ctx, bool now, u32 date, bool pre_detection)
}
void
-phy_rx_prepare (phy_t *ctx, bool short_ppdu, phy_mod_t mod,
- phy_fecrate_t fecrate, phy_pb_size_t pb_size, phy_gil_t gil,
- uint tonemap_index, uint symbol_nb)
+phy_rx_prepare (phy_t *ctx, u32 mod_fecrate_pb_size, phy_gil_t gil,
+ uint symbol_nb)
{
+ phy_mod_t mod = BF_GET (PHY_COMBO_PARAMS__MOD, mod_fecrate_pb_size);
+ phy_fecrate_t fecrate = BF_GET (PHY_COMBO_PARAMS__FECRATE,
+ mod_fecrate_pb_size);
+ phy_pb_size_t pb_size = BF_GET (PHY_COMBO_PARAMS__PB_SIZE,
+ mod_fecrate_pb_size);
scenario_event (phy_rx_prepare, params);
- test_fail_unless (short_ppdu == params->short_ppdu);
- if (short_ppdu)
- {
- test_fail_unless (mod == PHY_MOD_NONE);
- test_fail_unless (fecrate == PHY_FEC_RATE_NONE);
- test_fail_unless (pb_size == PHY_PB_SIZE_NONE);
- test_fail_unless (gil == PHY_GIL_NB);
- test_fail_unless (tonemap_index == 0);
- test_fail_unless (symbol_nb == 0);
- }
- else
- {
- test_fail_unless (mod == params->mod);
- test_fail_unless (fecrate == params->fecrate);
- test_fail_unless (pb_size == params->pb_size);
- test_fail_unless (gil == params->gil);
- test_fail_unless (tonemap_index == params->tonemap_index);
- test_fail_unless (symbol_nb == params->symbol_nb);
- }
+ test_fail_unless (mod == params->mod);
+ test_fail_unless (fecrate == params->fecrate);
+ test_fail_unless (pb_size == params->pb_size);
+ test_fail_unless (gil == params->gil);
+ test_fail_unless (symbol_nb == params->symbol_nb);
+}
+
+void
+phy_rx_prepare_short (phy_t *ctx)
+{
+ scenario_event (phy_rx_prepare_short);
}
void
-phy_rx_prepare_sound (phy_t *ctx, uint nb_pb, phy_mod_t mod,
- phy_fecrate_t fecrate, phy_pb_size_t pb_size,
+phy_rx_prepare_sound (phy_t *ctx, uint nb_pb, u32 mod_fecrate_pb_size,
phy_gil_t gil, uint symbol_nb)
{
+ phy_mod_t mod = BF_GET (PHY_COMBO_PARAMS__MOD, mod_fecrate_pb_size);
+ phy_fecrate_t fecrate = BF_GET (PHY_COMBO_PARAMS__FECRATE,
+ mod_fecrate_pb_size);
+ phy_pb_size_t pb_size = BF_GET (PHY_COMBO_PARAMS__PB_SIZE,
+ mod_fecrate_pb_size);
scenario_event (phy_rx_prepare_sound, params);
test_fail_unless (mod == params->mod);
test_fail_unless (fecrate == params->fecrate);
diff --git a/cesar/mac/pbproc/test/pbproc_eoc/src/prep_mpdu.c b/cesar/mac/pbproc/test/pbproc_eoc/src/prep_mpdu.c
index 6b1587285a..0e9105575c 100644
--- a/cesar/mac/pbproc/test/pbproc_eoc/src/prep_mpdu.c
+++ b/cesar/mac/pbproc/test/pbproc_eoc/src/prep_mpdu.c
@@ -164,8 +164,8 @@ prep_mpdu_test_f (test_t t, test_pbproc_t *tp, u32 date,
test_fail_unless (prep->fc_mode == PHY_FC_MODE_AV_1);
test_fail_unless (prep->mod == (tmi < PHY_MOD_ROBO_NB ? tmi
: PHY_MOD_TM));
- test_fail_unless (prep->fecrate == tm->fecrate);
- test_fail_unless (prep->pb_size == PHY_PB_SIZE_520);
+ test_fail_unless (prep->phy_combo_params == PHY_COMBO_PARAMS (
+ prep->mod, tm->fecrate, PHY_PB_SIZE_520));
test_fail_unless (prep->gil == tm->gil);
test_fail_unless (prep->tonemap == tm->tmdma_desc_head);
test_fail_unless (prep->sound_reason_code == sound_reason_code);
@@ -228,8 +228,8 @@ prep_mpdu_test_f (test_t t, test_pbproc_t *tp, u32 date,
test_fail_unless (prep->fc_mode == PHY_FC_MODE_AV_1);
test_fail_unless (prep->mod == (tmi < PHY_MOD_ROBO_NB ? tmi
: PHY_MOD_TM));
- test_fail_unless (prep->fecrate == tm->fecrate);
- test_fail_unless (prep->pb_size == PHY_PB_SIZE_520);
+ test_fail_unless (prep->phy_combo_params == PHY_COMBO_PARAMS (
+ prep->mod, tm->fecrate, PHY_PB_SIZE_520));
test_fail_unless (prep->gil == tm->gil);
test_fail_unless (prep->tonemap == tm->tmdma_desc_head);
test_fail_unless (prep->sound_reason_code == sound_reason_code);
@@ -341,7 +341,7 @@ prep_mpdu_test_f (test_t t, test_pbproc_t *tp, u32 date,
/* Check result. */
test_fail_unless (mfs->seg_nb == (int) mfs_seg_nb_after);
seg = mfs->head;
- for (i = 0; i < (uint)params->mfs_seg_nb; i++)
+ for (i = 0; i < (uint) params->mfs_seg_nb; i++)
{
if (i >= main_seg_nb
|| (!params->remove && crc_error & (u64) (1ull << i)))
@@ -595,7 +595,7 @@ prep_beacon_test (test_t t, test_pbproc_t *tp, u32 date, bool prepared,
access->beacon_period_start_date = beacon_period_start_date;
access->duration_tck = MAC_PREAMBLE_HYBRID_TCK + MAC_FC_10_TCK
+ MAC_FC_AV_TCK + MAC_PAYLOAD_TCK (duration_symb_nb, MAC_DX567_TCK)
- + MAC_B2BIFS_TCK;
+ + MAC_B2BIFS_TCK + PBPROC_BEACON_OFFSET_TIME;
access->prp = false;
access->cfp = true;
access->hybrid = true;
@@ -619,8 +619,8 @@ prep_beacon_test (test_t t, test_pbproc_t *tp, u32 date, bool prepared,
test_fail_unless (prep->fc_mode == PHY_FC_MODE_HYBRID_1);
test_fail_unless (prep->sound_reason_code == TONEMAP_SRC_NULL);
test_fail_unless (prep->mod == PHY_MOD_MINI_ROBO);
- test_fail_unless (prep->fecrate == PHY_FEC_RATE_1_2);
- test_fail_unless (prep->pb_size == PHY_PB_SIZE_136);
+ test_fail_unless (prep->phy_combo_params == PHY_COMBO_PARAMS (
+ prep->mod, PHY_FEC_RATE_1_2, PHY_PB_SIZE_136));
test_fail_unless (prep->gil == PHY_GIL_567);
test_fail_unless (prep->tonemap == NULL);
test_fail_unless (prep->flp_tck == MAC_PREAMBLE_HYBRID_TCK
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 647d63ec1f..c077bf52e8 100644
--- a/cesar/mac/pbproc/test/pbproc_eoc/src/rx_data.c
+++ b/cesar/mac/pbproc/test/pbproc_eoc/src/rx_data.c
@@ -196,13 +196,11 @@ rx_data_burst_test_mpdu_sr (test_t t, test_pbproc_t *tp,
ca_backoff_cancel),
SCENARIO_EVENT (phy_tx_cancel),
SCENARIO_EVENT (ca_access_hold),
- SCENARIO_EVENT_COND (m->tmi >= PHY_MOD_ROBO_NB, phy_set_tonemap,
- .tonemap_index = 0),
- SCENARIO_EVENT (phy_rx_prepare, .short_ppdu = false,
+ SCENARIO_EVENT_COND (m->tmi >= PHY_MOD_ROBO_NB, phy_set_tonemap),
+ SCENARIO_EVENT (phy_rx_prepare,
.mod = m->tmi < PHY_MOD_ROBO_NB ? m->tmi : PHY_MOD_TM,
.fecrate = tm->fecrate, .pb_size = PHY_PB_SIZE_520,
- .gil = tm->gil, .tonemap_index = 0,
- .symbol_nb = m->symb_nb),
+ .gil = tm->gil, .symbol_nb = m->symb_nb),
SCENARIO_EVENT_COND (burst->chandata_nb && !drop,
phy_pbdma_start_chandata),
SCENARIO_EVENT (phy_pbdma_start, .bypass_aes = !m->encrypted || drop,
@@ -248,8 +246,7 @@ rx_data_burst_test_mpdu_sr (test_t t, test_pbproc_t *tp,
PHY_MOD_TM,
.fecrate = tm->fecrate,
.pb_size = PHY_PB_SIZE_520,
- .gil = tm->gil, .tonemap_index = 0,
- .short_ppdu = false),
+ .gil = tm->gil),
SCENARIO_EVENT_COND (burst->wack,
phy_tx_frame,
.date = date + pre_fc_fl_tck,
@@ -342,8 +339,7 @@ rx_data_burst_test_mpdu_sr (test_t t, test_pbproc_t *tp,
/* test return sacki values */
test_fail_unless (rsof.sackt0 == sackt);
test_fail_unless (rsof.sacki0 == ctx->sacki_enc.si[0]);
- test_fail_unless ((u32)((rsof.sacki1 << 19) | rsof.sacki2)
- == ctx->sacki_enc.si[1]);
+ test_fail_unless (rsof.sacki1 == ctx->sacki_enc.si[1]);
}
ctx->first = false;
/* Release created mfs for reception phase of scenario */
@@ -481,13 +477,11 @@ rx_data_burst_test_mpdu (test_t t, test_pbproc_t *tp,
ca_backoff_cancel),
SCENARIO_EVENT (phy_tx_cancel),
SCENARIO_EVENT (ca_access_hold),
- SCENARIO_EVENT_COND (m->tmi >= PHY_MOD_ROBO_NB, phy_set_tonemap,
- .tonemap_index = 0),
- SCENARIO_EVENT (phy_rx_prepare, .short_ppdu = false,
+ SCENARIO_EVENT_COND (m->tmi >= PHY_MOD_ROBO_NB, phy_set_tonemap),
+ SCENARIO_EVENT (phy_rx_prepare,
.mod = m->tmi < PHY_MOD_ROBO_NB ? m->tmi : PHY_MOD_TM,
.fecrate = tm->fecrate, .pb_size = PHY_PB_SIZE_520,
- .gil = tm->gil, .tonemap_index = 0,
- .symbol_nb = m->symb_nb),
+ .gil = tm->gil, .symbol_nb = m->symb_nb),
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 && chandata_nb ? 0
@@ -504,9 +498,8 @@ rx_data_burst_test_mpdu (test_t t, test_pbproc_t *tp,
.crc_bitmap = m->crc_error,
.crc_bitmap_bits = m->pb_nb),
SCENARIO_EVENT_COND (burst->wack && m->mpdu_cnt == 0,
- phy_tx_param,
- .fc_mode = PHY_FC_MODE_AV_1,
- .short_ppdu = true),
+ phy_tx_param_short,
+ .fc_mode = PHY_FC_MODE_AV_1),
SCENARIO_EVENT_COND (burst->wack && m->mpdu_cnt == 0,
phy_tx_frame,
.date = date + pre_fc_fl_tck,
@@ -581,7 +574,8 @@ rx_data_burst_test_mpdu (test_t t, test_pbproc_t *tp,
{
if (ctx->sackt[i] == PBPROC_FC_SACKT_MIXED)
{
- test_fail_unless (sackt[i] == PBPROC_FC_SACKT_MIXED
+ test_fail_unless (
+ sackt[i] == PBPROC_FC_SACKT_MIXED
|| sackt[i] == PBPROC_FC_SACKT_MIXED_COMPRESSED);
mixed = true;
}
@@ -710,11 +704,11 @@ rx_beacon_test (test_t t, test_pbproc_t *tp, u32 date, uint symb_nb)
SCENARIO_EVENT (ca_backoff_cancel),
SCENARIO_EVENT (phy_tx_cancel),
SCENARIO_EVENT (ca_access_hold),
- SCENARIO_EVENT (phy_rx_prepare, .short_ppdu = false,
+ SCENARIO_EVENT (phy_rx_prepare,
.mod = PHY_MOD_MINI_ROBO,
.fecrate = PHY_FEC_RATE_1_2,
.pb_size = PHY_PB_SIZE_136, .gil = PHY_GIL_567,
- .tonemap_index = 0, .symbol_nb = symb_nb),
+ .symbol_nb = symb_nb),
SCENARIO_EVENT (phy_pbdma_start, .bypass_aes = true,
.nb_total = 1, .nb_ready = 1, .nb_pb_it = 1,
.chandata = false, .now = true),
@@ -1155,7 +1149,7 @@ rx_data_nfu_test (test_t t, test_pbproc_t *tp, u32 date, rx_data_nfu_t nfu)
SCENARIO_EVENT (ca_backoff_cancel),
SCENARIO_EVENT (phy_tx_cancel),
SCENARIO_EVENT (ca_access_hold),
- SCENARIO_EVENT (phy_rx_prepare, .short_ppdu = true),
+ SCENARIO_EVENT (phy_rx_prepare_short),
SCENARIO_EVENT (ca_access_vcs_restart,
.start_date = restart_date,
.length_tck = length_tck,
@@ -1257,9 +1251,9 @@ rx_data_sack_error_test (test_t t, test_pbproc_t *tp,
SCENARIO_EVENT (ca_backoff_cancel),
SCENARIO_EVENT (phy_tx_cancel),
SCENARIO_EVENT (ca_access_hold),
- SCENARIO_EVENT (phy_rx_prepare, .short_ppdu = true),
- SCENARIO_EVENT_COND (wack, phy_tx_param, .fc_mode = PHY_FC_MODE_AV_1,
- .short_ppdu = true),
+ SCENARIO_EVENT (phy_rx_prepare_short),
+ SCENARIO_EVENT_COND (wack, phy_tx_param_short,
+ .fc_mode = PHY_FC_MODE_AV_1),
SCENARIO_EVENT_COND (wack, phy_tx_frame, .date = date + pre_fc_fl_tck,
.want_conf = false,
.stop_tx_on_prp_lost = false),
@@ -1322,7 +1316,7 @@ rx_data_errors_test_case (test_t t)
SCENARIO_EVENT (ca_backoff_cancel),
SCENARIO_EVENT (phy_tx_cancel),
SCENARIO_EVENT (ca_access_hold),
- SCENARIO_EVENT (phy_rx_prepare, .short_ppdu = true),
+ SCENARIO_EVENT (phy_rx_prepare_short),
SCENARIO_EVENT (ca_access_vcs_restart,
.start_date = date,
.length_tck = MAC_EIFS_AV_TCK,
@@ -1356,7 +1350,7 @@ rx_data_errors_test_case (test_t t)
SCENARIO_EVENT (ca_backoff_cancel),
SCENARIO_EVENT (phy_tx_cancel),
SCENARIO_EVENT (ca_access_hold),
- SCENARIO_EVENT (phy_rx_prepare, .short_ppdu = true),
+ SCENARIO_EVENT (phy_rx_prepare_short),
SCENARIO_EVENT (ca_access_vcs_restart,
.start_date = date,
.length_tck = MAC_EIFS_AV_TCK,
diff --git a/cesar/mac/pbproc/test/pbproc_eoc/src/rx_sound.c b/cesar/mac/pbproc/test/pbproc_eoc/src/rx_sound.c
index 571cf75534..2d1851f283 100644
--- a/cesar/mac/pbproc/test/pbproc_eoc/src/rx_sound.c
+++ b/cesar/mac/pbproc/test/pbproc_eoc/src/rx_sound.c
@@ -87,10 +87,10 @@ rx_sound_test (test_t t, test_pbproc_t *tp, u32 date, uint chandata_nb,
.pb_size = pb_size, .gil = tm->gil,
.symbol_nb = symb_nb),
SCENARIO_EVENT_COND (chandata, phy_pbdma_start_chandata),
- SCENARIO_EVENT_COND (!chandata, phy_rx_prepare, .short_ppdu = true),
+ SCENARIO_EVENT_COND (!chandata, phy_rx_prepare_short),
SCENARIO_ACTION_COND (chandata, phy_pbdma, .end_chandata = true),
- SCENARIO_EVENT_COND (!burst, phy_tx_param,
- .fc_mode = PHY_FC_MODE_AV_1, .short_ppdu = true),
+ SCENARIO_EVENT_COND (!burst, phy_tx_param_short,
+ .fc_mode = PHY_FC_MODE_AV_1),
SCENARIO_EVENT_COND (!burst, phy_tx_frame,
.date = date + pre_fc_fl_tck, .want_conf = false,
.stop_tx_on_prp_lost = false),
@@ -262,7 +262,7 @@ rx_sound_nfu_test (test_t t, test_pbproc_t *tp, u32 date, rx_sound_nfu_t nfu)
SCENARIO_EVENT (ca_backoff_cancel),
SCENARIO_EVENT (phy_tx_cancel),
SCENARIO_EVENT (ca_access_hold),
- SCENARIO_EVENT (phy_rx_prepare, .short_ppdu = true),
+ SCENARIO_EVENT (phy_rx_prepare_short),
SCENARIO_EVENT (ca_access_vcs_restart,
.start_date = restart_date,
.length_tck = length_tck,
diff --git a/cesar/mac/pbproc/test/pbproc_eoc/src/test_pbproc.c b/cesar/mac/pbproc/test/pbproc_eoc/src/test_pbproc.c
index 278316549c..075a8ba76a 100644
--- a/cesar/mac/pbproc/test/pbproc_eoc/src/test_pbproc.c
+++ b/cesar/mac/pbproc/test/pbproc_eoc/src/test_pbproc.c
@@ -297,17 +297,15 @@ test_pbproc_trace_suite (test_t t)
PBPROC_TRACE (FSM_RX_FC, 8, 8,
0x87a9cbac, 0x6532fa4a, 0x00000043, 0xdeadde00);
s = "[0x00000009] fsm RX FC pre_date=0x00000009"
- " RSOF snid=6 dtei=0x12 pb136 ppb=0xdb fl_av=4130 tmi=0"
- " num_sym=3sackt0=0x1 sacki0=0x1234567"
- " sacki1=0x89ab sacki2=0x20\n";
+ " RSOF snid=6 dtei=0x12 bdf pb136 ppb=0x20 fl_av=4130 tmi=13"
+ " num_sym=3 sackt0=0x1 sacki0=0x1234567 sacki1=0x18089ab\n";
dbg_assert (refp + strlen (s) < ref + sizeof (ref));
strcpy (refp, s); refp += strlen (s);
PBPROC_TRACE (FSM_RX_FC, 9, 9,
0xe4451265, 0x01234567, 0xdb8089ab, 0xdeadde20);
s = "[0x0000000a] fsm RX FC pre_date=0x0000000a"
- " RSOF snid=A9 dtei=0xed bdf ppb=0x24 fl_av=3036 tmi=31"
- " num_sym=0sackt0=0x2 sacki0=0xfedcba98"
- " sacki1=0x17654 sacki2=0x73\n";
+ " RSOF snid=A9 dtei=0xed ppb=0x73 fl_av=3036 tmi=18"
+ " num_sym=0 sackt0=0x2 sacki0=0xfedcba98 sacki1=0x7f7654\n";
dbg_assert (refp + strlen (s) < ref + sizeof (ref));
strcpy (refp, s); refp += strlen (s);
PBPROC_TRACE (FSM_RX_FC, 10, 10,
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 ac5ee916a8..39f791371f 100644
--- a/cesar/mac/pbproc/test/pbproc_eoc/src/tx_data.c
+++ b/cesar/mac/pbproc/test/pbproc_eoc/src/tx_data.c
@@ -74,10 +74,8 @@ tx_data_test (test_t t, test_pbproc_t *tp, u32 date, uint mfs_seg_nb,
.nb_ready = initial_pb_nb, .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,
- .pb_size = PHY_PB_SIZE_520, .gil = PHY_GIL_417,
- .tonemap_index = 0),
+ .mod = PHY_MOD_ROBO, .fecrate = PHY_FEC_RATE_1_2,
+ .pb_size = PHY_PB_SIZE_520, .gil = PHY_GIL_417),
SCENARIO_EVENT (phy_tx_frame, .date = date, .want_conf = true,
.stop_tx_on_prp_lost = true),
SCENARIO_EVENT (ca_access_vcs_restart, .start_date = date,
@@ -99,7 +97,7 @@ tx_data_test (test_t t, test_pbproc_t *tp, u32 date, uint mfs_seg_nb,
.pre_detection = true),
SCENARIO_ACTION (phy_rx_fc, .rx_date = date + pre_fc_fl_tck,
.fc_av = (u32 *) &sack_fc),
- SCENARIO_EVENT (phy_rx_prepare, .short_ppdu = true),
+ SCENARIO_EVENT (phy_rx_prepare_short),
SCENARIO_EVENT (ca_mfs_update, .mfs = mfs),
SCENARIO_EVENT (ca_backoff_success),
SCENARIO_EVENT (ca_access_vcs_restart,
@@ -150,10 +148,8 @@ tx_data_woack_test (test_t t, test_pbproc_t *tp, u32 date, uint mfs_seg_nb,
.nb_ready = initial_pb_nb, .nb_pb_it = initial_pb_nb,
.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,
- .pb_size = PHY_PB_SIZE_520, .gil = PHY_GIL_417,
- .tonemap_index = 0),
+ .mod = PHY_MOD_ROBO, .fecrate = PHY_FEC_RATE_1_2,
+ .pb_size = PHY_PB_SIZE_520, .gil = PHY_GIL_417),
SCENARIO_EVENT (phy_tx_frame, .date = date, .want_conf = true,
.stop_tx_on_prp_lost = true),
SCENARIO_EVENT (ca_access_vcs_restart, .start_date = date,
@@ -276,10 +272,8 @@ tx_data_beacon_test (test_t t, test_pbproc_t *tp, u32 date, uint duration_tck,
.nb_ready = 1, .nb_pb_it = 1, .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,
- .pb_size = PHY_PB_SIZE_136, .gil = PHY_GIL_567,
- .tonemap_index = 0),
+ .mod = PHY_MOD_MINI_ROBO, .fecrate = PHY_FEC_RATE_1_2,
+ .pb_size = PHY_PB_SIZE_136, .gil = PHY_GIL_567),
SCENARIO_EVENT (phy_tx_frame, .date = date, .want_conf = true,
.stop_tx_on_prp_lost = false),
SCENARIO_ACTION (phy_access_conf),
@@ -349,7 +343,8 @@ tx_data_basic_test_case (test_t t)
tx_data_beacon_test (t, &tp, 123, MAC_PREAMBLE_HYBRID_TCK
+ MAC_FC_10_TCK + MAC_FC_AV_TCK
+ MAC_PAYLOAD_TCK (6, MAC_DX567_TCK)
- + MAC_B2BIFS_TCK, 6);
+ + MAC_B2BIFS_TCK
+ + PBPROC_BEACON_OFFSET_TIME, 6);
} test_end;
test_pbproc_uninit (&tp);
}
@@ -416,10 +411,8 @@ tx_data_cancel_test (test_t t, test_pbproc_t *tp, bool prp_won, bool rx_fc)
.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,
- .pb_size = PHY_PB_SIZE_520, .gil = PHY_GIL_417,
- .tonemap_index = 0),
+ .mod = PHY_MOD_ROBO, .fecrate = PHY_FEC_RATE_1_2,
+ .pb_size = PHY_PB_SIZE_520, .gil = PHY_GIL_417),
SCENARIO_EVENT (phy_tx_frame, .date = date, .want_conf = true,
.stop_tx_on_prp_lost = true),
SCENARIO_EVENT (ca_access_vcs_restart, .start_date = date,
@@ -434,7 +427,7 @@ tx_data_cancel_test (test_t t, test_pbproc_t *tp, bool prp_won, bool rx_fc)
SCENARIO_EVENT_COND (!prp_won, ca_backoff_cancel),
SCENARIO_EVENT (phy_tx_cancel),
SCENARIO_EVENT (ca_access_hold),
- SCENARIO_EVENT (phy_rx_prepare, .short_ppdu = true),
+ SCENARIO_EVENT (phy_rx_prepare_short),
SCENARIO_EVENT (ca_access_vcs_restart,
.start_date = date - MAC_SLOT_TCK,
.length_tck = sack_length_tck,
@@ -451,10 +444,8 @@ tx_data_cancel_test (test_t t, test_pbproc_t *tp, bool prp_won, bool rx_fc)
.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,
- .pb_size = PHY_PB_SIZE_520, .gil = PHY_GIL_417,
- .tonemap_index = 0),
+ .mod = PHY_MOD_ROBO, .fecrate = PHY_FEC_RATE_1_2,
+ .pb_size = PHY_PB_SIZE_520, .gil = PHY_GIL_417),
SCENARIO_EVENT (phy_tx_frame, .date = date, .want_conf = true,
.stop_tx_on_prp_lost = true),
SCENARIO_EVENT (ca_access_vcs_restart, .start_date = date,
@@ -469,10 +460,8 @@ tx_data_cancel_test (test_t t, test_pbproc_t *tp, bool prp_won, bool rx_fc)
.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,
- .pb_size = PHY_PB_SIZE_520, .gil = PHY_GIL_417,
- .tonemap_index = 0),
+ .mod = PHY_MOD_ROBO, .fecrate = PHY_FEC_RATE_1_2,
+ .pb_size = PHY_PB_SIZE_520, .gil = PHY_GIL_417),
SCENARIO_EVENT (phy_tx_frame, .date = date2, .want_conf = true,
.stop_tx_on_prp_lost = false),
SCENARIO_ACTION (phy_rx_fc, .rx_date = date2 - MAC_SLOT_TCK,
@@ -482,7 +471,7 @@ tx_data_cancel_test (test_t t, test_pbproc_t *tp, bool prp_won, bool rx_fc)
SCENARIO_EVENT (ca_backoff_deferred, .slot_count = 3),
SCENARIO_EVENT (phy_tx_cancel),
SCENARIO_EVENT (ca_access_hold),
- SCENARIO_EVENT (phy_rx_prepare, .short_ppdu = true),
+ SCENARIO_EVENT (phy_rx_prepare_short),
SCENARIO_EVENT (ca_access_vcs_restart,
.start_date = date2 - MAC_SLOT_TCK,
.length_tck = sack_length_tck,
diff --git a/cesar/mac/pbproc/test/pbproc_eoc/src/tx_sound.c b/cesar/mac/pbproc/test/pbproc_eoc/src/tx_sound.c
index d0f769c67a..47a184a7f0 100644
--- a/cesar/mac/pbproc/test/pbproc_eoc/src/tx_sound.c
+++ b/cesar/mac/pbproc/test/pbproc_eoc/src/tx_sound.c
@@ -93,8 +93,7 @@ tx_sound_test (test_t t, test_pbproc_t *tp)
.pre_detection = true),
SCENARIO_ACTION (phy_rx_fc, .rx_date = date + pre_fc_fl_tck,
.fc_av = (u32 *) &sound_ack_fc),
- SCENARIO_EVENT (phy_rx_prepare, .short_ppdu = true),
- /* SCENARIO_EVENT (ca_backoff_success), */
+ SCENARIO_EVENT (phy_rx_prepare_short),
SCENARIO_EVENT (ca_access_vcs_restart,
.start_date = date + pre_fc_fl_tck,
.length_tck = MAC_PREAMBLE_TCK + MAC_FC_AV_TCK
@@ -221,7 +220,7 @@ tx_sound_cancel_test (test_t t, test_pbproc_t *tp, bool prp_won, bool rx_fc)
SCENARIO_EVENT_COND (!prp_won, ca_backoff_cancel),
SCENARIO_EVENT (phy_tx_cancel),
SCENARIO_EVENT (ca_access_hold),
- SCENARIO_EVENT (phy_rx_prepare, .short_ppdu = true),
+ SCENARIO_EVENT (phy_rx_prepare_short),
SCENARIO_EVENT (ca_access_vcs_restart,
.start_date = date - MAC_SLOT_TCK,
.length_tck = sack_length_tck,
@@ -276,7 +275,7 @@ tx_sound_cancel_test (test_t t, test_pbproc_t *tp, bool prp_won, bool rx_fc)
SCENARIO_EVENT (ca_backoff_deferred, .slot_count = 3),
SCENARIO_EVENT (phy_tx_cancel),
SCENARIO_EVENT (ca_access_hold),
- SCENARIO_EVENT (phy_rx_prepare, .short_ppdu = true),
+ SCENARIO_EVENT (phy_rx_prepare_short),
SCENARIO_EVENT (ca_access_vcs_restart,
.start_date = date2 - MAC_SLOT_TCK,
.length_tck = sack_length_tck,
diff --git a/cesar/mac/pbproc/test/pbproc_eoc/src/utils.c b/cesar/mac/pbproc/test/pbproc_eoc/src/utils.c
index 684f066a2a..6772e2c5ae 100644
--- a/cesar/mac/pbproc/test/pbproc_eoc/src/utils.c
+++ b/cesar/mac/pbproc/test/pbproc_eoc/src/utils.c
@@ -131,14 +131,7 @@ utils_sta_prepare_default_tonemap (test_pbproc_t *tp, bool tx, uint tei,
tm->fecrate = PHY_FEC_RATE_16_21;
tm->gil = PHY_GIL_417;
tm->bits_per_symbol = tm_mod * tp->config.tonemask_info.carrier_nb;
- tm->bits_per_pb[PHY_PB_SIZE_136] =
- tonemap_bits_per_pb (PHY_MOD_TM, tm->fecrate, PHY_PB_SIZE_136,
- tm->bits_per_symbol);
- tm->bits_per_pb[PHY_PB_SIZE_520] =
- tonemap_bits_per_pb (PHY_MOD_TM, tm->fecrate, PHY_PB_SIZE_520,
- tm->bits_per_symbol);
- tm->ble = tonemap_ble (tm->bits_per_symbol, tm->fecrate,
- CONST_UF32 (0.0), tm->gil);
+ tonemap_update (tm, TONEMAP_P_PBERROR_DEFAULT_UF32);
/* Do not fill tonemap, unused. */
}
else