aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Munaut <tnt@246tNt.com>2012-05-23 19:27:01 +0200
committerSylvain Munaut <tnt@246tNt.com>2012-05-23 19:27:01 +0200
commit0a2560db76618a1d95c9d02add9a0ef692cde088 (patch)
tree15e5350cf9e204c27fd4d2e0fa029c4c1bdd9ee6
parente03f966590eb80ec756aa6d0542b45895d95457b (diff)
cxvec_math: Mark input vectors as 'const' where applicable
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
-rw-r--r--include/osmocom/dsp/cxvec_math.h17
-rw-r--r--src/cxvec_math.c17
2 files changed, 18 insertions, 16 deletions
diff --git a/include/osmocom/dsp/cxvec_math.h b/include/osmocom/dsp/cxvec_math.h
index d7b580e..a35f0a5 100644
--- a/include/osmocom/dsp/cxvec_math.h
+++ b/include/osmocom/dsp/cxvec_math.h
@@ -71,11 +71,11 @@ osmo_normsqf(float complex c)
/* Complex vector math */
struct osmo_cxvec *
-osmo_cxvec_scale(struct osmo_cxvec *in, float complex scale,
+osmo_cxvec_scale(const struct osmo_cxvec *in, float complex scale,
struct osmo_cxvec *out);
struct osmo_cxvec *
-osmo_cxvec_rotate(struct osmo_cxvec *in, float freq_shift,
+osmo_cxvec_rotate(const struct osmo_cxvec *in, float freq_shift,
struct osmo_cxvec *out);
/*! \brief Various possible types of convolution span */
@@ -89,15 +89,15 @@ enum osmo_cxvec_conv_type {
};
struct osmo_cxvec *
-osmo_cxvec_convolve(struct osmo_cxvec *f, struct osmo_cxvec *g,
+osmo_cxvec_convolve(const struct osmo_cxvec *f, const struct osmo_cxvec *g,
enum osmo_cxvec_conv_type type, struct osmo_cxvec *out);
struct osmo_cxvec *
-osmo_cxvec_correlate(struct osmo_cxvec *f, struct osmo_cxvec *g, int g_corr_step,
- struct osmo_cxvec *out);
+osmo_cxvec_correlate(const struct osmo_cxvec *f, const struct osmo_cxvec *g,
+ int g_corr_step, struct osmo_cxvec *out);
float complex
-osmo_cxvec_interpolate_point(struct osmo_cxvec *cv, float pos);
+osmo_cxvec_interpolate_point(const struct osmo_cxvec *cv, float pos);
/*! \brief Various possible peak finding algorithms */
enum osmo_cxvec_peak_alg {
@@ -110,12 +110,13 @@ enum osmo_cxvec_peak_alg {
};
float
-osmo_cxvec_peak_energy_find(struct osmo_cxvec *cv, int win_size,
+osmo_cxvec_peak_energy_find(const struct osmo_cxvec *cv, int win_size,
enum osmo_cxvec_peak_alg alg,
float complex *peak_val_p);
struct osmo_cxvec *
-osmo_cxvec_sig_normalize(struct osmo_cxvec *sig, int decim, float freq_shift,
+osmo_cxvec_sig_normalize(const struct osmo_cxvec *sig,
+ int decim, float freq_shift,
struct osmo_cxvec *out);
/*! @} */
diff --git a/src/cxvec_math.c b/src/cxvec_math.c
index 45df8d2..7c7dfd7 100644
--- a/src/cxvec_math.c
+++ b/src/cxvec_math.c
@@ -52,7 +52,7 @@
* to contain the result (i.e. in->len)
*/
struct osmo_cxvec *
-osmo_cxvec_scale(struct osmo_cxvec *in, float complex scale,
+osmo_cxvec_scale(const struct osmo_cxvec *in, float complex scale,
struct osmo_cxvec *out)
{
int i;
@@ -109,7 +109,7 @@ osmo_cxvec_scale(struct osmo_cxvec *in, float complex scale,
* to contain the result (i.e. in->len)
*/
struct osmo_cxvec *
-osmo_cxvec_rotate(struct osmo_cxvec *in, float rps,
+osmo_cxvec_rotate(const struct osmo_cxvec *in, float rps,
struct osmo_cxvec *out)
{
int i;
@@ -150,7 +150,7 @@ osmo_cxvec_rotate(struct osmo_cxvec *in, float rps,
* (length depends on the exact convolution type)
*/
struct osmo_cxvec *
-osmo_cxvec_convolve(struct osmo_cxvec *f, struct osmo_cxvec *g,
+osmo_cxvec_convolve(const struct osmo_cxvec *f, const struct osmo_cxvec *g,
enum osmo_cxvec_conv_type type, struct osmo_cxvec *out)
{
int Lf, Lg, Lo, si, ei, i, jf, jg;
@@ -257,8 +257,8 @@ osmo_cxvec_convolve(struct osmo_cxvec *f, struct osmo_cxvec *g,
* (i.e. g->len - f->len + 1)
*/
struct osmo_cxvec *
-osmo_cxvec_correlate(struct osmo_cxvec *f, struct osmo_cxvec *g, int g_corr_step,
- struct osmo_cxvec *out)
+osmo_cxvec_correlate(const struct osmo_cxvec *f, const struct osmo_cxvec *g,
+ int g_corr_step, struct osmo_cxvec *out)
{
int l, m, n, mn;
int f_real, g_real;
@@ -321,7 +321,7 @@ osmo_cxvec_correlate(struct osmo_cxvec *f, struct osmo_cxvec *g, int g_corr_step
* pos must be >= 0 and < cv->len
*/
float complex
-osmo_cxvec_interpolate_point(struct osmo_cxvec *cv, float pos)
+osmo_cxvec_interpolate_point(const struct osmo_cxvec *cv, float pos)
{
const int N = 10;
int b, e, i;
@@ -361,7 +361,7 @@ osmo_cxvec_interpolate_point(struct osmo_cxvec *cv, float pos)
* \returns Peak position with sub-sample accuracy
*/
float
-osmo_cxvec_peak_energy_find(struct osmo_cxvec *cv, int win_size,
+osmo_cxvec_peak_energy_find(const struct osmo_cxvec *cv, int win_size,
enum osmo_cxvec_peak_alg alg,
float complex *peak_val_p)
{
@@ -490,7 +490,8 @@ osmo_cxvec_peak_energy_find(struct osmo_cxvec *cv, int win_size,
* the result (i.e. (sig->len + decim - 1) / decim)
*/
struct osmo_cxvec *
-osmo_cxvec_sig_normalize(struct osmo_cxvec *sig, int decim, float freq_shift,
+osmo_cxvec_sig_normalize(const struct osmo_cxvec *sig,
+ int decim, float freq_shift,
struct osmo_cxvec *out)
{
float complex avg = 0.0f;