From 9c49be1313fb2130295d0dd939cefc0ccf0e250d Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sun, 29 Apr 2018 11:38:42 +0200
Subject: [PATCH] Removed intrinsics completely from IntHalfbandFilterEO2

---
 sdrbase/dsp/inthalfbandfiltereo2.h | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/sdrbase/dsp/inthalfbandfiltereo2.h b/sdrbase/dsp/inthalfbandfiltereo2.h
index 72bf760d4..be513419b 100644
--- a/sdrbase/dsp/inthalfbandfiltereo2.h
+++ b/sdrbase/dsp/inthalfbandfiltereo2.h
@@ -26,7 +26,6 @@
 #include <cstdlib>
 #include "dsp/dsptypes.h"
 #include "dsp/hbfiltertraits.h"
-#include "dsp/inthalfbandfiltereo2i.h"
 #include "export.h"
 
 template<uint32_t HBFilterOrder>
@@ -622,7 +621,7 @@ public:
     }
 
 protected:
-    qint64 m_even[2][HBFIRFilterTraits<HBFilterOrder>::hbOrder];     // double buffer technique (qint32 to activate vectorization)
+    qint64 m_even[2][HBFIRFilterTraits<HBFilterOrder>::hbOrder];     // double buffer technique
     qint64 m_odd[2][HBFIRFilterTraits<HBFilterOrder>::hbOrder];      // double buffer technique
     int32_t m_samples[HBFIRFilterTraits<HBFilterOrder>::hbOrder][2]; // double buffer technique
 
@@ -694,15 +693,6 @@ protected:
         qint64 iAcc = 0;
         qint64 qAcc = 0;
 
-//#if defined(USE_SSE4_1) && !defined(NO_DSP_SIMD)
-//        IntHalfbandFilterEO2Intrisics<HBFilterOrder>::work(
-//                m_ptr,
-//                m_even,
-//                m_odd,
-//                iAcc,
-//                qAcc
-//        );
-//#else
         int a = m_ptr/2 + m_size; // tip pointer
         int b = m_ptr/2 + 1; // tail pointer
         for (int i = 0; i < HBFIRFilterTraits<HBFilterOrder>::hbOrder / 4; i++)
@@ -721,7 +711,6 @@ protected:
             a -= 1;
             b += 1;
         }
-//#endif
 
         if ((m_ptr % 2) == 0)
         {
@@ -743,15 +732,6 @@ protected:
         qint64 iAcc = 0;
         qint64 qAcc = 0;
 
-//#if defined(USE_SSE4_1) && !defined(NO_DSP_SIMD)
-//        IntHalfbandFilterEO2Intrisics<HBFilterOrder>::work(
-//                m_ptr,
-//                m_even,
-//                m_odd,
-//                iAcc,
-//                qAcc
-//        );
-//#else
         int a = m_ptr/2 + m_size; // tip pointer
         int b = m_ptr/2 + 1; // tail pointer
 
@@ -771,7 +751,7 @@ protected:
             a -= 1;
             b += 1;
         }
-//#endif
+
         if ((m_ptr % 2) == 0)
         {
             iAcc += ((int32_t)m_odd[0][m_ptr/2 + m_size/2]) << (HBFIRFilterTraits<HBFilterOrder>::hbShift - 1);