summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlacour2008-02-27 14:53:08 +0000
committerlacour2008-02-27 14:53:08 +0000
commitd09d183ab1b93d2a5cb54141f1e8f5037d4f643c (patch)
treeae4d66353b952f8967d63cfcab2d953cc97f8a4c
parentc54bc7956981c8b72f2b5f609155abd09055b51f (diff)
Add the block number of chandata for the sar_mpdu_measurement_cb callback.
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@1479 017c9cb6-072f-447c-8318-d5b54f68fe89
-rwxr-xr-xce/inc/rx.h2
-rwxr-xr-xce/src/rx.c2
-rwxr-xr-xce/test/rx/general/src/test_rx.c2
-rwxr-xr-xce/test/rx/general/src/test_sar_integration.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/ce/inc/rx.h b/ce/inc/rx.h
index fbc677d48b..ec356c3b43 100755
--- a/ce/inc/rx.h
+++ b/ce/inc/rx.h
@@ -120,7 +120,7 @@ pbproc_need_scf_cb (uint tei, uint src);
bool // does channel estimation need pb_measurement?
sar_mpdu_measurement_cb (void *user, pbproc_rx_params_t *rx_params,
uint pb_nb, blk_t **first, blk_t **last,
- pb_t *noise);
+ pb_t *noise, uint n);
/**
* Add a 'cei message job' for each tonemaps that must be updated and evaluate
diff --git a/ce/src/rx.c b/ce/src/rx.c
index feaa92c850..6e171a9b31 100755
--- a/ce/src/rx.c
+++ b/ce/src/rx.c
@@ -79,7 +79,7 @@ pbproc_need_scf_cb (uint tei, uint reason_code)
bool
sar_mpdu_measurement_cb (void *user, pbproc_rx_params_t *rx_params,
- uint pb_nb, blk_t **f, blk_t **l, pb_t *noise)
+ uint pb_nb, blk_t **f, blk_t **l, pb_t *noise, uint n)
{
dbg_assert (user);
rxce_t *ctx = (rxce_t *) user;
diff --git a/ce/test/rx/general/src/test_rx.c b/ce/test/rx/general/src/test_rx.c
index 5818c18dcb..d9b8e52fce 100755
--- a/ce/test/rx/general/src/test_rx.c
+++ b/ce/test/rx/general/src/test_rx.c
@@ -136,7 +136,7 @@ sar_noise_new (pbproc_rx_params_t *rx_params, uint noise[], uint symbol_nb)
time_noise->blk.next = (blk_t *) freq_noise;
//chandata_print (time_noise);
ce_print ("\t\t\t\t ADD NOISES\n");
- sar_mpdu_measurement_cb (rxce_ctx, rx_params, 0, NULL, NULL, (pb_t *) time_noise);
+ sar_mpdu_measurement_cb (rxce_ctx, rx_params, 0, NULL, NULL, (pb_t *) time_noise, PHY_CHANDATA_BLK_NB);
//my_print ("\t\t\t\t ADD FREQ NOISE\n");
//sar_mpdu_measurement_cb (NULL, rx_params, 0, NULL, NULL, (pb_t *) freq_noise);
}
diff --git a/ce/test/rx/general/src/test_sar_integration.c b/ce/test/rx/general/src/test_sar_integration.c
index fab5e5016b..a4db2a1602 100755
--- a/ce/test/rx/general/src/test_sar_integration.c
+++ b/ce/test/rx/general/src/test_sar_integration.c
@@ -120,7 +120,7 @@ run_one_reassembly (sar_t *sar_ctx, uint pb_nb)
//my_print ("\n");
emul_reassembly (pb_nb, 0x00, &rx_params, &f, &l, &noise);
//my_print ("pbproc-pb-noise-rxparam : allocated = %d, freed = %d released = %d referenced = %d\n", blk_allocated, blk_freed, blk_released, blk_referenced);
- sar_mpdu_add (sar_ctx, NULL, NULL, rx_params, f, l, pb_nb, (pb_t *) noise);
+ sar_mpdu_add (sar_ctx, NULL, NULL, rx_params, f, l, pb_nb, (pb_t *) noise, PHY_CHANDATA_BLK_NB);
//my_print ("sar_mpdu_added : allocated = %d, freed = %d released = %d referenced = %d\n", blk_allocated, blk_freed, blk_released, blk_referenced);
blk_release (rx_params); // pbproc can erase it.
//my_print ("release pbproc_rx_params : allocated = %d, freed = %d released = %d referenced = %d\n", blk_allocated, blk_freed, blk_released, blk_referenced);