summaryrefslogtreecommitdiff
path: root/cesar
diff options
context:
space:
mode:
authorNicolas Schodet2011-04-05 16:46:45 +0200
committerNicolas Schodet2011-04-06 10:50:01 +0200
commit4044ab9d083365410c7ab9eca3c213d1bd32c9ca (patch)
treea85b3346c01c24f4cf1401ec32c590d1ff20889a /cesar
parent57296857010d3577d0eb5e135130881c9ba75777 (diff)
cesar/mac/pbproc: always use hybrid timing for beacon, closes #2435
Diffstat (limited to 'cesar')
-rw-r--r--cesar/mac/pbproc/src/prep_mpdu.c7
-rw-r--r--cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c2
2 files changed, 5 insertions, 4 deletions
diff --git a/cesar/mac/pbproc/src/prep_mpdu.c b/cesar/mac/pbproc/src/prep_mpdu.c
index b1dad57c52..6c6fd83816 100644
--- a/cesar/mac/pbproc/src/prep_mpdu.c
+++ b/cesar/mac/pbproc/src/prep_mpdu.c
@@ -116,10 +116,11 @@ pbproc_prep_beacon (pbproc_t *ctx, mfs_tx_t *mfs)
+ tm->bits_per_symbol - 1) / tm->bits_per_symbol;
u32 data_tck = MAC_PAYLOAD_TCK (symb_nb, ctx->symbol_tck[tm->gil]);
prep->ifs_tck = MAC_B2BIFS_TCK;
- prep->flp_tck = ctx->times.pre_fcs_tck + data_tck + MAC_B2BIFS_TCK;
+ uint pre_fcs_tck = ctx->times_array[PBPROC_TIMES_ARRAY_INDEX
+ (true, MAC_COEXISTENCE_FULL_HYBRID_MODE)].pre_fcs_tck;
+ prep->flp_tck = pre_fcs_tck + data_tck + MAC_B2BIFS_TCK;
/* Does it fit? */
- if (ctx->times.pre_fcs_tck + data_tck + MAC_B2BIFS_TCK
- > access->duration_tck)
+ if (prep->flp_tck > access->duration_tck)
return;
/* Get beacon PB. */
pb_t *seg;
diff --git a/cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c b/cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c
index 763dbededd..42d97c8c9e 100644
--- a/cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c
+++ b/cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c
@@ -958,7 +958,7 @@ prep_beacon_test (test_t t, test_pbproc_t *tp, u32 date, bool prepared,
mfs->seg_nb = -1;
}
/* Setup an access. */
- test_pbproc_alloc (tp, true, beacon_period_start_date);
+ test_pbproc_alloc (tp, false, beacon_period_start_date);
ca_access_param_t *access = &tp->pbproc->access;
access->access_date = date;
access->duration_tck = MAC_PREAMBLE_HYBRID_TCK + MAC_FC_10_TCK