From 7a5574f5988c4c93c63feb4bb974350ff348c140 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 20 Jan 2016 11:21:58 +0100 Subject: [PATCH] Fixing aligned/unaligned tag --- .../volk_gnsssdr_16ic_resamplerxnpuppet_16ic.h | 12 ++++++------ .../volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerxnpuppet_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerxnpuppet_16ic.h index 611e7e7a4..6c2784fe2 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerxnpuppet_16ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerxnpuppet_16ic.h @@ -32,8 +32,8 @@ * ------------------------------------------------------------------------- */ -#ifndef INCLUDED_volk_gnsssdr_16ic_resamplerxnpuppet_16ic_u_H -#define INCLUDED_volk_gnsssdr_16ic_resamplerxnpuppet_16ic_u_H +#ifndef INCLUDED_volk_gnsssdr_16ic_resamplerxnpuppet_16ic_a_H +#define INCLUDED_volk_gnsssdr_16ic_resamplerxnpuppet_16ic_a_H #include "volk_gnsssdr/volk_gnsssdr_16ic_xn_resampler_16ic_xn.h" #include @@ -42,7 +42,7 @@ #include #ifdef LV_HAVE_GENERIC -static inline void volk_gnsssdr_16ic_resamplerxnpuppet_16ic_u_generic(lv_16sc_t* result, const lv_16sc_t* local_code, unsigned int num_points) +static inline void volk_gnsssdr_16ic_resamplerxnpuppet_16ic_a_generic(lv_16sc_t* result, const lv_16sc_t* local_code, unsigned int num_points) { float code_phase_step_chips = 0.1; int code_length_chips = 1023; @@ -56,7 +56,7 @@ static inline void volk_gnsssdr_16ic_resamplerxnpuppet_16ic_u_generic(lv_16sc_t* result_aux[n] = (lv_16sc_t*)volk_gnsssdr_malloc(sizeof(lv_16sc_t)*num_points, volk_gnsssdr_get_alignment()); } volk_gnsssdr_16ic_xn_resampler_16ic_xn_generic(result_aux, local_code, rem_code_phase_chips, code_phase_step_chips, code_length_chips, num_out_vectors, num_points); - + memcpy(result, result_aux[0], sizeof(lv_16sc_t)*num_points); volk_gnsssdr_free(rem_code_phase_chips); for(unsigned int n = 0; n < num_out_vectors; n++) @@ -69,7 +69,7 @@ static inline void volk_gnsssdr_16ic_resamplerxnpuppet_16ic_u_generic(lv_16sc_t* #endif /* LV_HAVE_GENERIC */ #ifdef LV_HAVE_SSE2 -static inline void volk_gnsssdr_16ic_resamplerxnpuppet_16ic_u_sse2(lv_16sc_t* result, const lv_16sc_t* local_code, unsigned int num_points) +static inline void volk_gnsssdr_16ic_resamplerxnpuppet_16ic_a_sse2(lv_16sc_t* result, const lv_16sc_t* local_code, unsigned int num_points) { float code_phase_step_chips = 0.1; int code_length_chips = 1023; @@ -94,4 +94,4 @@ static inline void volk_gnsssdr_16ic_resamplerxnpuppet_16ic_u_sse2(lv_16sc_t* re #endif -#endif // INCLUDED_volk_gnsssdr_16ic_resamplerpuppet_16ic_u_H +#endif // INCLUDED_volk_gnsssdr_16ic_resamplerpuppet_16ic_a_H diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h index f06445992..0a37d1376 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h @@ -42,7 +42,7 @@ #include #ifdef LV_HAVE_GENERIC -static inline void volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic_u_generic(lv_16sc_t* result, const lv_16sc_t* local_code, const lv_16sc_t* in, unsigned int num_points) +static inline void volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic_a_generic(lv_16sc_t* result, const lv_16sc_t* local_code, const lv_16sc_t* in, unsigned int num_points) { int num_a_vectors = 3; lv_16sc_t** in_a = (lv_16sc_t**)volk_gnsssdr_malloc(sizeof(lv_16sc_t)*num_a_vectors, volk_gnsssdr_get_alignment()); @@ -63,7 +63,7 @@ static inline void volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic_u_generic(lv_16sc_t #endif // Generic #ifdef LV_HAVE_SSE2 -static inline void volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic_u_sse2(lv_16sc_t* result, const lv_16sc_t* local_code, const lv_16sc_t* in, unsigned int num_points) +static inline void volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic_a_sse2(lv_16sc_t* result, const lv_16sc_t* local_code, const lv_16sc_t* in, unsigned int num_points) { int num_a_vectors = 3; lv_16sc_t** in_a = (lv_16sc_t**)volk_gnsssdr_malloc(sizeof(lv_16sc_t)*num_a_vectors, volk_gnsssdr_get_alignment());