From 1b49c432b29fa01a29df268173c22e245351452a Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 7 Nov 2014 18:02:52 +0100 Subject: [PATCH] AAdding copyright and some fixes --- .../libs/volk_gnsssdr_module/CMakeLists.txt | 12 +++---- .../volk_gnsssdr/CMakeLists.txt | 10 +++--- .../volk_gnsssdr/apps/CMakeLists.txt | 10 +++--- .../apps/volk_gnsssdr-config-info.cc | 24 +++++++------- .../volk_gnsssdr/apps/volk_gnsssdr_profile.cc | 33 ++++++++----------- .../volk_gnsssdr/cmake/FindORC.cmake | 3 -- .../volk_gnsssdr/cmake/GrPython.cmake | 2 +- .../gen/volk_gnsssdr_compile_utils.py | 10 +++--- .../gen/volk_gnsssdr_kernel_defs.py | 17 +++++----- .../gen/volk_gnsssdr_machine_defs.py | 10 +++--- .../gen/volk_gnsssdr_tmpl_utils.py | 16 ++++----- .../include/volk_gnsssdr/constants.h | 17 ++++------ .../volk_gnsssdr/volk_gnsssdr_common.h | 18 ++++++++++ .../volk_gnsssdr/volk_gnsssdr_complex.h | 18 ++++++++++ .../volk_gnsssdr/volk_gnsssdr_malloc.h | 17 ++++------ .../include/volk_gnsssdr/volk_gnsssdr_prefs.h | 18 ++++++++++ .../kernels/CommonMacros/CommonMacros.h | 4 +-- .../CommonMacros_16ic_cw_epl_corr_32fc.h | 4 +-- .../CommonMacros_8ic_cw_epl_corr_32fc.h | 5 +-- ...ssdr_32fc_s32f_x4_update_local_code_32fc.h | 7 ++-- .../volk_gnsssdr/lib/CMakeLists.txt | 17 +++++++--- .../volk_gnsssdr/lib/constants.c.in | 17 ++++------ .../volk_gnsssdr/lib/gcc_x86_cpuid.h | 29 +++++++--------- .../lib/qa_16s_add_quad_aligned16.cc | 18 ++++++++++ .../lib/qa_16s_add_quad_aligned16.h | 18 ++++++++++ .../lib/qa_16s_branch_4_state_8_aligned16.cc | 18 ++++++++++ .../lib/qa_16s_branch_4_state_8_aligned16.h | 18 ++++++++++ ...qa_16s_permute_and_scalar_add_aligned16.cc | 19 +++++++++++ .../qa_16s_permute_and_scalar_add_aligned16.h | 18 ++++++++++ .../lib/qa_16s_quad_max_star_aligned16.cc | 18 ++++++++++ .../lib/qa_16s_quad_max_star_aligned16.h | 19 +++++++++++ .../lib/qa_32f_fm_detect_aligned16.cc | 19 +++++++++++ .../lib/qa_32f_fm_detect_aligned16.h | 18 ++++++++++ .../lib/qa_32f_index_max_aligned16.cc | 18 ++++++++++ .../lib/qa_32f_index_max_aligned16.h | 19 +++++++++++ .../lib/qa_32fc_index_max_aligned16.cc | 18 ++++++++++ .../lib/qa_32fc_index_max_aligned16.h | 18 ++++++++++ ...fc_power_spectral_density_32f_aligned16.cc | 18 ++++++++++ ...2fc_power_spectral_density_32f_aligned16.h | 18 ++++++++++ .../volk_gnsssdr/lib/qa_utils.cc | 18 ++++++++++ .../volk_gnsssdr/lib/qa_utils.h | 18 ++++++++++ .../volk_gnsssdr/lib/testqa.cc | 18 +++++----- .../volk_gnsssdr/lib/volk_gnsssdr_malloc.c | 19 +++++------ .../volk_gnsssdr/lib/volk_gnsssdr_prefs.c | 18 ++++++++++ .../lib/volk_gnsssdr_rank_archs.c | 18 +++++----- .../lib/volk_gnsssdr_rank_archs.h | 17 ++++------ ..._16sc_magnitude_32f_aligned16_orc_impl.orc | 18 ++++++++++ .../orc/volk_gnsssdr_32f_x2_add_32f.orc | 18 ++++++++++ .../volk_gnsssdr_32fc_s32fc_multiply_32fc.orc | 18 ++++++++++ .../volk_gnsssdr_32fc_x2_multiply_32fc.orc | 18 ++++++++++ .../orc/volk_gnsssdr_8i_accumulator_s8i.orc | 2 +- .../volk_gnsssdr_modtool/CMakeLists.txt | 17 +++++----- .../volk_gnsssdr/volk_gnsssdr.pc.in | 10 +++--- .../volk_gnsssdr/volk_modtool.cfg | 8 ++--- 54 files changed, 648 insertions(+), 197 deletions(-) diff --git a/src/algorithms/libs/volk_gnsssdr_module/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/CMakeLists.txt index 59865248b..0ea86676c 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/CMakeLists.txt +++ b/src/algorithms/libs/volk_gnsssdr_module/CMakeLists.txt @@ -23,10 +23,10 @@ # 2) target_link_libraries(..${VOLK_GNSSSDR_LIBRARIES}..) ############################################################################### -message(STATUS " START OF: Setup volk_gnsssdr as a subproject.") +#message(STATUS " START OF: Setup volk_gnsssdr as a subproject.") -list(APPEND CMAKE_C_FLAGS "-std=c11") -set (CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr/install" CACHE PATH "Install prefix for volk_gnsssdr" FORCE ) +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11") +#set (CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr/install" CACHE PATH "Install prefix for volk_gnsssdr" FORCE ) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/volk_gnsssdr) @@ -41,6 +41,6 @@ set(VOLK_GNSSSDR_LIBRARIES CACHE INTERNAL "" ) -message(STATUS " * INCLUDES: ${VOLK_GNSSSDR_INCLUDE_DIRS} ") -message(STATUS " * LIBS: ${VOLK_GNSSSDR_LIBRARIES} ") -message(STATUS " END OF: Setup volk_gnsssdr as a subproject.") +#message(STATUS " * INCLUDES: ${VOLK_GNSSSDR_INCLUDE_DIRS} ") +#message(STATUS " * LIBS: ${VOLK_GNSSSDR_LIBRARIES} ") +#message(STATUS " END OF: Setup volk_gnsssdr as a subproject.") diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt index 77481beda..6f27e67e9 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt @@ -1,18 +1,20 @@ # -# Copyright 2011 Free Software Foundation, Inc. +# Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) # -# This program is free software: you can redistribute it and/or modify +# 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. # -# This program is distributed in the hope that it will be useful, +# 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 this program. If not, see . +# along with GNSS-SDR. If not, see . # ######################################################################## diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt index 3158c4280..9e6238c49 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt @@ -1,18 +1,20 @@ # -# Copyright 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) # -# This program is free software: you can redistribute it and/or modify +# 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. # -# This program is distributed in the hope that it will be useful, +# 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 this program. If not, see . +# along with GNSS-SDR. If not, see . # ######################################################################## diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc index ec8c09525..95747d544 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc @@ -1,33 +1,31 @@ /* -*- c++ -*- */ -/* - * Copyright 2013 Free Software Foundation, Inc. +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * - * This file is part of GNU Radio + * This file is part of GNSS-SDR. * - * GNU Radio is free software; you can redistribute it and/or modify + * 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, or (at your option) - * any later version. + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * GNU Radio is distributed in the hope that it will be useful, + * 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 GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. + * along with GNSS-SDR. If not, see . */ #if HAVE_CONFIG_H #include #endif -#include -#include "volk_gnsssdr/volk_gnsssdr.h" -#include #include +#include +#include "volk_gnsssdr/constants.h" +#include "volk_gnsssdr/volk_gnsssdr.h" + namespace po = boost::program_options; diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc index 66c31075e..784c6ce72 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc @@ -1,39 +1,34 @@ /* -*- c++ -*- */ -/* - * Copyright 2012-2014 Free Software Foundation, Inc. +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * - * This file is part of GNU Radio + * This file is part of GNSS-SDR. * - * GNU Radio is free software; you can redistribute it and/or modify + * 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, or (at your option) - * any later version. + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * GNU Radio is distributed in the hope that it will be useful, + * 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 GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. + * along with GNSS-SDR. If not, see . */ -#include "qa_utils.h" - -#include -#include - +#include +#include #include +#include +#include #include #include #include #include -#include -#include -#include -#include +#include +#include +#include "qa_utils.h" namespace fs = boost::filesystem; diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/FindORC.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/FindORC.cmake index f21513f72..de13b7fe4 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/FindORC.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/FindORC.cmake @@ -1,9 +1,6 @@ FIND_PACKAGE(PkgConfig) PKG_CHECK_MODULES(PC_ORC "orc-0.4 > 0.4.11") - - - FIND_PROGRAM(ORCC_EXECUTABLE orcc HINTS ${PC_ORC_TOOLSDIR} PATHS ${ORC_ROOT}/bin ${CMAKE_INSTALL_PREFIX}/bin) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/GrPython.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/GrPython.cmake index b7b561b7b..b8eaba205 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/GrPython.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/GrPython.cmake @@ -71,7 +71,7 @@ endif(PYTHON_EXECUTABLE) # - have the result variable to set ######################################################################## macro(VOLK_PYTHON_CHECK_MODULE desc mod cmd have) - message(STATUS "") + #message(STATUS "") message(STATUS "Python checking for ${desc}") execute_process( COMMAND ${PYTHON_EXECUTABLE} -c " diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_compile_utils.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_compile_utils.py index 05de9a546..6e697c8cd 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_compile_utils.py +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_compile_utils.py @@ -1,19 +1,21 @@ #!/usr/bin/env python # -# Copyright 2012 Free Software Foundation, Inc. +# Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) # -# This program is free software: you can redistribute it and/or modify +# 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. # -# This program is distributed in the hope that it will be useful, +# 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 this program. If not, see . +# along with GNSS-SDR. If not, see . # import optparse diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_kernel_defs.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_kernel_defs.py index b3f03f627..c16d9792b 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_kernel_defs.py +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_kernel_defs.py @@ -1,22 +1,21 @@ # -# Copyright 2011-2012 Free Software Foundation, Inc. +# Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) # -# This file is part of GNU Radio +# This file is part of GNSS-SDR. # -# GNU Radio is free software; you can redistribute it and/or modify +# 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, or (at your option) -# any later version. +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # -# GNU Radio is distributed in the hope that it will be useful, +# 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 GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. +# along with GNSS-SDR. If not, see . + # import os diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_machine_defs.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_machine_defs.py index 174106634..7d81513fd 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_machine_defs.py +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_machine_defs.py @@ -1,18 +1,20 @@ # -# Copyright 2012 Free Software Foundation, Inc. +# Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) # -# This program is free software: you can redistribute it and/or modify +# 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. # -# This program is distributed in the hope that it will be useful, +# 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 this program. If not, see . +# along with GNSS-SDR. If not, see . # from volk_gnsssdr_arch_defs import arch_dict diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_tmpl_utils.py b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_tmpl_utils.py index c4577af62..82130b29c 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_tmpl_utils.py +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_tmpl_utils.py @@ -1,23 +1,21 @@ #!/usr/bin/env python # -# Copyright 2012 Free Software Foundation, Inc. +# Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) # -# This file is part of GNU Radio +# This file is part of GNSS-SDR. # -# GNU Radio is free software; you can redistribute it and/or modify +# 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, or (at your option) -# any later version. +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # -# GNU Radio is distributed in the hope that it will be useful, +# 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 GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. +# along with GNSS-SDR. If not, see . # import os diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/constants.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/constants.h index f08960557..692cbedd8 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/constants.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/constants.h @@ -1,23 +1,20 @@ /* -*- c++ -*- */ -/* - * Copyright 2006,2009,2013 Free Software Foundation, Inc. +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * - * This file is part of GNU Radio + * This file is part of GNSS-SDR. * - * GNU Radio is free software; you can redistribute it and/or modify + * 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, or (at your option) - * any later version. + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * GNU Radio is distributed in the hope that it will be useful, + * 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 GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. + * along with GNSS-SDR. If not, see . */ #ifndef INCLUDED_VOLK_CONSTANTS_H diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_common.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_common.h index c48057cd9..b67d6f67f 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_common.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_common.h @@ -1,3 +1,21 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + #ifndef INCLUDED_LIBVOLK_COMMON_H #define INCLUDED_LIBVOLK_COMMON_H diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_complex.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_complex.h index 5bd925044..0a622bc7f 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_complex.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_complex.h @@ -1,3 +1,21 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + #ifndef INCLUDE_VOLK_COMPLEX_H #define INCLUDE_VOLK_COMPLEX_H diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_malloc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_malloc.h index 7136bc135..33b2f5772 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_malloc.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_malloc.h @@ -1,23 +1,20 @@ /* -*- c -*- */ -/* - * Copyright 2014 Free Software Foundation, Inc. +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * - * This file is part of GNU Radio + * This file is part of GNSS-SDR. * - * GNU Radio is free software; you can redistribute it and/or modify + * 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, or (at your option) - * any later version. + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * GNU Radio is distributed in the hope that it will be useful, + * 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 GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. + * along with GNSS-SDR. If not, see . */ #ifndef INCLUDED_VOLK_MALLOC_H diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_prefs.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_prefs.h index 6e13fc07a..3cf5a4c24 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_prefs.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_prefs.h @@ -1,3 +1,21 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + #ifndef INCLUDED_VOLK_PREFS_H #define INCLUDED_VOLK_PREFS_H diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/CommonMacros.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/CommonMacros.h index ec9937ef5..84a53fa22 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/CommonMacros.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/CommonMacros.h @@ -2,7 +2,7 @@ * \file CommonMacros.h * \brief Common macros used inside the volk protokernels. * \authors
    - *
  • Andrés Cecilia, 2014. a.cecilia.luque(at)gmail.com + *
  • Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com *
* * ------------------------------------------------------------------------- @@ -17,7 +17,7 @@ * 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. + * (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 diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/CommonMacros_16ic_cw_epl_corr_32fc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/CommonMacros_16ic_cw_epl_corr_32fc.h index 4fa054480..27099a4e3 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/CommonMacros_16ic_cw_epl_corr_32fc.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/CommonMacros_16ic_cw_epl_corr_32fc.h @@ -2,7 +2,7 @@ * \file CommonMacros_16ic_cw_corr_32fc.h * \brief Common macros used inside the 16ic_cw_corr_32fc volk protokernels. * \authors
    - *
  • Andrés Cecilia, 2014. a.cecilia.luque(at)gmail.com + *
  • Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com *
* * ------------------------------------------------------------------------- @@ -17,7 +17,7 @@ * 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. + * (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 diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/CommonMacros_8ic_cw_epl_corr_32fc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/CommonMacros_8ic_cw_epl_corr_32fc.h index a8a778057..c3ea58253 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/CommonMacros_8ic_cw_epl_corr_32fc.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/CommonMacros/CommonMacros_8ic_cw_epl_corr_32fc.h @@ -2,7 +2,7 @@ * \file CommonMacros_8ic_cw_corr_32fc.h * \brief Common macros used inside the 8ic_cw_corr_32fc volk protokernels. * \authors
    - *
  • Andrés Cecilia, 2014. a.cecilia.luque(at)gmail.com + *
  • Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com *
* * ------------------------------------------------------------------------- @@ -17,7 +17,7 @@ * 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. + * (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 @@ -29,6 +29,7 @@ * * ------------------------------------------------------------------------- */ + #ifndef INCLUDED_gnsssdr_CommonMacros_8ic_cw_corr_32fc_u_H #define INCLUDED_gnsssdr_CommonMacros_8ic_cw_corr_32fc_u_H #include "CommonMacros/CommonMacros.h" diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_s32f_x4_update_local_code_32fc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_s32f_x4_update_local_code_32fc.h index 7a00a89d8..7c06a23a5 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_s32f_x4_update_local_code_32fc.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_s32f_x4_update_local_code_32fc.h @@ -35,10 +35,11 @@ #ifndef INCLUDED_volk_gnsssdr_32fc_s32f_x4_update_local_code_32fc_u_H #define INCLUDED_volk_gnsssdr_32fc_s32f_x4_update_local_code_32fc_u_H -#include -#include -#include #include +#include +#include +#include +#include "volk_gnsssdr/volk_gnsssdr_complex.h" #ifdef LV_HAVE_SSE4_1 #include diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt index 7f02b7fa6..d334c3d4b 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt @@ -1,18 +1,20 @@ # -# Copyright 2011-2012,2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) # -# This program is free software: you can redistribute it and/or modify +# 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. # -# This program is distributed in the hope that it will be useful, +# 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 this program. If not, see . +# along with GNSS-SDR. If not, see . # ######################################################################## @@ -238,6 +240,7 @@ endif(NOT CPU_IS_x86) # implement overruling in the ORC case, # since ORC always passes flag detection ######################################################################## +find_package(ORC) if(NOT ORC_FOUND) OVERRULE_ARCH(orc "ORC support not found") endif() @@ -523,7 +526,11 @@ file(GLOB orc ${CMAKE_SOURCE_DIR}/orc/*.orc) file(GLOB CommonMacros ${CMAKE_SOURCE_DIR}/kernels/CommonMacros/*.h ${CMAKE_SOURCE_DIR}/kernels/CommonMacros/README.txt) #add_library(volk_gnsssdr SHARED ${volk_gnsssdr_sources}) -add_library(volk_gnsssdr STATIC ${volk_gnsssdr_sources} ${h_files} ${CommonMacros} ${orc}) +if(ENABLE_STATIC_LIBS) + add_library(volk_gnsssdr STATIC ${volk_gnsssdr_sources} ${h_files} ${CommonMacros} ${orc}) +else(ENABLE_STATIC_LIBS) + add_library(volk_gnsssdr SHARED ${volk_gnsssdr_sources}) +endif(ENABLE_STATIC_LIBS) source_group("Kernels" FILES ${h_files}) source_group("Common Macros" FILES ${CommonMacros}) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/constants.c.in b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/constants.c.in index 2f5fdcc3d..bc5250868 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/constants.c.in +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/constants.c.in @@ -1,23 +1,20 @@ /* -*- c++ -*- */ -/* - * Copyright 2013 Free Software Foundation, Inc. +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * - * This file is part of GNU Radio + * This file is part of GNSS-SDR. * - * GNU Radio is free software; you can redistribute it and/or modify + * 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, or (at your option) - * any later version. + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * GNU Radio is distributed in the hope that it will be useful, + * 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 GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. + * along with GNSS-SDR. If not, see . */ #if HAVE_CONFIG_H diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/gcc_x86_cpuid.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/gcc_x86_cpuid.h index e0254f192..75a81fc92 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/gcc_x86_cpuid.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/gcc_x86_cpuid.h @@ -1,24 +1,19 @@ -/* - * Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * - * This file 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, or (at your option) any - * later version. + * This file is part of GNSS-SDR. * - * This file 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. + * 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. * - * Under Section 7 of GPL version 3, you are granted additional - * permissions described in the GCC Runtime Library Exception, version - * 3.1, as published by the Free Software Foundation. + * 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 and - * a copy of the GCC Runtime Library Exception along with this program; - * see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - * . + * You should have received a copy of the GNU General Public License + * along with GNSS-SDR. If not, see . */ /* %ecx */ diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_add_quad_aligned16.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_add_quad_aligned16.cc index 771c4a24a..13b77d0ab 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_add_quad_aligned16.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_add_quad_aligned16.cc @@ -1,3 +1,21 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + #include #include #include diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_add_quad_aligned16.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_add_quad_aligned16.h index 3c1ae978b..ce37f66b6 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_add_quad_aligned16.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_add_quad_aligned16.h @@ -1,3 +1,21 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + #ifndef INCLUDED_QA_16S_ADD_QUAD_ALIGNED16_H #define INCLUDED_QA_16S_ADD_QUAD_ALIGNED16_H diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_branch_4_state_8_aligned16.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_branch_4_state_8_aligned16.cc index c11a3a203..529c2d6cc 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_branch_4_state_8_aligned16.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_branch_4_state_8_aligned16.cc @@ -1,3 +1,21 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + #include #include #include diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_branch_4_state_8_aligned16.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_branch_4_state_8_aligned16.h index 41ab073e0..802caba72 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_branch_4_state_8_aligned16.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_branch_4_state_8_aligned16.h @@ -1,3 +1,21 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + #ifndef INCLUDED_QA_16S_BRANCH_4_STATE_8_ALIGNED16_H #define INCLUDED_QA_16S_BRANCH_4_STATE_8_ALIGNED16_H diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_permute_and_scalar_add_aligned16.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_permute_and_scalar_add_aligned16.cc index 74482c490..a9c6c86a0 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_permute_and_scalar_add_aligned16.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_permute_and_scalar_add_aligned16.cc @@ -1,3 +1,22 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + + #include #include #include diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_permute_and_scalar_add_aligned16.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_permute_and_scalar_add_aligned16.h index 3643aeef6..cd8a6bb90 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_permute_and_scalar_add_aligned16.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_permute_and_scalar_add_aligned16.h @@ -1,3 +1,21 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + #ifndef INCLUDED_QA_16S_PERMUTE_AND_SCALAR_ADD_ALIGNED16_H #define INCLUDED_QA_16S_PERMUTE_AND_SCALAR_ADD_ALIGNED16_H diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_quad_max_star_aligned16.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_quad_max_star_aligned16.cc index d3cd803e6..548521ea1 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_quad_max_star_aligned16.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_quad_max_star_aligned16.cc @@ -1,3 +1,21 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + #include #include #include diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_quad_max_star_aligned16.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_quad_max_star_aligned16.h index 51e77081a..cbf117df9 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_quad_max_star_aligned16.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_16s_quad_max_star_aligned16.h @@ -1,3 +1,22 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + + #ifndef INCLUDED_QA_16S_QUAD_MAX_STAR_ALIGNED16_H #define INCLUDED_QA_16S_QUAD_MAX_STAR_ALIGNED16_H diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_fm_detect_aligned16.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_fm_detect_aligned16.cc index 6c30de171..b642095e4 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_fm_detect_aligned16.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_fm_detect_aligned16.cc @@ -1,3 +1,22 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + + #include #include #include diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_fm_detect_aligned16.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_fm_detect_aligned16.h index a2680c524..7fb885962 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_fm_detect_aligned16.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_fm_detect_aligned16.h @@ -1,3 +1,21 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + #ifndef INCLUDED_QA_32F_FM_DETECT_ALIGNED16_H #define INCLUDED_QA_32F_FM_DETECT_ALIGNED16_H diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_index_max_aligned16.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_index_max_aligned16.cc index 99ea2bc5d..4804a1874 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_index_max_aligned16.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_index_max_aligned16.cc @@ -1,3 +1,21 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + #include #include #include diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_index_max_aligned16.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_index_max_aligned16.h index 8cadffa47..4b5f1d3b1 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_index_max_aligned16.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32f_index_max_aligned16.h @@ -1,3 +1,22 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + + #ifndef INCLUDED_QA_32F_INDEX_MAX_ALIGNED16_H #define INCLUDED_QA_32F_INDEX_MAX_ALIGNED16_H diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_index_max_aligned16.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_index_max_aligned16.cc index aa5f7165d..9d21a4a63 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_index_max_aligned16.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_index_max_aligned16.cc @@ -1,3 +1,21 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + #include #include #include diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_index_max_aligned16.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_index_max_aligned16.h index 0990bcb1f..1281caba6 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_index_max_aligned16.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_index_max_aligned16.h @@ -1,3 +1,21 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + #ifndef INCLUDED_QA_32FC_INDEX_MAX_ALIGNED16_H #define INCLUDED_QA_32FC_INDEX_MAX_ALIGNED16_H diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_power_spectral_density_32f_aligned16.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_power_spectral_density_32f_aligned16.cc index 9467ff973..977493da5 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_power_spectral_density_32f_aligned16.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_power_spectral_density_32f_aligned16.cc @@ -1,3 +1,21 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + #include #include #include diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_power_spectral_density_32f_aligned16.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_power_spectral_density_32f_aligned16.h index 26f430bec..1726afda7 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_power_spectral_density_32f_aligned16.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_32fc_power_spectral_density_32f_aligned16.h @@ -1,3 +1,21 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + #ifndef INCLUDED_QA_32FC_POWER_SPECTRAL_DENSITY_32F_ALIGNED16_H #define INCLUDED_QA_32FC_POWER_SPECTRAL_DENSITY_32F_ALIGNED16_H diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc index 14a9de7ef..ffd1f82ac 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc @@ -1,3 +1,21 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + #include "qa_utils.h" #include #include diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h index 5e3ff7e88..119c03b58 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h @@ -1,3 +1,21 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + #ifndef VOLK_QA_UTILS_H #define VOLK_QA_UTILS_H diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc index 93b67ff57..6159ffb14 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc @@ -1,25 +1,23 @@ /* -*- c++ -*- */ -/* - * Copyright 2012-2014 Free Software Foundation, Inc. +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * - * This file is part of GNU Radio + * This file is part of GNSS-SDR. * - * GNU Radio is free software; you can redistribute it and/or modify + * 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, or (at your option) - * any later version. + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * GNU Radio is distributed in the hope that it will be useful, + * 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 GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. + * along with GNSS-SDR. If not, see . */ + #include "qa_utils.h" #include #include diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_malloc.c b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_malloc.c index 03e53a513..a08fa8b13 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_malloc.c +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_malloc.c @@ -1,29 +1,26 @@ /* -*- c -*- */ -/* - * Copyright 2014 Free Software Foundation, Inc. +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * - * This file is part of GNU Radio + * This file is part of GNSS-SDR. * - * GNU Radio is free software; you can redistribute it and/or modify + * 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, or (at your option) - * any later version. + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * GNU Radio is distributed in the hope that it will be useful, + * 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 GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. + * along with GNSS-SDR. If not, see . */ #include -#include #include #include +#include "volk_gnsssdr/volk_gnsssdr_malloc.h" /* * For #defines used to determine support for allocation functions, diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_prefs.c b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_prefs.c index dc4dc645e..9c410b11f 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_prefs.c +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_prefs.c @@ -1,3 +1,21 @@ +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) + * + * 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 . + */ + #include #include #include diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.c b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.c index 415ca4039..ec5291e3a 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.c +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.c @@ -1,24 +1,22 @@ -/* - * Copyright 2011-2012 Free Software Foundation, Inc. +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * - * This file is part of GNU Radio + * This file is part of GNSS-SDR. * - * GNU Radio is free software; you can redistribute it and/or modify + * 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, or (at your option) - * any later version. + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * GNU Radio is distributed in the hope that it will be useful, + * 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 GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. + * along with GNSS-SDR. If not, see . */ + #include #include #include diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.h index 6cf9108fb..cd1a8a343 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_rank_archs.h @@ -1,22 +1,19 @@ -/* - * Copyright 2011-2012 Free Software Foundation, Inc. +/* Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * - * This file is part of GNU Radio + * This file is part of GNSS-SDR. * - * GNU Radio is free software; you can redistribute it and/or modify + * 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, or (at your option) - * any later version. + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * GNU Radio is distributed in the hope that it will be useful, + * 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 GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. + * along with GNSS-SDR. If not, see . */ #ifndef INCLUDED_VOLK_RANK_ARCHS_H diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_16sc_magnitude_32f_aligned16_orc_impl.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_16sc_magnitude_32f_aligned16_orc_impl.orc index 561010761..48a7d5fda 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_16sc_magnitude_32f_aligned16_orc_impl.orc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_16sc_magnitude_32f_aligned16_orc_impl.orc @@ -1,3 +1,21 @@ +# Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) +# +# 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 . +# + .function volk_gnsssdr_16ic_magnitude_32f_a_orc_impl .source 4 src .dest 4 dst diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_32f_x2_add_32f.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_32f_x2_add_32f.orc index 4419688b6..1daa8ce0b 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_32f_x2_add_32f.orc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_32f_x2_add_32f.orc @@ -1,3 +1,21 @@ +# Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) +# +# 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 . +# + .function volk_gnsssdr_32f_x2_add_32f_a_orc_impl .dest 4 dst .source 4 src1 diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_32fc_s32fc_multiply_32fc.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_32fc_s32fc_multiply_32fc.orc index 03297831f..915b313ca 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_32fc_s32fc_multiply_32fc.orc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_32fc_s32fc_multiply_32fc.orc @@ -1,3 +1,21 @@ +# Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) +# +# 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 . +# + .function volk_gnsssdr_32fc_s32fc_multiply_32fc_a_orc_impl .source 8 src1 .floatparam 8 scalar diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_32fc_x2_multiply_32fc.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_32fc_x2_multiply_32fc.orc index 5d049ad93..58d5dcf1d 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_32fc_x2_multiply_32fc.orc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_32fc_x2_multiply_32fc.orc @@ -1,3 +1,21 @@ +# Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) +# +# 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 . +# + .function volk_gnsssdr_32fc_x2_multiply_32fc_a_orc_impl .source 8 src1 .source 8 src2 diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8i_accumulator_s8i.orc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8i_accumulator_s8i.orc index 71d301c45..3257c3089 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8i_accumulator_s8i.orc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/orc/volk_gnsssdr_8i_accumulator_s8i.orc @@ -2,7 +2,7 @@ # * \file volk_gnsssdr_8i_accumulator_s8i.orc # * \brief ORC implementation: 8 bits (char) scalar accumulator # * \authors
    -# *
  • Andrés Cecilia, 2014. a.cecilia.luque(at)gmail.com +# *
  • Andres Cecilia, 2014. a.cecilia.luque(at)gmail.com # *
# * # * ORC code that implements an accumulator of char values diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/CMakeLists.txt index bba4d3664..b394722ab 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/CMakeLists.txt +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/CMakeLists.txt @@ -1,21 +1,20 @@ -# Copyright 2013 Free Software Foundation, Inc. +# Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) # -# This file is part of GNU Radio +# This file is part of GNSS-SDR. # -# GNU Radio is free software; you can redistribute it and/or modify +# 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, or (at your option) -# any later version. +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # -# GNU Radio is distributed in the hope that it will be useful, +# 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 GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. +# along with GNSS-SDR. If not, see . +# ######################################################################## # Install python files and apps diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/volk_gnsssdr.pc.in b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/volk_gnsssdr.pc.in index bc2c2e425..9277723dd 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/volk_gnsssdr.pc.in +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/volk_gnsssdr.pc.in @@ -1,12 +1,12 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ +prefix=@prefix_@ +exec_prefix=@exec_prefix_@ +libdir=@libdir_@ +includedir=@includedir_@ LV_CXXFLAGS=@LV_CXXFLAGS@ Name: volk_gnsssdr -Description: VOLK: Vector Optimized Library of Kernels +Description: VOLK: Vector Optimized Library of Kernels specific for GNSS-SDR Requires: Version: @VERSION@ Libs: -L${libdir} -lvolk_gnsssdr diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/volk_modtool.cfg b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/volk_modtool.cfg index c47ac2444..b36579a8d 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/volk_modtool.cfg +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/volk_modtool.cfg @@ -1,5 +1,5 @@ -[config] -name = gnsssdr -destination = /Users/andres/Github/gnss-sdr/src/algorithms/libs -base = /Users/andres/github/gnuradio/volk +#[config] +#name = gnsssdr +#destination = /Users/andres/Github/gnss-sdr/src/algorithms/libs +#base = /Users/andres/github/gnuradio/volk