summaryrefslogtreecommitdiff
path: root/cesar/ce/rx
diff options
context:
space:
mode:
Diffstat (limited to 'cesar/ce/rx')
-rw-r--r--cesar/ce/rx/bitloading/inc/ber.h6
-rw-r--r--cesar/ce/rx/bitloading/inc/poly.h2
-rw-r--r--cesar/ce/rx/bitloading/nsr.h24
-rw-r--r--cesar/ce/rx/bitloading/src/nsr.c3
-rw-r--r--cesar/ce/rx/bitloading/test/src/test_bl.c3
-rw-r--r--cesar/ce/rx/test/src/test_rx.c1
6 files changed, 30 insertions, 9 deletions
diff --git a/cesar/ce/rx/bitloading/inc/ber.h b/cesar/ce/rx/bitloading/inc/ber.h
index d1182233f9..3184bbac4c 100644
--- a/cesar/ce/rx/bitloading/inc/ber.h
+++ b/cesar/ce/rx/bitloading/inc/ber.h
@@ -51,12 +51,6 @@
#define CE_RX_BL_BPT_QUANT_FACTOR (1ull << 8)
/**
- * 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_BER_NSR_SOUND_RESCALE (2)
-
-/**
* Polynomials for each modulation to compute BER.
*/
struct ce_rx_bl_ber_poly_coef_t
diff --git a/cesar/ce/rx/bitloading/inc/poly.h b/cesar/ce/rx/bitloading/inc/poly.h
index 5b56bc8c85..ae35acbea9 100644
--- a/cesar/ce/rx/bitloading/inc/poly.h
+++ b/cesar/ce/rx/bitloading/inc/poly.h
@@ -36,7 +36,7 @@ BEGIN_DECLS
* Therefore, implementation uses the second forms of the polynomial.
*/
extern inline s64
-ce_rx_bl_poly (const u8 degree, const s64 const *coef, const u32 x)
+ce_rx_bl_poly (const u8 degree, const s64 * const coef, const u32 x)
{
/* Check parameter. */
dbg_assert (coef);
diff --git a/cesar/ce/rx/bitloading/nsr.h b/cesar/ce/rx/bitloading/nsr.h
new file mode 100644
index 0000000000..6d4a9a824c
--- /dev/null
+++ b/cesar/ce/rx/bitloading/nsr.h
@@ -0,0 +1,24 @@
+#ifndef ce_rx_bitloading_nsr_h
+#define ce_rx_bitloading_nsr_h
+/* Cesar project {{{
+ *
+ * Copyright (C) 2011 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file ce/rx/bitloading/nsr.h
+ * \brief Public data
+ * \ingroup ce_rx_bl
+ *
+ * This file contains the information related to NSR.
+ */
+
+/**
+ * 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)
+
+#endif /* ce_rx_bitloading_nsr_h */
diff --git a/cesar/ce/rx/bitloading/src/nsr.c b/cesar/ce/rx/bitloading/src/nsr.c
index d3499c2494..4da8168e0f 100644
--- a/cesar/ce/rx/bitloading/src/nsr.c
+++ b/cesar/ce/rx/bitloading/src/nsr.c
@@ -13,6 +13,7 @@
#include "common/std.h"
#include "ce/rx/bitloading/inc/nsr.h"
+#include "ce/rx/bitloading/nsr.h"
#include "ce/rx/bitloading/inc/ber.h"
#include "hal/phy/defs.h"
@@ -171,7 +172,7 @@ ce_rx_bl_nsr_compute_mean (ce_rx_bitloading_t *bl)
/* Compute mean and rescale (for NSR dynamics). */
cur_sum_nsr[j] = ce_rx_bl_nsr_mean (cur_sum_nsr[j],
bl->mean_count)
- * CE_RX_BL_BER_NSR_SOUND_RESCALE
+ * CE_RX_BL_NSR_SOUND_RESCALE
* ce_rx_bl_nsr_margin_ / CE_RX_BL_NSR_MARGIN_QUANT_FACTOR;
}
/* Next block. */
diff --git a/cesar/ce/rx/bitloading/test/src/test_bl.c b/cesar/ce/rx/bitloading/test/src/test_bl.c
index 5a1e410d5d..0fabe28917 100644
--- a/cesar/ce/rx/bitloading/test/src/test_bl.c
+++ b/cesar/ce/rx/bitloading/test/src/test_bl.c
@@ -22,6 +22,7 @@
#include "ce/rx/bitloading/inc/bitloading.h"
#include "ce/rx/bitloading/bitloading.h"
#include "ce/rx/bitloading/inc/common.h"
+#include "ce/rx/bitloading/nsr.h"
#include "lib/rnd.h"
/* Test vectors. */
@@ -1936,7 +1937,7 @@ main (int argc, char **argv)
uint i;
for (i = 0; i < mean_on_sound_nsr_height;
i++)
- mean_on_sound_nsr[i][0] *= CE_RX_BL_BER_NSR_SOUND_RESCALE;
+ mean_on_sound_nsr[i][0] *= CE_RX_BL_NSR_SOUND_RESCALE;
/* BER target margin. */
test_suite_ce_rx_bl_ber_target_margin (t);
diff --git a/cesar/ce/rx/test/src/test_rx.c b/cesar/ce/rx/test/src/test_rx.c
index 9bc9d3162c..f01deb8e65 100644
--- a/cesar/ce/rx/test/src/test_rx.c
+++ b/cesar/ce/rx/test/src/test_rx.c
@@ -143,6 +143,7 @@ test_ce_rx_measure_suite (test_t t)
{
pbproc_rx_params_t rx_params;
rx_params.tei = 1;
+ rx_params.multi_net_bcast = false;
rx_params.preamble_ntb = 0;
rx_params.beacon_period_start_ntb = 42;
mac_store_t *mac_store = mac_store_init ();