summaryrefslogtreecommitdiff
path: root/cesar/mac/pbproc/src/fsm_tx_data.c
diff options
context:
space:
mode:
Diffstat (limited to 'cesar/mac/pbproc/src/fsm_tx_data.c')
-rw-r--r--cesar/mac/pbproc/src/fsm_tx_data.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/cesar/mac/pbproc/src/fsm_tx_data.c b/cesar/mac/pbproc/src/fsm_tx_data.c
index 6ea67313d4..bf17161c3e 100644
--- a/cesar/mac/pbproc/src/fsm_tx_data.c
+++ b/cesar/mac/pbproc/src/fsm_tx_data.c
@@ -63,8 +63,7 @@ pbproc_ftda__handle (pbproc_t *ctx)
/* Always program a timer because TX can be canceled due to false alarms,
* see maria:#706. */
ca_access_vcs_restart (ctx->ca, ctx->prep_mpdu.tx_date,
- ctx->times[ctx->access.hybrid].eifs_tck,
- PBPROC_ANTICIP_TCK, true);
+ ctx->times.eifs_tck, PBPROC_ANTICIP_TCK, true);
pbproc_fsm_change_state (ctx, PBPROC_FSM_STATE_TX_WAIT_ACCESS_CONF);
}
@@ -116,8 +115,8 @@ pbproc_ftda__tx_wait_access_conf__access_conf (pbproc_t *ctx)
- 2);
ca_access_vcs_restart (ctx->ca, ctx->prep_mpdu.tx_date
+ ctx->prep_mpdu.flp_tck,
- ctx->times[ctx->access.hybrid].eifs_tck,
- PBPROC_ANTICIP_TCK, true);
+ ctx->times.eifs_tck, PBPROC_ANTICIP_TCK,
+ true);
phy_rx_activate (ctx->phy, false, ctx->prep_mpdu.tx_date
+ ctx->prep_mpdu.flp_tck, true);
pbproc_fsm_change_state (ctx, PBPROC_FSM_STATE_TX_WAIT_SACKD);
@@ -142,9 +141,7 @@ void ARCH_ILRAM
pbproc_ftda__tx_wait_sackd__rx_fc (pbproc_t *ctx, u32 rx_date,
const pbproc_fc_t *fc_av)
{
- pbproc_times_t *times;
dbg_claim (ctx);
- times = &ctx->times[ctx->access.hybrid];
pbproc_prep_mpdu_t *prep = &ctx->prep_mpdu;
/* Is it our SACK. */
if (fc_av
@@ -190,7 +187,7 @@ pbproc_ftda__tx_wait_sackd__rx_fc (pbproc_t *ctx, u32 rx_date,
{
ca_backoff_success (ctx->ca);
ca_access_vcs_restart (ctx->ca, rx_date,
- times->pre_fcs_tck + MAC_CIFS_TCK,
+ ctx->times.pre_fcs_tck + MAC_CIFS_TCK,
PBPROC_ANTICIP_TCK, false);
pbproc_fsm_change_state (ctx, PBPROC_FSM_STATE_IDLE);
}
@@ -230,13 +227,11 @@ pbproc_ftda__tx_wait_sackd__access (pbproc_t *ctx)
void ARCH_ILRAM
pbproc_ftda__tx_wait_tx_end__pbdma (pbproc_t *ctx)
{
- pbproc_times_t *times;
dbg_claim (ctx);
- times = &ctx->times[ctx->access.hybrid];
pbproc_prep_mpdu_ack_all (ctx);
ca_backoff_success (ctx->ca);
uint sack_tck = !ctx->access.mfs->beacon
- ? times->pre_fcs_tck + MAC_CIFS_TCK : 0;
+ ? ctx->times.pre_fcs_tck + MAC_CIFS_TCK : 0;
ca_access_vcs_restart (ctx->ca, ctx->prep_mpdu.tx_date
+ ctx->prep_mpdu.flp_tck,
sack_tck, PBPROC_ANTICIP_TCK, false);