mirror of https://github.com/gnss-sdr/gnss-sdr
330 lines
19 KiB
Diff
330 lines
19 KiB
Diff
diff -rupN /Users/andres/Desktop/volk_gnsssdr/lib/CMakeLists.txt /Users/andres/Desktop/volk_gnsssdr_original/lib/CMakeLists.txt
|
|
--- /Users/andres/Desktop/volk_gnsssdr/lib/CMakeLists.txt 2014-10-17 04:26:38.000000000 +0200
|
|
+++ /Users/andres/Desktop/volk_gnsssdr_original/lib/CMakeLists.txt 2014-10-17 04:17:37.000000000 +0200
|
|
@@ -517,7 +517,19 @@ if(MSVC)
|
|
endif()
|
|
|
|
#create the volk_gnsssdr runtime library
|
|
-add_library(volk_gnsssdr SHARED ${volk_gnsssdr_sources})
|
|
+
|
|
+#MODIFICATIONS BY GNSS-SDR
|
|
+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 SHARED ${volk_gnsssdr_sources} ${h_files} ${CommonMacros} ${orc})
|
|
+
|
|
+source_group("Kernels" FILES ${h_files})
|
|
+source_group("Common Macros" FILES ${CommonMacros})
|
|
+source_group("ORC Files" FILES ${orc})
|
|
+#END OF MODIFICATIONS
|
|
+
|
|
target_link_libraries(volk_gnsssdr ${volk_gnsssdr_libraries})
|
|
set_target_properties(volk_gnsssdr PROPERTIES SOVERSION ${LIBVER})
|
|
set_target_properties(volk_gnsssdr PROPERTIES DEFINE_SYMBOL "volk_gnsssdr_EXPORTS")
|
|
diff -rupN /Users/andres/Desktop/volk_gnsssdr/lib/qa_utils.cc /Users/andres/Desktop/volk_gnsssdr_original/lib/qa_utils.cc
|
|
--- /Users/andres/Desktop/volk_gnsssdr/lib/qa_utils.cc 2014-10-17 04:26:39.000000000 +0200
|
|
+++ /Users/andres/Desktop/volk_gnsssdr_original/lib/qa_utils.cc 2014-10-17 04:21:03.000000000 +0200
|
|
@@ -217,6 +217,72 @@ inline void run_cast_test3_s32fc(volk_gn
|
|
while(iter--) func(buffs[0], buffs[1], buffs[2], scalar, vlen, arch.c_str());
|
|
}
|
|
|
|
+//ADDED BY GNSS-SDR. START
|
|
+inline void run_cast_test1_s8i(volk_gnsssdr_fn_1arg_s8i func, std::vector<void *> &buffs, char scalar, unsigned int vlen, unsigned int iter, std::string arch) {
|
|
+ while(iter--) func(buffs[0], scalar, vlen, arch.c_str());
|
|
+}
|
|
+
|
|
+inline void run_cast_test2_s8i(volk_gnsssdr_fn_2arg_s8i func, std::vector<void *> &buffs, char scalar, unsigned int vlen, unsigned int iter, std::string arch) {
|
|
+ while(iter--) func(buffs[0], buffs[1], scalar, vlen, arch.c_str());
|
|
+}
|
|
+
|
|
+inline void run_cast_test3_s8i(volk_gnsssdr_fn_3arg_s8i func, std::vector<void *> &buffs, char scalar, unsigned int vlen, unsigned int iter, std::string arch) {
|
|
+ while(iter--) func(buffs[0], buffs[1], buffs[2], scalar, vlen, arch.c_str());
|
|
+}
|
|
+
|
|
+inline void run_cast_test1_s8ic(volk_gnsssdr_fn_1arg_s8ic func, std::vector<void *> &buffs, lv_8sc_t scalar, unsigned int vlen, unsigned int iter, std::string arch) {
|
|
+ while(iter--) func(buffs[0], scalar, vlen, arch.c_str());
|
|
+}
|
|
+
|
|
+inline void run_cast_test2_s8ic(volk_gnsssdr_fn_2arg_s8ic func, std::vector<void *> &buffs, lv_8sc_t scalar, unsigned int vlen, unsigned int iter, std::string arch) {
|
|
+ while(iter--) func(buffs[0], buffs[1], scalar, vlen, arch.c_str());
|
|
+}
|
|
+
|
|
+inline void run_cast_test3_s8ic(volk_gnsssdr_fn_3arg_s8ic func, std::vector<void *> &buffs, lv_8sc_t scalar, unsigned int vlen, unsigned int iter, std::string arch) {
|
|
+ while(iter--) func(buffs[0], buffs[1], buffs[2], scalar, vlen, arch.c_str());
|
|
+}
|
|
+
|
|
+inline void run_cast_test8(volk_gnsssdr_fn_8arg func, std::vector<void *> &buffs, unsigned int vlen, unsigned int iter, std::string arch) {
|
|
+ while(iter--) func(buffs[0], buffs[1], buffs[2], buffs[3], buffs[4], buffs[5], buffs[6], buffs[7], vlen, arch.c_str());
|
|
+}
|
|
+
|
|
+inline void run_cast_test8_s8i(volk_gnsssdr_fn_8arg_s8i func, std::vector<void *> &buffs, char scalar, unsigned int vlen, unsigned int iter, std::string arch) {
|
|
+ while(iter--) func(buffs[0], buffs[1], buffs[2], buffs[3], buffs[4], buffs[5], buffs[6], buffs[7], scalar, vlen, arch.c_str());
|
|
+}
|
|
+
|
|
+inline void run_cast_test8_s8ic(volk_gnsssdr_fn_8arg_s8ic func, std::vector<void *> &buffs, lv_8sc_t scalar, unsigned int vlen, unsigned int iter, std::string arch) {
|
|
+ while(iter--) func(buffs[0], buffs[1], buffs[2], buffs[3], buffs[4], buffs[5], buffs[6], buffs[7], scalar, vlen, arch.c_str());
|
|
+}
|
|
+
|
|
+inline void run_cast_test8_s32f(volk_gnsssdr_fn_8arg_s32f func, std::vector<void *> &buffs, float scalar, unsigned int vlen, unsigned int iter, std::string arch) {
|
|
+ while(iter--) func(buffs[0], buffs[1], buffs[2], buffs[3], buffs[4], buffs[5], buffs[6], buffs[7], scalar, vlen, arch.c_str());
|
|
+}
|
|
+
|
|
+inline void run_cast_test8_s32fc(volk_gnsssdr_fn_8arg_s32fc func, std::vector<void *> &buffs, lv_32fc_t scalar, unsigned int vlen, unsigned int iter, std::string arch) {
|
|
+ while(iter--) func(buffs[0], buffs[1], buffs[2], buffs[3], buffs[4], buffs[5], buffs[6], buffs[7], scalar, vlen, arch.c_str());
|
|
+}
|
|
+
|
|
+inline void run_cast_test12(volk_gnsssdr_fn_12arg func, std::vector<void *> &buffs, unsigned int vlen, unsigned int iter, std::string arch) {
|
|
+ while(iter--) func(buffs[0], buffs[1], buffs[2], buffs[3], buffs[4], buffs[5], buffs[6], buffs[7], buffs[8], buffs[9], buffs[10], buffs[11], vlen, arch.c_str());
|
|
+}
|
|
+
|
|
+inline void run_cast_test12_s8i(volk_gnsssdr_fn_12arg_s8i func, std::vector<void *> &buffs, char scalar, unsigned int vlen, unsigned int iter, std::string arch) {
|
|
+ while(iter--) func(buffs[0], buffs[1], buffs[2], buffs[3], buffs[4], buffs[5], buffs[6], buffs[7], buffs[8], buffs[9], buffs[10], buffs[11], scalar, vlen, arch.c_str());
|
|
+}
|
|
+
|
|
+inline void run_cast_test12_s8ic(volk_gnsssdr_fn_12arg_s8ic func, std::vector<void *> &buffs, lv_8sc_t scalar, unsigned int vlen, unsigned int iter, std::string arch) {
|
|
+ while(iter--) func(buffs[0], buffs[1], buffs[2], buffs[3], buffs[4], buffs[5], buffs[6], buffs[7], buffs[8], buffs[9], buffs[10], buffs[11], scalar, vlen, arch.c_str());
|
|
+}
|
|
+
|
|
+inline void run_cast_test12_s32f(volk_gnsssdr_fn_12arg_s32f func, std::vector<void *> &buffs, float scalar, unsigned int vlen, unsigned int iter, std::string arch) {
|
|
+ while(iter--) func(buffs[0], buffs[1], buffs[2], buffs[3], buffs[4], buffs[5], buffs[6], buffs[7], buffs[8], buffs[9], buffs[10], buffs[11], scalar, vlen, arch.c_str());
|
|
+}
|
|
+
|
|
+inline void run_cast_test12_s32fc(volk_gnsssdr_fn_12arg_s32fc func, std::vector<void *> &buffs, lv_32fc_t scalar, unsigned int vlen, unsigned int iter, std::string arch) {
|
|
+ while(iter--) func(buffs[0], buffs[1], buffs[2], buffs[3], buffs[4], buffs[5], buffs[6], buffs[7], buffs[8], buffs[9], buffs[10], buffs[11], scalar, vlen, arch.c_str());
|
|
+}
|
|
+//ADDED BY GNSS-SDR. END
|
|
+
|
|
// This function is a nop that helps resolve GNU Radio bugs 582 and 583.
|
|
// Without this the cast in run_volk_gnsssdr_tests for tol_i = static_cast<int>(float tol)
|
|
// won't happen on armhf (reported on cortex A9 and A15).
|
|
@@ -426,7 +492,17 @@ bool run_volk_gnsssdr_tests(volk_gnsssdr
|
|
} else {
|
|
run_cast_test1_s32f((volk_gnsssdr_fn_1arg_s32f)(manual_func), test_data[i], scalar.real(), vlen, iter, arch_list[i]);
|
|
}
|
|
- } else throw "unsupported 1 arg function >1 scalars";
|
|
+ }
|
|
+ //ADDED BY GNSS-SDR. START
|
|
+ else if(inputsc.size() == 1 && !inputsc[0].is_float) {
|
|
+ if(inputsc[0].is_complex) {
|
|
+ run_cast_test1_s8ic((volk_gnsssdr_fn_1arg_s8ic)(manual_func), test_data[i], scalar, vlen, iter, arch_list[i]);
|
|
+ } else {
|
|
+ run_cast_test1_s8i((volk_gnsssdr_fn_1arg_s8i)(manual_func), test_data[i], scalar.real(), vlen, iter, arch_list[i]);
|
|
+ }
|
|
+ }
|
|
+ //ADDED BY GNSS-SDR. END
|
|
+ else throw "unsupported 1 arg function >1 scalars";
|
|
break;
|
|
case 2:
|
|
if(inputsc.size() == 0) {
|
|
@@ -437,7 +513,17 @@ bool run_volk_gnsssdr_tests(volk_gnsssdr
|
|
} else {
|
|
run_cast_test2_s32f((volk_gnsssdr_fn_2arg_s32f)(manual_func), test_data[i], scalar.real(), vlen, iter, arch_list[i]);
|
|
}
|
|
- } else throw "unsupported 2 arg function >1 scalars";
|
|
+ }
|
|
+ //ADDED BY GNSS-SDR. START
|
|
+ else if(inputsc.size() == 1 && !inputsc[0].is_float) {
|
|
+ if(inputsc[0].is_complex) {
|
|
+ run_cast_test2_s8ic((volk_gnsssdr_fn_2arg_s8ic)(manual_func), test_data[i], scalar, vlen, iter, arch_list[i]);
|
|
+ } else {
|
|
+ run_cast_test2_s8i((volk_gnsssdr_fn_2arg_s8i)(manual_func), test_data[i], scalar.real(), vlen, iter, arch_list[i]);
|
|
+ }
|
|
+ }
|
|
+ //ADDED BY GNSS-SDR. END
|
|
+ else throw "unsupported 2 arg function >1 scalars";
|
|
break;
|
|
case 3:
|
|
if(inputsc.size() == 0) {
|
|
@@ -448,11 +534,61 @@ bool run_volk_gnsssdr_tests(volk_gnsssdr
|
|
} else {
|
|
run_cast_test3_s32f((volk_gnsssdr_fn_3arg_s32f)(manual_func), test_data[i], scalar.real(), vlen, iter, arch_list[i]);
|
|
}
|
|
- } else throw "unsupported 3 arg function >1 scalars";
|
|
+ }
|
|
+ //ADDED BY GNSS-SDR. START
|
|
+ else if(inputsc.size() == 1 && !inputsc[0].is_float) {
|
|
+ if(inputsc[0].is_complex) {
|
|
+ run_cast_test3_s8ic((volk_gnsssdr_fn_3arg_s8ic)(manual_func), test_data[i], scalar, vlen, iter, arch_list[i]);
|
|
+ } else {
|
|
+ run_cast_test3_s8i((volk_gnsssdr_fn_3arg_s8i)(manual_func), test_data[i], scalar.real(), vlen, iter, arch_list[i]);
|
|
+ }
|
|
+ }
|
|
+ //ADDED BY GNSS-SDR. END
|
|
+ else throw "unsupported 3 arg function >1 scalars";
|
|
break;
|
|
case 4:
|
|
run_cast_test4((volk_gnsssdr_fn_4arg)(manual_func), test_data[i], vlen, iter, arch_list[i]);
|
|
break;
|
|
+ //ADDED BY GNSS-SDR. START
|
|
+ case 8:
|
|
+ if(inputsc.size() == 0) {
|
|
+ run_cast_test8((volk_gnsssdr_fn_8arg)(manual_func), test_data[i], vlen, iter, arch_list[i]);
|
|
+ } else if(inputsc.size() == 1 && inputsc[0].is_float) {
|
|
+ if(inputsc[0].is_complex) {
|
|
+ run_cast_test8_s32fc((volk_gnsssdr_fn_8arg_s32fc)(manual_func), test_data[i], scalar, vlen, iter, arch_list[i]);
|
|
+ } else {
|
|
+ run_cast_test8_s32f((volk_gnsssdr_fn_8arg_s32f)(manual_func), test_data[i], scalar.real(), vlen, iter, arch_list[i]);
|
|
+ }
|
|
+ }
|
|
+ else if(inputsc.size() == 1 && !inputsc[0].is_float) {
|
|
+ if(inputsc[0].is_complex) {
|
|
+ run_cast_test8_s8ic((volk_gnsssdr_fn_8arg_s8ic)(manual_func), test_data[i], scalar, vlen, iter, arch_list[i]);
|
|
+ } else {
|
|
+ run_cast_test8_s8i((volk_gnsssdr_fn_8arg_s8i)(manual_func), test_data[i], scalar.real(), vlen, iter, arch_list[i]);
|
|
+ }
|
|
+ }
|
|
+ else throw "unsupported 8 arg function >1 scalars";
|
|
+ break;
|
|
+ case 12:
|
|
+ if(inputsc.size() == 0) {
|
|
+ run_cast_test12((volk_gnsssdr_fn_12arg)(manual_func), test_data[i], vlen, iter, arch_list[i]);
|
|
+ } else if(inputsc.size() == 1 && inputsc[0].is_float) {
|
|
+ if(inputsc[0].is_complex) {
|
|
+ run_cast_test12_s32fc((volk_gnsssdr_fn_12arg_s32fc)(manual_func), test_data[i], scalar, vlen, iter, arch_list[i]);
|
|
+ } else {
|
|
+ run_cast_test12_s32f((volk_gnsssdr_fn_12arg_s32f)(manual_func), test_data[i], scalar.real(), vlen, iter, arch_list[i]);
|
|
+ }
|
|
+ }
|
|
+ else if(inputsc.size() == 1 && !inputsc[0].is_float) {
|
|
+ if(inputsc[0].is_complex) {
|
|
+ run_cast_test12_s8ic((volk_gnsssdr_fn_12arg_s8ic)(manual_func), test_data[i], scalar, vlen, iter, arch_list[i]);
|
|
+ } else {
|
|
+ run_cast_test12_s8i((volk_gnsssdr_fn_12arg_s8i)(manual_func), test_data[i], scalar.real(), vlen, iter, arch_list[i]);
|
|
+ }
|
|
+ }
|
|
+ else throw "unsupported 12 arg function >1 scalars";
|
|
+ break;
|
|
+ //ADDED BY GNSS-SDR. END
|
|
default:
|
|
throw "no function handler for this signature";
|
|
break;
|
|
diff -rupN /Users/andres/Desktop/volk_gnsssdr/lib/qa_utils.h /Users/andres/Desktop/volk_gnsssdr_original/lib/qa_utils.h
|
|
--- /Users/andres/Desktop/volk_gnsssdr/lib/qa_utils.h 2014-10-17 04:26:39.000000000 +0200
|
|
+++ /Users/andres/Desktop/volk_gnsssdr_original/lib/qa_utils.h 2014-10-17 04:21:51.000000000 +0200
|
|
@@ -77,4 +77,26 @@ typedef void (*volk_gnsssdr_fn_1arg_s32f
|
|
typedef void (*volk_gnsssdr_fn_2arg_s32fc)(void *, void *, lv_32fc_t, unsigned int, const char*);
|
|
typedef void (*volk_gnsssdr_fn_3arg_s32fc)(void *, void *, void *, lv_32fc_t, unsigned int, const char*);
|
|
|
|
+//ADDED BY GNSS-SDR. START
|
|
+typedef void (*volk_gnsssdr_fn_1arg_s8i)(void *, char, unsigned int, const char*); //one input vector, one scalar char input
|
|
+typedef void (*volk_gnsssdr_fn_2arg_s8i)(void *, void *, char, unsigned int, const char*);
|
|
+typedef void (*volk_gnsssdr_fn_3arg_s8i)(void *, void *, void *, char, unsigned int, const char*);
|
|
+typedef void (*volk_gnsssdr_fn_1arg_s8ic)(void *, lv_8sc_t, unsigned int, const char*); //one input vector, one scalar lv_8sc_t vector input
|
|
+typedef void (*volk_gnsssdr_fn_2arg_s8ic)(void *, void *, lv_8sc_t, unsigned int, const char*);
|
|
+typedef void (*volk_gnsssdr_fn_3arg_s8ic)(void *, void *, void *, lv_8sc_t, unsigned int, const char*);
|
|
+
|
|
+typedef void (*volk_gnsssdr_fn_8arg)(void *, void *, void *, void *, void *, void *, void *, void *, unsigned int, const char*);
|
|
+typedef void (*volk_gnsssdr_fn_8arg_s32f)(void *, void *, void *, void *, void *, void *, void *, void *, float, unsigned int, const char*);
|
|
+typedef void (*volk_gnsssdr_fn_8arg_s32fc)(void *, void *, void *, void *, void *, void *, void *, void *, lv_32fc_t, unsigned int, const char*);
|
|
+typedef void (*volk_gnsssdr_fn_8arg_s8i)(void *, void *, void *, void *, void *, void *, void *, void *, char, unsigned int, const char*);
|
|
+typedef void (*volk_gnsssdr_fn_8arg_s8ic)(void *, void *, void *, void *, void *, void *, void *, void *, lv_8sc_t, unsigned int, const char*);
|
|
+
|
|
+typedef void (*volk_gnsssdr_fn_12arg)(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, unsigned int, const char*);
|
|
+typedef void (*volk_gnsssdr_fn_12arg_s32f)(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, float, unsigned int, const char*);
|
|
+typedef void (*volk_gnsssdr_fn_12arg_s32fc)(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, lv_32fc_t, unsigned int, const char*);
|
|
+typedef void (*volk_gnsssdr_fn_12arg_s8i)(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, char, unsigned int, const char*);
|
|
+typedef void (*volk_gnsssdr_fn_12arg_s8ic)(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, lv_8sc_t, unsigned int, const char*);
|
|
+//ADDED BY GNSS-SDR. END
|
|
+
|
|
+
|
|
#endif //VOLK_QA_UTILS_H
|
|
diff -rupN /Users/andres/Desktop/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h /Users/andres/Desktop/volk_gnsssdr_original/tmpl/volk_gnsssdr.tmpl.h
|
|
--- /Users/andres/Desktop/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h 2014-10-17 04:26:39.000000000 +0200
|
|
+++ /Users/andres/Desktop/volk_gnsssdr_original/tmpl/volk_gnsssdr.tmpl.h 2014-10-17 04:23:30.000000000 +0200
|
|
@@ -19,8 +19,8 @@
|
|
* Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
-#ifndef INCLUDED_VOLK_RUNTIME
|
|
-#define INCLUDED_VOLK_RUNTIME
|
|
+#ifndef INCLUDED_VOLK_GNSSSDR_RUNTIME
|
|
+#define INCLUDED_VOLK_GNSSSDR_RUNTIME
|
|
|
|
#include <volk_gnsssdr/volk_gnsssdr_typedefs.h>
|
|
#include <volk_gnsssdr/volk_gnsssdr_config_fixed.h>
|
|
@@ -91,4 +91,4 @@ extern VOLK_API volk_gnsssdr_func_desc_t
|
|
|
|
__VOLK_DECL_END
|
|
|
|
-#endif /*INCLUDED_VOLK_RUNTIME*/
|
|
+#endif /*INCLUDED_VOLK_GNSSSDR_RUNTIME*/
|
|
diff -rupN /Users/andres/Desktop/volk_gnsssdr/tmpl/volk_gnsssdr_config_fixed.tmpl.h /Users/andres/Desktop/volk_gnsssdr_original/tmpl/volk_gnsssdr_config_fixed.tmpl.h
|
|
--- /Users/andres/Desktop/volk_gnsssdr/tmpl/volk_gnsssdr_config_fixed.tmpl.h 2014-10-17 04:26:39.000000000 +0200
|
|
+++ /Users/andres/Desktop/volk_gnsssdr_original/tmpl/volk_gnsssdr_config_fixed.tmpl.h 2014-10-17 04:22:58.000000000 +0200
|
|
@@ -19,11 +19,11 @@
|
|
* Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
-#ifndef INCLUDED_VOLK_CONFIG_FIXED_H
|
|
-#define INCLUDED_VOLK_CONFIG_FIXED_H
|
|
+#ifndef INCLUDED_VOLK_GNSSSDR_CONFIG_FIXED_H
|
|
+#define INCLUDED_VOLK_GNSSSDR_CONFIG_FIXED_H
|
|
|
|
#for $i, $arch in enumerate($archs)
|
|
#define LV_$(arch.name.upper()) $i
|
|
#end for
|
|
|
|
-#endif /*INCLUDED_VOLK_CONFIG_FIXED*/
|
|
+#endif /*INCLUDED_VOLK_GNSSSDR_CONFIG_FIXED*/
|
|
diff -rupN /Users/andres/Desktop/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h /Users/andres/Desktop/volk_gnsssdr_original/tmpl/volk_gnsssdr_cpu.tmpl.h
|
|
--- /Users/andres/Desktop/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h 2014-10-17 04:26:39.000000000 +0200
|
|
+++ /Users/andres/Desktop/volk_gnsssdr_original/tmpl/volk_gnsssdr_cpu.tmpl.h 2014-10-17 04:23:07.000000000 +0200
|
|
@@ -19,8 +19,8 @@
|
|
* Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
-#ifndef INCLUDED_VOLK_CPU_H
|
|
-#define INCLUDED_VOLK_CPU_H
|
|
+#ifndef INCLUDED_VOLK_GNSSSDR_CPU_H
|
|
+#define INCLUDED_VOLK_GNSSSDR_CPU_H
|
|
|
|
#include <volk_gnsssdr/volk_gnsssdr_common.h>
|
|
|
|
@@ -39,4 +39,4 @@ unsigned int volk_gnsssdr_get_lvarch ();
|
|
|
|
__VOLK_DECL_END
|
|
|
|
-#endif /*INCLUDED_VOLK_CPU_H*/
|
|
+#endif /*INCLUDED_VOLK_GNSSSDR_CPU_H*/
|
|
diff -rupN /Users/andres/Desktop/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h /Users/andres/Desktop/volk_gnsssdr_original/tmpl/volk_gnsssdr_machines.tmpl.h
|
|
--- /Users/andres/Desktop/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h 2014-10-17 04:26:39.000000000 +0200
|
|
+++ /Users/andres/Desktop/volk_gnsssdr_original/tmpl/volk_gnsssdr_machines.tmpl.h 2014-10-17 04:23:16.000000000 +0200
|
|
@@ -19,8 +19,8 @@
|
|
* Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
-#ifndef INCLUDED_LIBVOLK_MACHINES_H
|
|
-#define INCLUDED_LIBVOLK_MACHINES_H
|
|
+#ifndef INCLUDED_LIBVOLK_GNSSSDR_MACHINES_H
|
|
+#define INCLUDED_LIBVOLK_GNSSSDR_MACHINES_H
|
|
|
|
#include <volk_gnsssdr/volk_gnsssdr_common.h>
|
|
#include <volk_gnsssdr/volk_gnsssdr_typedefs.h>
|
|
@@ -52,4 +52,4 @@ extern struct volk_gnsssdr_machine volk_
|
|
|
|
__VOLK_DECL_END
|
|
|
|
-#endif //INCLUDED_LIBVOLK_MACHINES_H
|
|
+#endif //INCLUDED_LIBVOLK_GNSSSDR_MACHINES_H
|
|
diff -rupN /Users/andres/Desktop/volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h /Users/andres/Desktop/volk_gnsssdr_original/tmpl/volk_gnsssdr_typedefs.tmpl.h
|
|
--- /Users/andres/Desktop/volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h 2014-10-17 04:26:39.000000000 +0200
|
|
+++ /Users/andres/Desktop/volk_gnsssdr_original/tmpl/volk_gnsssdr_typedefs.tmpl.h 2014-10-17 04:23:23.000000000 +0200
|
|
@@ -19,8 +19,8 @@
|
|
* Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
-#ifndef INCLUDED_VOLK_TYPEDEFS
|
|
-#define INCLUDED_VOLK_TYPEDEFS
|
|
+#ifndef INCLUDED_VOLK_GNSSSDR_TYPEDEFS
|
|
+#define INCLUDED_VOLK_GNSSSDR_TYPEDEFS
|
|
|
|
#include <inttypes.h>
|
|
#include <volk_gnsssdr/volk_gnsssdr_complex.h>
|
|
@@ -29,4 +29,4 @@
|
|
typedef void (*$(kern.pname))($kern.arglist_types);
|
|
#end for
|
|
|
|
-#endif /*INCLUDED_VOLK_TYPEDEFS*/
|
|
+#endif /*INCLUDED_VOLK_GNSSSDR_TYPEDEFS*/
|