[hamradio-commits] [gnss-sdr] 20/236: fixes

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.

commit 5067c5852c4c4179351927b156e750daef2df525
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri Feb 12 10:57:53 2016 +0100

    fixes
---
 .../volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn.h            | 10 +++++-----
 .../volk_gnsssdr_16ic_x2_rotator_dotprodxnpuppet_16ic.h        |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn.h
index ea28e9c..44f142a 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn.h
@@ -434,7 +434,7 @@ static inline void volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn_neon(lv_16sc_t*
 
     if (neon_iters > 0)
         {
-            int16x4x2_t a_val, b_val, c_val;
+            int16x4x2_t a_val, c_val;
             __VOLK_ATTR_ALIGNED(16) lv_16sc_t dotProductVector[4];
             float32x4_t half = vdupq_n_f32(0.5f);
             int16x4x2_t tmp16;
@@ -508,15 +508,15 @@ static inline void volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn_neon(lv_16sc_t*
 
                             // multiply the real*real and imag*imag to get real result
                             // a0r*b0r|a1r*b1r|a2r*b2r|a3r*b3r
-                            tmp_real16.val[0] = vmul_s16(a_val.val[0], b_val.val[0]);
+                            tmp_real16.val[0] = vmul_s16(a_val.val[0], tmp16.val[0]);
                             // a0i*b0i|a1i*b1i|a2i*b2i|a3i*b3i
-                            tmp_real16.val[1] = vmul_s16(a_val.val[1], b_val.val[1]);
+                            tmp_real16.val[1] = vmul_s16(a_val.val[1], tmp16.val[1]);
 
                             // Multiply cross terms to get the imaginary result
                             // a0r*b0i|a1r*b1i|a2r*b2i|a3r*b3i
-                            tmp_imag16.val[0] = vmul_s16(a_val.val[0], b_val.val[1]);
+                            tmp_imag16.val[0] = vmul_s16(a_val.val[0], tmp16.val[1]);
                             // a0i*b0r|a1i*b1r|a2i*b2r|a3i*b3r
-                            tmp_imag16.val[1] = vmul_s16(a_val.val[1], b_val.val[0]);
+                            tmp_imag16.val[1] = vmul_s16(a_val.val[1], tmp16.val[0]);
 
                             c_val.val[0] = vsub_s16(tmp_real16.val[0], tmp_real16.val[1]);
                             c_val.val[1] = vadd_s16(tmp_imag16.val[0], tmp_imag16.val[1]);
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dotprodxnpuppet_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dotprodxnpuppet_16ic.h
index 63a86cf..bc8a7bb 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dotprodxnpuppet_16ic.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dotprodxnpuppet_16ic.h
@@ -59,7 +59,7 @@ static inline void volk_gnsssdr_16ic_x2_rotator_dotprodxnpuppet_16ic_generic(lv_
             in_a[n] = (lv_16sc_t*)volk_gnsssdr_malloc(sizeof(lv_16sc_t) * num_points, volk_gnsssdr_get_alignment());
             memcpy(in_a[n], in, sizeof(lv_16sc_t) * num_points);
         }
-    result = (lv_16sc_t*)calloc(num_points, sizeof(lv_16sc_t));
+    //result = (lv_16sc_t*)calloc(num_points, sizeof(lv_16sc_t));
     volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn_generic(result, local_code, phase_inc[0], phase,(const lv_16sc_t**) in_a, num_a_vectors, num_points);
 
     for(unsigned int n = 0; n < num_a_vectors; n++)
@@ -151,7 +151,7 @@ static inline void volk_gnsssdr_16ic_x2_rotator_dotprodxnpuppet_16ic_neon(lv_16s
             in_a[n] = (lv_16sc_t*)volk_gnsssdr_malloc(sizeof(lv_16sc_t)*num_points, volk_gnsssdr_get_alignment());
             memcpy(in_a[n], in, sizeof(lv_16sc_t)*num_points);
         }
-    result = (lv_16sc_t*)calloc(num_points, sizeof(lv_16sc_t));
+    //result = (lv_16sc_t*)calloc(num_points, sizeof(lv_16sc_t));
     volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn_neon(result, local_code, phase_inc[0], phase, (const lv_16sc_t**) in_a, num_a_vectors, num_points);
 
     for(unsigned int n = 0; n < num_a_vectors; n++)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git