[hamradio-commits] [gnss-sdr] 141/236: Removing unused class (nco_lib, replaced by volk kernels)
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Tue Apr 26 16:02:45 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 36660e05ca3631ddf166c3c263536ba05241a343
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Wed Mar 30 22:37:43 2016 +0200
Removing unused class (nco_lib, replaced by volk kernels)
---
src/algorithms/libs/CMakeLists.txt | 1 -
src/algorithms/libs/nco_lib.cc | 106 -------------------------------------
src/algorithms/libs/nco_lib.h | 87 ------------------------------
3 files changed, 194 deletions(-)
diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt
index 7a09d88..f2602eb 100644
--- a/src/algorithms/libs/CMakeLists.txt
+++ b/src/algorithms/libs/CMakeLists.txt
@@ -23,7 +23,6 @@ set(GNSS_SPLIBS_SOURCES
gnss_sdr_valve.cc
gnss_signal_processing.cc
gps_sdr_signal_processing.cc
- nco_lib.cc
pass_through.cc
galileo_e5_signal_processing.cc
complex_byte_to_float_x2.cc
diff --git a/src/algorithms/libs/nco_lib.cc b/src/algorithms/libs/nco_lib.cc
deleted file mode 100644
index bd884a2..0000000
--- a/src/algorithms/libs/nco_lib.cc
+++ /dev/null
@@ -1,106 +0,0 @@
-/*!
- * \file nco_lib.cc
- * \brief A set of Numeric Controlled Oscillator (NCO) functions to generate the carrier wipeoff signal,
- * regardless of system used
- *
- * \author Javier Arribas 2012, jarribas(at)cttc.es
- *
- * Detailed description of the file here if needed.
- *
- * -------------------------------------------------------------------------
- *
- * Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)
- *
- * GNSS-SDR is a software defined Global Navigation
- * Satellite Systems receiver
- *
- * This file is part of GNSS-SDR.
- *
- * GNSS-SDR is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * GNSS-SDR is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
- *
- * -------------------------------------------------------------------------
- */
-
-#include "nco_lib.h"
-#include <cmath>
-
-
-void fxp_nco(std::complex<float> *dest, int n_samples, float start_phase_rad, float phase_step_rad)
-{
- int phase_rad_i;
- phase_rad_i = gr::fxpt::float_to_fixed(start_phase_rad);
- int phase_step_rad_i;
- phase_step_rad_i = gr::fxpt::float_to_fixed(phase_step_rad);
- float sin_f,cos_f;
-
- for(int i = 0; i < n_samples; i++)
- {
- //using temp variables
- gr::fxpt::sincos(-phase_rad_i,&sin_f,&cos_f);
- dest[i] = gr_complex(cos_f, sin_f);
- phase_rad_i += phase_step_rad_i;
- }
-}
-
-void fxp_nco_cpyref(std::complex<float> *dest, int n_samples, float start_phase_rad, float phase_step_rad)
-{
- int phase_rad_i;
- phase_rad_i = gr::fxpt::float_to_fixed(start_phase_rad);
- int phase_step_rad_i;
- phase_step_rad_i = gr::fxpt::float_to_fixed(phase_step_rad);
-
- float* vector_cpx;
- vector_cpx = (float*)dest;
- for(int i = 0; i < n_samples; i++)
- {
- //using references (maybe it can be a problem for c++11 ?)
- //gr_fxpt::sincos(phase_rad_i,&d_carr_sign[i].imag(),&d_carr_sign[i].real());
- gr::fxpt::sincos(-phase_rad_i, &vector_cpx[i*2+1], &vector_cpx[i*2]);
- phase_rad_i += phase_step_rad_i;
-
- }
-}
-
-void fxp_nco_IQ_split(float* I, float* Q , int n_samples,float start_phase_rad, float phase_step_rad)
-{
- int phase_rad_i;
- phase_rad_i = gr::fxpt::float_to_fixed(start_phase_rad);
- int phase_step_rad_i;
- phase_step_rad_i = gr::fxpt::float_to_fixed(phase_step_rad);
-
- float sin_f,cos_f;
- for(int i = 0; i < n_samples; i++)
- {
- gr::fxpt::sincos(-phase_rad_i,&sin_f,&cos_f);
- I[i] = cos_f;
- Q[i] = sin_f;
- phase_rad_i += phase_step_rad_i;
-
- }
-}
-
-
-
-void std_nco(std::complex<float> *dest, int n_samples, float start_phase_rad, float phase_step_rad)
-{
- float phase_rad;
- phase_rad = start_phase_rad;
-
- for(int i = 0; i < n_samples; i++)
- {
- // Using std::cos and std::sin
- dest[i] = gr_complex(std::cos(phase_rad), -std::sin(phase_rad));
- phase_rad = phase_rad+phase_step_rad;
- }
-}
diff --git a/src/algorithms/libs/nco_lib.h b/src/algorithms/libs/nco_lib.h
deleted file mode 100644
index d153a28..0000000
--- a/src/algorithms/libs/nco_lib.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*!
- * \file nco_lib.h
- * \brief A set of Numeric Controlled Oscillator (NCO) functions to generate the carrier wipeoff signal,
- * regardless of system used
- *
- * \author Javier Arribas 2012, jarribas(at)cttc.es
- *
- * Detailed description of the file here if needed.
- *
- * -------------------------------------------------------------------------
- *
- * Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)
- *
- * GNSS-SDR is a software defined Global Navigation
- * Satellite Systems receiver
- *
- * This file is part of GNSS-SDR.
- *
- * GNSS-SDR is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * GNSS-SDR is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
- *
- * -------------------------------------------------------------------------
- */
-
-
-
-#ifndef GNSS_SDR_NCO_LIB_CC_H_
-#define GNSS_SDR_NCO_LIB_CC_H_
-
-#include <gnuradio/fxpt.h>
-
-
-/*!
- * \brief Implements a complex conjugate exponential vector in std::complex<float> *d_carr_sign
- * containing int n_samples, with the starting phase float start_phase_rad and the pase step between vector elements
- * float phase_step_rad. This function uses a SSE CORDIC implementation.
- *
- */
-void sse_nco(std::complex<float> *dest, int n_samples,float start_phase_rad, float phase_step_rad);
-
-/*!
- * \brief Implements a complex conjugate exponential vector in std::complex<float> *d_carr_sign
- * containing int n_samples, with the starting phase float start_phase_rad and the pase step between vector elements
- * float phase_step_rad. This function uses the GNU Radio fixed point CORDIC implementation.
- *
- */
-void fxp_nco(std::complex<float> *dest, int n_samples,float start_phase_rad, float phase_step_rad);
-
-/*!
- * \brief Implements a complex conjugate exponential vector in std::complex<float> *d_carr_sign
- * containing int n_samples, with the starting phase float start_phase_rad and the pase step between vector elements
- * float phase_step_rad. This function uses the stdlib sin() and cos() implementation.
- *
- */
-
-void std_nco(std::complex<float> *dest, int n_samples,float start_phase_rad, float phase_step_rad);
-
-/*!
- * \brief Implements a complex conjugate exponential vector in std::complex<float> *d_carr_sign
- * containing int n_samples, with the starting phase float start_phase_rad and the pase step between vector elements
- * float phase_step_rad. This function uses the GNU Radio fixed point CORDIC implementation.
- *
- */
-
-void fxp_nco_cpyref(std::complex<float> *dest, int n_samples,float start_phase_rad, float phase_step_rad);
-
-
-/*!
- * \brief Implements a complex conjugate exponential vector in two separated float arrays (In-phase and Quadrature)
- * containing int n_samples, with the starting phase float start_phase_rad and the pase step between vector elements
- * float phase_step_rad. This function uses the GNU Radio fixed point CORDIC implementation.
- *
- */
-
-void fxp_nco_IQ_split(float* I, float* Q, int n_samples,float start_phase_rad, float phase_step_rad);
-
-#endif //NCO_LIB_CC_H
--
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