[hamradio-commits] [gnss-sdr] 125/149: remove old code and unrequired includes
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Sat Feb 6 19:43:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.
commit b270d1ca615eb77090c2733b18c79fda1f8941a7
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Wed Jan 27 21:09:23 2016 +0100
remove old code and unrequired includes
---
.../tracking/libs/cpu_multicorrelator.cc | 2 +-
.../tracking/libs/cpu_multicorrelator_16sc.cc | 47 +++++-----------------
.../tracking/libs/cpu_multicorrelator_16sc.h | 2 -
3 files changed, 10 insertions(+), 41 deletions(-)
diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator.cc b/src/algorithms/tracking/libs/cpu_multicorrelator.cc
index 6c38ed6..0deea37 100644
--- a/src/algorithms/tracking/libs/cpu_multicorrelator.cc
+++ b/src/algorithms/tracking/libs/cpu_multicorrelator.cc
@@ -130,7 +130,7 @@ bool cpu_multicorrelator::Carrier_wipeoff_multicorrelator_resampler(
lv_32fc_t phase_offset_as_complex[1];
phase_offset_as_complex[0] = lv_cmake(std::cos(rem_carrier_phase_in_rad), -std::sin(rem_carrier_phase_in_rad));
- volk_32fc_s32fc_x2_rotator_32fc(d_sig_doppler_wiped, d_sig_in, std::exp(lv_32fc_t(0, -phase_step_rad)),phase_offset_as_complex, signal_length_samples);
+ volk_32fc_s32fc_x2_rotator_32fc(d_sig_doppler_wiped, d_sig_in, std::exp(lv_32fc_t(0, -phase_step_rad)), phase_offset_as_complex, signal_length_samples);
update_local_code(signal_length_samples,rem_code_phase_chips, code_phase_step_chips);
for (int current_correlator_tap = 0; current_correlator_tap < d_n_correlators; current_correlator_tap++)
{
diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.cc b/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.cc
index 9e27ba9..05a4f20 100644
--- a/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.cc
+++ b/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.cc
@@ -34,9 +34,7 @@
#include "cpu_multicorrelator_16sc.h"
#include <cmath>
-#include <iostream>
-#include <gnuradio/fxpt.h> // fixed point sine and cosine
-#include "volk_gnsssdr/volk_gnsssdr.h"
+
bool cpu_multicorrelator_16sc::init(
@@ -47,15 +45,15 @@ bool cpu_multicorrelator_16sc::init(
size_t size = max_signal_length_samples * sizeof(lv_16sc_t);
// NCO signal
- d_nco_in = static_cast<lv_16sc_t*>(volk_malloc(size, volk_get_alignment()));
+ d_nco_in = static_cast<lv_16sc_t*>(volk_gnsssdr_malloc(size, volk_gnsssdr_get_alignment()));
// Doppler-free signal
- d_sig_doppler_wiped = static_cast<lv_16sc_t*>(volk_malloc(size, volk_get_alignment()));
+ d_sig_doppler_wiped = static_cast<lv_16sc_t*>(volk_gnsssdr_malloc(size, volk_gnsssdr_get_alignment()));
d_local_codes_resampled = new lv_16sc_t*[n_correlators];
for (int n = 0; n < n_correlators; n++)
{
- d_local_codes_resampled[n] = static_cast<lv_16sc_t*>(volk_malloc(size, volk_get_alignment()));
+ d_local_codes_resampled[n] = static_cast<lv_16sc_t*>(volk_gnsssdr_malloc(size, volk_gnsssdr_get_alignment()));
}
d_n_correlators = n_correlators;
return true;
@@ -88,7 +86,7 @@ bool cpu_multicorrelator_16sc::set_input_output_vectors(lv_16sc_t* corr_out, con
void cpu_multicorrelator_16sc::update_local_code(int correlator_length_samples,float rem_code_phase_chips, float code_phase_step_chips)
{
float *tmp_code_phases_chips;
- tmp_code_phases_chips = static_cast<float*>(volk_malloc(d_n_correlators*sizeof(float), volk_get_alignment()));
+ tmp_code_phases_chips = static_cast<float*>(volk_gnsssdr_malloc(d_n_correlators*sizeof(float), volk_gnsssdr_get_alignment()));
for (int n = 0; n < d_n_correlators; n++)
{
tmp_code_phases_chips[n] = d_shifts_chips[n] - rem_code_phase_chips;
@@ -102,37 +100,10 @@ void cpu_multicorrelator_16sc::update_local_code(int correlator_length_samples,f
d_n_correlators,
d_code_length_chips);
- volk_free(tmp_code_phases_chips);
-
-// float local_code_chip_index;
-// for (int current_correlator_tap = 0; current_correlator_tap < d_n_correlators; current_correlator_tap++)
-// {
-// for (int n = 0; n < correlator_length_samples; n++)
-// {
-// // resample code for current tap
-// local_code_chip_index = std::fmod(code_phase_step_chips*static_cast<float>(n)+ d_shifts_chips[current_correlator_tap] - rem_code_phase_chips, d_code_length_chips);
-// //Take into account that in multitap correlators, the shifts can be negative!
-// if (local_code_chip_index < 0.0) local_code_chip_index += d_code_length_chips;
-// d_local_codes_resampled[current_correlator_tap][n] = d_local_code_in[static_cast<int>(round(local_code_chip_index))];
-// }
-// }
+ volk_gnsssdr_free(tmp_code_phases_chips);
}
-void cpu_multicorrelator_16sc::update_local_carrier(int correlator_length_samples, float rem_carr_phase_rad, float phase_step_rad)
-{
- float sin_f, cos_f;
- int phase_step_rad_i = gr::fxpt::float_to_fixed(phase_step_rad);
- int phase_rad_i = gr::fxpt::float_to_fixed(rem_carr_phase_rad);
-
- for(int i = 0; i < correlator_length_samples; i++)
- {
- gr::fxpt::sincos(phase_rad_i, &sin_f, &cos_f);
- d_nco_in[i] = lv_16sc_t((short int)(cos_f*2.0), (short int)(-sin_f*2.0));
- phase_rad_i += phase_step_rad_i;
- }
-}
-
bool cpu_multicorrelator_16sc::Carrier_wipeoff_multicorrelator_resampler(
float rem_carrier_phase_in_rad,
float phase_step_rad,
@@ -165,11 +136,11 @@ cpu_multicorrelator_16sc::cpu_multicorrelator_16sc()
bool cpu_multicorrelator_16sc::free()
{
// Free memory
- if (d_sig_doppler_wiped != NULL) volk_free(d_sig_doppler_wiped);
- if (d_nco_in != NULL) volk_free(d_nco_in);
+ if (d_sig_doppler_wiped != NULL) volk_gnsssdr_free(d_sig_doppler_wiped);
+ if (d_nco_in != NULL) volk_gnsssdr_free(d_nco_in);
for (int n = 0; n < d_n_correlators; n++)
{
- volk_free(d_local_codes_resampled[n]);
+ volk_gnsssdr_free(d_local_codes_resampled[n]);
}
delete d_local_codes_resampled;
return true;
diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.h b/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.h
index d3fa690..1c5163c 100644
--- a/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.h
+++ b/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.h
@@ -35,7 +35,6 @@
#ifndef GNSS_SDR_CPU_MULTICORRELATOR_16SC_H_
#define GNSS_SDR_CPU_MULTICORRELATOR_16SC_H_
-#include <volk/volk.h> //include original volk first!
#include <volk_gnsssdr/volk_gnsssdr.h>
@@ -50,7 +49,6 @@ public:
bool set_local_code_and_taps(int code_length_chips, const lv_16sc_t* local_code_in, float *shifts_chips);
bool set_input_output_vectors(lv_16sc_t* corr_out, const lv_16sc_t* sig_in);
void update_local_code(int correlator_length_samples, float rem_code_phase_chips, float code_phase_step_chips);
- void update_local_carrier(int correlator_length_samples, float rem_carr_phase_rad, float phase_step_rad);
bool Carrier_wipeoff_multicorrelator_resampler(float rem_carrier_phase_in_rad, float phase_step_rad, float rem_code_phase_chips, float code_phase_step_chips, int signal_length_samples);
bool free();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list