summaryrefslogtreecommitdiff
path: root/cesar/ce/rx/bitloading
diff options
context:
space:
mode:
authorCyril Jourdan2012-11-22 15:21:55 +0100
committerCyril Jourdan2013-01-18 11:53:48 +0100
commitdd4a125033a8089d6f4d5b6e52d539ed51e24969 (patch)
tree730d726d82e043029db0c534fc5f73feb8384924 /cesar/ce/rx/bitloading
parent31fb77de9bbf4f7719b71a1cddfa5e3862266b9c (diff)
cesar/ce/rx/bl: move NSR functions to specific header, refs #2366
Diffstat (limited to 'cesar/ce/rx/bitloading')
-rw-r--r--cesar/ce/rx/bitloading/bitloading.h26
-rw-r--r--cesar/ce/rx/bitloading/nsr.h31
2 files changed, 32 insertions, 25 deletions
diff --git a/cesar/ce/rx/bitloading/bitloading.h b/cesar/ce/rx/bitloading/bitloading.h
index 3d40afa434..1be3db246e 100644
--- a/cesar/ce/rx/bitloading/bitloading.h
+++ b/cesar/ce/rx/bitloading/bitloading.h
@@ -20,6 +20,7 @@
*/
#include "ce/rx/bitloading/context.h"
+#include "ce/rx/bitloading/nsr.h"
#include "common/module.h"
@@ -118,23 +119,6 @@ ce_rx_bitloading_init (ce_rx_bitloading_t *bt)
}
/**
- * Clean NSR mean.
- * \param bl the bit loading context of the peer
- */
-extern inline void
-ce_rx_bl_nsr_clean (ce_rx_bitloading_t *bl)
-{
- /* Check parameter. */
- dbg_assert (bl);
- dbg_assert (bl->noise_nrj_blk_count);
- dbg_assert_ptr (bl->noise_nrj);
-
- blk_release_desc_range_nb (bl->noise_nrj, bl->noise_nrj_blk_count);
- dbg_invalid_ptr (bl->noise_nrj);
- bl->noise_nrj_blk_count = 0;
-}
-
-/**
* Un-initialize bit-loading data.
* \param bt the bit-loading data & state structure.
* @note this function does not delete the structure itself, just clean the
@@ -157,14 +141,6 @@ ce_rx_bitloading_uninit (ce_rx_bitloading_t *bt)
blk_table_free (bt->opti_table);
}
-/**
- * Get the current NSR used by the bit loading.
- * \param ctx the bit loading context of the station.
- * \return the NSR if available (NULL otherwise).
- */
-blk_t *
-ce_rx_bl_get_nsr (ce_rx_bitloading_t *bl);
-
END_DECLS
#endif /* ce_rx_bitloading_bitloading_h */
diff --git a/cesar/ce/rx/bitloading/nsr.h b/cesar/ce/rx/bitloading/nsr.h
index 6d4a9a824c..8f96da6e32 100644
--- a/cesar/ce/rx/bitloading/nsr.h
+++ b/cesar/ce/rx/bitloading/nsr.h
@@ -15,10 +15,41 @@
* This file contains the information related to NSR.
*/
+#include "ce/rx/bitloading/context.h"
+
/**
* NSR must be rescaled before used by BER vs polynomials.
* Rescaling is not the same if NSR is based on sound or data.
*/
#define CE_RX_BL_NSR_SOUND_RESCALE (2)
+BEGIN_DECLS
+
+/**
+ * Clean NSR mean.
+ * \param bl the bit loading context of the peer
+ */
+extern inline void
+ce_rx_bl_nsr_clean (ce_rx_bitloading_t *bl)
+{
+ /* Check parameter. */
+ dbg_assert (bl);
+ dbg_assert (bl->noise_nrj_blk_count);
+ dbg_assert_ptr (bl->noise_nrj);
+
+ blk_release_desc_range_nb (bl->noise_nrj, bl->noise_nrj_blk_count);
+ dbg_invalid_ptr (bl->noise_nrj);
+ bl->noise_nrj_blk_count = 0;
+}
+
+/**
+ * Get the current NSR used by the bit loading.
+ * \param ctx the bit loading context of the station.
+ * \return the NSR if available (NULL otherwise).
+ */
+blk_t *
+ce_rx_bl_get_nsr (ce_rx_bitloading_t *bl);
+
+END_DECLS
+
#endif /* ce_rx_bitloading_nsr_h */