mirrors
/
gnss-sdr
mirror of https://github.com/gnss-sdr/gnss-sdr
1
0
Fork 0
Code Issues Releases Wiki Activity

Make clang-format happy

This commit is contained in:
Carles Fernandez 2022-11-24 09:12:33 +01:00
parent 0db9c2c442
commit a8e7392f4a
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
4 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
src/algorithms/libs/opencl/cl.hpp
View File

@ -187,7 +187,7 @@
#if !defined(CL_CALLBACK) #if !defined(CL_CALLBACK)
#define CL_CALLBACK #define CL_CALLBACK
#endif //CL_CALLBACK #endif // CL_CALLBACK
#include <iterator> #include <iterator>
#include <limits> #include <limits>
@ -1070,8 +1070,8 @@ namespace detail
#define __DEFAULT_INITIALIZED 4 #define __DEFAULT_INITIALIZED 4
/* /*
* Compare and exchange primitives are needed for handling of defaults * Compare and exchange primitives are needed for handling of defaults
*/ */
#ifdef CL_HPP_CPP11_ATOMICS_SUPPORTED #ifdef CL_HPP_CPP11_ATOMICS_SUPPORTED
inline int compare_exchange(std::atomic<int>* dest, int exchange, int comparand) inline int compare_exchange(std::atomic<int>* dest, int exchange, int comparand)
@ -3460,9 +3460,9 @@ public:
bool readOnly, bool useHostPtr = false, cl_int* err = nullptr); bool readOnly, bool useHostPtr = false, cl_int* err = nullptr);
/*! /*!
* \brief Construct a Buffer from a host container via iterators using a specified queue. * \brief Construct a Buffer from a host container via iterators using a specified queue.
* If useHostPtr is specified iterators must represent contiguous data. * If useHostPtr is specified iterators must represent contiguous data.
*/ */
template <typename IteratorType> template <typename IteratorType>
Buffer(const CommandQueue& queue, IteratorType startIterator, IteratorType endIterator, Buffer(const CommandQueue& queue, IteratorType startIterator, IteratorType endIterator,
bool readOnly, bool useHostPtr = false, cl_int* err = nullptr); bool readOnly, bool useHostPtr = false, cl_int* err = nullptr);
@ -3626,13 +3626,13 @@ public:
} }
/*! \brief Copy constructor to forward copy to the superclass correctly. /*! \brief Copy constructor to forward copy to the superclass correctly.
* Required for MSVC. * Required for MSVC.
*/ */
BufferD3D10(const BufferD3D10& buf) : Buffer(buf) {} BufferD3D10(const BufferD3D10& buf) : Buffer(buf) {}
/*! \brief Copy assignment to forward copy to the superclass correctly. /*! \brief Copy assignment to forward copy to the superclass correctly.
* Required for MSVC. * Required for MSVC.
*/ */
BufferD3D10& operator=(const BufferD3D10& buf) BufferD3D10& operator=(const BufferD3D10& buf)
{ {
Buffer::operator=(buf); Buffer::operator=(buf);
@ -3641,13 +3641,13 @@ public:
#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED)
/*! \brief Move constructor to forward move to the superclass correctly. /*! \brief Move constructor to forward move to the superclass correctly.
* Required for MSVC. * Required for MSVC.
*/ */
BufferD3D10(BufferD3D10&& buf) CL_HPP_NOEXCEPT : Buffer(std::move(buf)) {} BufferD3D10(BufferD3D10&& buf) CL_HPP_NOEXCEPT : Buffer(std::move(buf)) {}
/*! \brief Move assignment to forward move to the superclass correctly. /*! \brief Move assignment to forward move to the superclass correctly.
* Required for MSVC. * Required for MSVC.
*/ */
BufferD3D10& operator=(BufferD3D10&& buf) BufferD3D10& operator=(BufferD3D10&& buf)
{ {
Buffer::operator=(std::move(buf)); Buffer::operator=(std::move(buf));
@ -3713,13 +3713,13 @@ public:
} }
/*! \brief Copy constructor to forward copy to the superclass correctly. /*! \brief Copy constructor to forward copy to the superclass correctly.
* Required for MSVC. * Required for MSVC.
*/ */
BufferGL(const BufferGL& buf) : Buffer(buf) {} BufferGL(const BufferGL& buf) : Buffer(buf) {}
/*! \brief Copy assignment to forward copy to the superclass correctly. /*! \brief Copy assignment to forward copy to the superclass correctly.
* Required for MSVC. * Required for MSVC.
*/ */
BufferGL& operator=(const BufferGL& buf) BufferGL& operator=(const BufferGL& buf)
{ {
Buffer::operator=(buf); Buffer::operator=(buf);
@ -3728,13 +3728,13 @@ public:
#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED)
/*! \brief Move constructor to forward move to the superclass correctly. /*! \brief Move constructor to forward move to the superclass correctly.
* Required for MSVC. * Required for MSVC.
*/ */
BufferGL(BufferGL&& buf) CL_HPP_NOEXCEPT : Buffer(std::move(buf)) {} BufferGL(BufferGL&& buf) CL_HPP_NOEXCEPT : Buffer(std::move(buf)) {}
/*! \brief Move assignment to forward move to the superclass correctly. /*! \brief Move assignment to forward move to the superclass correctly.
* Required for MSVC. * Required for MSVC.
*/ */
BufferGL& operator=(BufferGL&& buf) BufferGL& operator=(BufferGL&& buf)
{ {
Buffer::operator=(std::move(buf)); Buffer::operator=(std::move(buf));
@ -4703,26 +4703,26 @@ public:
#endif // #if defined(CL_VERSION_1_2) #endif // #if defined(CL_VERSION_1_2)
/*! \brief Class interface for GL Render Buffer Memory Objects. /*! \brief Class interface for GL Render Buffer Memory Objects.
* *
* This is provided to facilitate interoperability with OpenGL. * This is provided to facilitate interoperability with OpenGL.
* *
* See Memory for details about copy semantics, etc. * See Memory for details about copy semantics, etc.
* *
* \see Memory * \see Memory
*/ */
class BufferRenderGL : class BufferRenderGL :
#if defined(CL_VERSION_1_2) #if defined(CL_VERSION_1_2)
public ImageGL public ImageGL
#else // #if defined(CL_VERSION_1_2) #else // #if defined(CL_VERSION_1_2)
public Image2DGL public Image2DGL
#endif //#if defined(CL_VERSION_1_2) #endif // #if defined(CL_VERSION_1_2)
{ {
public: public:
/*! \brief Constructs a BufferRenderGL in a specified context, from a given /*! \brief Constructs a BufferRenderGL in a specified context, from a given
* GL Renderbuffer. * GL Renderbuffer.
* *
* Wraps clCreateFromGLRenderbuffer(). * Wraps clCreateFromGLRenderbuffer().
*/ */
BufferRenderGL( BufferRenderGL(
const Context& context, const Context& context,
cl_mem_flags flags, cl_mem_flags flags,
@ -4748,12 +4748,12 @@ public:
BufferRenderGL() : ImageGL(){}; BufferRenderGL() : ImageGL(){};
#else // #if defined(CL_VERSION_1_2) #else // #if defined(CL_VERSION_1_2)
BufferRenderGL() : Image2DGL(){}; BufferRenderGL() : Image2DGL(){};
#endif //#if defined(CL_VERSION_1_2) #endif // #if defined(CL_VERSION_1_2)
/*! \brief Constructor from cl_mem - takes ownership. /*! \brief Constructor from cl_mem - takes ownership.
* *
* See Memory for further details. * See Memory for further details.
*/ */
#if defined(CL_VERSION_1_2) #if defined(CL_VERSION_1_2)
__CL_EXPLICIT_CONSTRUCTORS BufferRenderGL(const cl_mem& buffer) : ImageGL(buffer) __CL_EXPLICIT_CONSTRUCTORS BufferRenderGL(const cl_mem& buffer) : ImageGL(buffer)
{ {
@ -4762,27 +4762,27 @@ public:
__CL_EXPLICIT_CONSTRUCTORS BufferRenderGL(const cl_mem& buffer) : Image2DGL(buffer) __CL_EXPLICIT_CONSTRUCTORS BufferRenderGL(const cl_mem& buffer) : Image2DGL(buffer)
{ {
} }
#endif //#if defined(CL_VERSION_1_2) #endif // #if defined(CL_VERSION_1_2)
/*! \brief Assignment from cl_mem - performs shallow copy. /*! \brief Assignment from cl_mem - performs shallow copy.
* *
* See Memory for further details. * See Memory for further details.
*/ */
BufferRenderGL& operator=(const cl_mem& rhs) BufferRenderGL& operator=(const cl_mem& rhs)
{ {
#if defined(CL_VERSION_1_2) #if defined(CL_VERSION_1_2)
ImageGL::operator=(rhs); ImageGL::operator=(rhs);
#else // #if defined(CL_VERSION_1_2) #else // #if defined(CL_VERSION_1_2)
Image2DGL::operator=(rhs); Image2DGL::operator=(rhs);
#endif //#if defined(CL_VERSION_1_2) #endif // #if defined(CL_VERSION_1_2)
return *this; return *this;
} }
/*! \brief Copy constructor to forward copy to the superclass correctly. /*! \brief Copy constructor to forward copy to the superclass correctly.
* Required for MSVC. * Required for MSVC.
*/ */
#if defined(CL_VERSION_1_2) #if defined(CL_VERSION_1_2)
BufferRenderGL(const BufferRenderGL& buf) : ImageGL(buf) BufferRenderGL(const BufferRenderGL& buf) : ImageGL(buf)
{ {
@ -4791,25 +4791,25 @@ public:
BufferRenderGL(const BufferRenderGL& buf) : Image2DGL(buf) BufferRenderGL(const BufferRenderGL& buf) : Image2DGL(buf)
{ {
} }
#endif //#if defined(CL_VERSION_1_2) #endif // #if defined(CL_VERSION_1_2)
/*! \brief Copy assignment to forward copy to the superclass correctly. /*! \brief Copy assignment to forward copy to the superclass correctly.
* Required for MSVC. * Required for MSVC.
*/ */
BufferRenderGL& operator=(const BufferRenderGL& rhs) BufferRenderGL& operator=(const BufferRenderGL& rhs)
{ {
#if defined(CL_VERSION_1_2) #if defined(CL_VERSION_1_2)
ImageGL::operator=(rhs); ImageGL::operator=(rhs);
#else // #if defined(CL_VERSION_1_2) #else // #if defined(CL_VERSION_1_2)
Image2DGL::operator=(rhs); Image2DGL::operator=(rhs);
#endif //#if defined(CL_VERSION_1_2) #endif // #if defined(CL_VERSION_1_2)
return *this; return *this;
} }
#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED)
/*! \brief Move constructor to forward move to the superclass correctly. /*! \brief Move constructor to forward move to the superclass correctly.
* Required for MSVC. * Required for MSVC.
*/ */
#if defined(CL_VERSION_1_2) #if defined(CL_VERSION_1_2)
BufferRenderGL(BufferRenderGL&& buf) CL_HPP_NOEXCEPT : ImageGL(std::move(buf)) BufferRenderGL(BufferRenderGL&& buf) CL_HPP_NOEXCEPT : ImageGL(std::move(buf))
{ {
@ -4818,19 +4818,19 @@ public:
BufferRenderGL(BufferRenderGL&& buf) CL_HPP_NOEXCEPT : Image2DGL(std::move(buf)) BufferRenderGL(BufferRenderGL&& buf) CL_HPP_NOEXCEPT : Image2DGL(std::move(buf))
{ {
} }
#endif //#if defined(CL_VERSION_1_2) #endif // #if defined(CL_VERSION_1_2)
/*! \brief Move assignment to forward move to the superclass correctly. /*! \brief Move assignment to forward move to the superclass correctly.
* Required for MSVC. * Required for MSVC.
*/ */
BufferRenderGL& operator=(BufferRenderGL&& buf) BufferRenderGL& operator=(BufferRenderGL&& buf)
{ {
#if defined(CL_VERSION_1_2) #if defined(CL_VERSION_1_2)
ImageGL::operator=(std::move(buf)); ImageGL::operator=(std::move(buf));
#else // #if defined(CL_VERSION_1_2) #else // #if defined(CL_VERSION_1_2)
Image2DGL::operator=(std::move(buf)); Image2DGL::operator=(std::move(buf));
#endif //#if defined(CL_VERSION_1_2) #endif // #if defined(CL_VERSION_1_2)
return *this; return *this;
} }
@ -5066,7 +5066,7 @@ Local(::size_t size)
return ret; return ret;
} }
//class KernelFunctor; // class KernelFunctor;
/*! \brief Class interface for cl_kernel. /*! \brief Class interface for cl_kernel.
* *
@ -5780,8 +5780,8 @@ public:
} }
} }
/*! /*!
* \brief Constructs a CommandQueue for an implementation defined device in the given context * \brief Constructs a CommandQueue for an implementation defined device in the given context
*/ */
explicit CommandQueue( explicit CommandQueue(
const Context& context, const Context& context,
cl_command_queue_properties properties = 0, cl_command_queue_properties properties = 0,

4
src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
View File

@ -713,7 +713,7 @@ int glonass_l2_ca_dll_pll_c_aid_tracking_cc::general_work(int noutput_items __at
d_correlation_length_samples = K_prn_samples + d_rem_code_phase_integer_samples; d_correlation_length_samples = K_prn_samples + d_rem_code_phase_integer_samples;
d_rem_code_phase_samples = d_rem_code_phase_samples - d_rem_code_phase_integer_samples; d_rem_code_phase_samples = d_rem_code_phase_samples - d_rem_code_phase_integer_samples;
//################### PLL COMMANDS ################################################# // ################### PLL COMMANDS #################################################
// carrier phase step (NCO phase increment per sample) [rads/sample] // carrier phase step (NCO phase increment per sample) [rads/sample]
d_carrier_phase_step_rad = TWO_PI * d_carrier_frequency_hz / static_cast<double>(d_fs_in); d_carrier_phase_step_rad = TWO_PI * d_carrier_frequency_hz / static_cast<double>(d_fs_in);
d_acc_carrier_phase_cycles -= d_carrier_phase_step_rad * d_correlation_length_samples / TWO_PI; d_acc_carrier_phase_cycles -= d_carrier_phase_step_rad * d_correlation_length_samples / TWO_PI;
@ -722,7 +722,7 @@ int glonass_l2_ca_dll_pll_c_aid_tracking_cc::general_work(int noutput_items __at
// remnant carrier phase [rad] // remnant carrier phase [rad]
d_rem_carrier_phase_rad = fmod(d_rem_carrier_phase_rad + TWO_PI * d_carrier_frequency_hz * CORRECTED_INTEGRATION_TIME_S, TWO_PI); d_rem_carrier_phase_rad = fmod(d_rem_carrier_phase_rad + TWO_PI * d_carrier_frequency_hz * CORRECTED_INTEGRATION_TIME_S, TWO_PI);
//################### DLL COMMANDS ################################################# // ################### DLL COMMANDS #################################################
// code phase step (Code resampler phase increment per sample) [chips/sample] // code phase step (Code resampler phase increment per sample) [chips/sample]
d_code_phase_step_chips = d_code_freq_chips / static_cast<double>(d_fs_in); d_code_phase_step_chips = d_code_freq_chips / static_cast<double>(d_fs_in);
// remnant code phase [chips] // remnant code phase [chips]

4
src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_gaussian_tracking_cc.cc
View File

@ -728,13 +728,13 @@ int Gps_L1_Ca_Gaussian_Tracking_cc::general_work(int noutput_items __attribute__
double K_blk_samples = T_prn_samples + d_rem_code_phase_samples + code_error_filt_secs * static_cast<double>(d_fs_in); double K_blk_samples = T_prn_samples + d_rem_code_phase_samples + code_error_filt_secs * static_cast<double>(d_fs_in);
d_current_prn_length_samples = static_cast<int>(round(K_blk_samples)); // round to a discrete number of samples d_current_prn_length_samples = static_cast<int>(round(K_blk_samples)); // round to a discrete number of samples
//################### NCO COMMANDS ################################################# // ################### NCO COMMANDS #################################################
// carrier phase step (NCO phase increment per sample) [rads/sample] // carrier phase step (NCO phase increment per sample) [rads/sample]
d_carrier_phase_step_rad = TWO_PI * d_carrier_doppler_hz / static_cast<double>(d_fs_in); d_carrier_phase_step_rad = TWO_PI * d_carrier_doppler_hz / static_cast<double>(d_fs_in);
// carrier phase accumulator // carrier phase accumulator
d_acc_carrier_phase_rad -= d_carrier_phase_step_rad * static_cast<double>(d_current_prn_length_samples); d_acc_carrier_phase_rad -= d_carrier_phase_step_rad * static_cast<double>(d_current_prn_length_samples);
//################### DLL COMMANDS ################################################# // ################### DLL COMMANDS #################################################
// code phase step (Code resampler phase increment per sample) [chips/sample] // code phase step (Code resampler phase increment per sample) [chips/sample]
d_code_phase_step_chips = d_code_freq_chips / static_cast<double>(d_fs_in); d_code_phase_step_chips = d_code_freq_chips / static_cast<double>(d_fs_in);
// remnant code phase [chips] // remnant code phase [chips]

2
src/utils/front-end-cal/front_end_cal.cc
View File

@ -69,7 +69,7 @@ bool FrontEndCal::read_assistance_from_XML()
int FrontEndCal::Get_SUPL_Assist() int FrontEndCal::Get_SUPL_Assist()
{ {
//######### GNSS Assistance ################################# // ######### GNSS Assistance #################################
Gnss_Sdr_Supl_Client supl_client_acquisition_; Gnss_Sdr_Supl_Client supl_client_acquisition_;
Gnss_Sdr_Supl_Client supl_client_ephemeris_; Gnss_Sdr_Supl_Client supl_client_ephemeris_;
int supl_mcc; // Current network MCC (Mobile country code), 3 digits. int supl_mcc; // Current network MCC (Mobile country code), 3 digits.