summaryrefslogtreecommitdiff
path: root/cesar/ce/rx/bitloading/src/bitloading.c
diff options
context:
space:
mode:
authordufour2009-07-21 13:06:36 +0000
committerdufour2009-07-21 13:06:36 +0000
commit668637cb2d92f55355d703b24ddcae5f3fdc28b4 (patch)
treeb79e8fb651ec03e25c160546168301a48df989ad /cesar/ce/rx/bitloading/src/bitloading.c
parented1b1fe4cfecca1013f2904ef93a4159eecbb53e (diff)
* ce/rx/bitloading:
- move, rename and fix the function to initialize the computation of the mean on the NSR. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@5042 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/ce/rx/bitloading/src/bitloading.c')
-rw-r--r--cesar/ce/rx/bitloading/src/bitloading.c54
1 files changed, 1 insertions, 53 deletions
diff --git a/cesar/ce/rx/bitloading/src/bitloading.c b/cesar/ce/rx/bitloading/src/bitloading.c
index 768a8e59d6..83505dcb34 100644
--- a/cesar/ce/rx/bitloading/src/bitloading.c
+++ b/cesar/ce/rx/bitloading/src/bitloading.c
@@ -14,59 +14,7 @@
#include "lib/slab.h"
#include "ce/rx/bitloading/inc/bitloading.h"
-
-void
-ce_rx_bitloading_allocate (ce_rx_t *ce_rx, ce_rx_bitloading_t *bt,
- phy_chandata_t *chan_data, uint chan_data_count)
-{
- /* Check parameters. */
- dbg_assert (ce_rx);
- dbg_assert (bt);
- dbg_assert (chan_data);
- dbg_assert (chan_data_count);
-
- /* Look for noise NRJ. */
- uint count = 0, noise_nrj_blk_count = 0;
- bool finished = false;
- phy_chandata_t *cur = chan_data;
- /* While not finished. */
- while (!finished)
- {
- dbg_assert (cur);
- /* Noise NRJ block. */
- if (cur->conf.type == PHY_CHANDATA_TYPE_NRJ)
- {
- /* First block. */
- if (cur->conf.address == 0)
- bt->noise_nrj = cur->blk;
- noise_nrj_blk_count++;
- blk_addref_desc (&cur->blk);
- }
- /* Get next channel data block. */
- if (++count < chan_data_count)
- cur = PARENT_OF (phy_chandata_t, blk, cur->blk.next);
- else
- finished = true;
- }
- {
- /* Sanity check. */
- if (PHY_CARRIER_NB % (BLK_SIZE / CE_RX_BITLOADING_NOISE_NRJ_SIZE))
- {
- dbg_assert (count ==
- PHY_CARRIER_NB / (BLK_SIZE /
- CE_RX_BITLOADING_NOISE_NRJ_SIZE)
- + 1);
- }
- else
- {
- dbg_assert (count ==
- PHY_CARRIER_NB / (BLK_SIZE /
- CE_RX_BITLOADING_NOISE_NRJ_SIZE));
- }
- }
- bt->noise_nrj_blk_count = noise_nrj_blk_count;
- bt->mean_count = 0;
-}
+#include "ce/rx/bitloading/inc/nsr.h"
void
ce_rx_bitloading_initial (ce_rx_t *ce_rx, ce_rx_bitloading_t *bt,