From fdd565e1959081d41ea7f36b6df968d9ada6d441 Mon Sep 17 00:00:00 2001 From: Cyril Jourdan Date: Thu, 30 May 2013 16:05:22 +0200 Subject: cesar/mac/pbproc: remove unused field in rx params, closes #4018 Beacon period start date is not used anymore by the CE, now that PBProc is in charge of the matching of the received frames on intervals. --- cesar/ce/rx/test/src/test_rx.c | 1 - cesar/mac/pbproc/pbproc.h | 2 -- cesar/mac/pbproc/src/fsm_rx_data.c | 2 -- cesar/mac/pbproc/src/fsm_rx_sound.c | 2 -- cesar/mac/pbproc/test/pbproc/src/rx_data.c | 1 - cesar/mac/pbproc/test/pbproc/src/test_pbproc.c | 4 ---- 6 files changed, 12 deletions(-) (limited to 'cesar') diff --git a/cesar/ce/rx/test/src/test_rx.c b/cesar/ce/rx/test/src/test_rx.c index d6102538a4..8285f0e40a 100644 --- a/cesar/ce/rx/test/src/test_rx.c +++ b/cesar/ce/rx/test/src/test_rx.c @@ -199,7 +199,6 @@ test_ce_rx_measure_suite (test_t t) rx_params.tei = 1; rx_params.multi_net_bcast = false; rx_params.preamble_ntb = 0; - rx_params.beacon_period_start_ntb = 42; rx_params.fl_tck = 1664; test_ce_rx_t tcr; diff --git a/cesar/mac/pbproc/pbproc.h b/cesar/mac/pbproc/pbproc.h index 681f9a00eb..49e62d1063 100644 --- a/cesar/mac/pbproc/pbproc.h +++ b/cesar/mac/pbproc/pbproc.h @@ -35,8 +35,6 @@ struct pbproc_rx_params_t { /** Preamble start NTB. */ u32 preamble_ntb; - /** Beacon period start NTB. */ - u32 beacon_period_start_ntb; /** Frame length (data + response IFS). */ uint fl_tck; /** TEI of the transmitter. */ diff --git a/cesar/mac/pbproc/src/fsm_rx_data.c b/cesar/mac/pbproc/src/fsm_rx_data.c index 600d7b9adb..f54629f1ac 100644 --- a/cesar/mac/pbproc/src/fsm_rx_data.c +++ b/cesar/mac/pbproc/src/fsm_rx_data.c @@ -252,8 +252,6 @@ pbproc_frda__handle (pbproc_t *ctx, u32 rx_date) /* Save received MPDU parameters. */ ctx->recv_mpdu.rx_params.preamble_ntb = rx_date + ctx->config->ntb_offset_tck; - ctx->recv_mpdu.rx_params.beacon_period_start_ntb = - ctx->alloc.beacon_period_start_date + ctx->config->ntb_offset_tck; ctx->recv_mpdu.pb_nb = pb_nb; ctx->recv_mpdu.ack_date = rx_date + ctx->times.pre_fcs_tck + fl_tck; ctx->recv_mpdu.drop = !nek_ok; diff --git a/cesar/mac/pbproc/src/fsm_rx_sound.c b/cesar/mac/pbproc/src/fsm_rx_sound.c index a82920b60f..bcc2e22653 100644 --- a/cesar/mac/pbproc/src/fsm_rx_sound.c +++ b/cesar/mac/pbproc/src/fsm_rx_sound.c @@ -140,8 +140,6 @@ pbproc_frso__handle (pbproc_t *ctx, u32 rx_date, /* Save received MPDU parameters. */ ctx->recv_mpdu.rx_params.preamble_ntb = rx_date + ctx->config->ntb_offset_tck; - ctx->recv_mpdu.rx_params.beacon_period_start_ntb = - ctx->alloc.beacon_period_start_date + ctx->config->ntb_offset_tck; ctx->recv_mpdu.rx_params.fl_tck = fl_tck; ctx->recv_mpdu.rx_params.tei = sound->stei; ctx->recv_mpdu.rx_params.lid = sound->lid; diff --git a/cesar/mac/pbproc/test/pbproc/src/rx_data.c b/cesar/mac/pbproc/test/pbproc/src/rx_data.c index 07c478bfcf..300b478e42 100644 --- a/cesar/mac/pbproc/test/pbproc/src/rx_data.c +++ b/cesar/mac/pbproc/test/pbproc/src/rx_data.c @@ -1743,7 +1743,6 @@ rx_data_budget_test_case (test_t t) rx->rx->pb_first = rx->rx->pb_last = NULL; rx->rx->chandata_nb = 0; rx->rx->chandata_first = NULL; - rx->rx->params.beacon_period_start_ntb = tp.config.ntb_offset_tck; rx->rx->params.fl_tck = 0; rx->rx->params.pb_size = 0; rx->rx->params.mpdu_cnt = 0; diff --git a/cesar/mac/pbproc/test/pbproc/src/test_pbproc.c b/cesar/mac/pbproc/test/pbproc/src/test_pbproc.c index 06f164639c..e3d6b412cd 100644 --- a/cesar/mac/pbproc/test/pbproc/src/test_pbproc.c +++ b/cesar/mac/pbproc/test/pbproc/src/test_pbproc.c @@ -47,7 +47,6 @@ void test_pbproc_rx_cb (void *user, pbproc_rx_desc_t *rx_desc) { dbg_assert_ptr (user); - test_pbproc_t *ctx = user; dbg_assert_ptr (rx_desc); pbproc_rx_t *rx = rx_desc->rx; if (rx->pb_nb) @@ -69,9 +68,6 @@ test_pbproc_rx_cb (void *user, pbproc_rx_desc_t *rx_desc) if (rx->chandata_nb) blk_release_desc_range_nb (&rx->chandata_first->blk, rx->chandata_nb); /* TODO: more verifications. */ - test_fail_unless (rx->params.beacon_period_start_ntb - == params->beacon_period_start_date - + ctx->config.ntb_offset_tck); test_fail_unless (rx->params.fl_tck == params->fl_tck); test_fail_unless (rx->params.pb_size == params->pb_size); test_fail_unless (rx->params.mpdu_cnt == params->mpdu_cnt); -- cgit v1.2.3