Merge remote-tracking branch 'origin/develop' into calib-LimeSDR

Conflicts: openair1/PHY/MODULATION/ofdm_mod.c
2017-02-13 11:17:28 +01:00
parent 02148c7950 e2ae88de23
commit 442bb79bd0
43 changed files with 628 additions and 438 deletions
@@ -145,7 +145,7 @@ void PHY_ofdm_mod(int *input,                       /// pointer to complex input
 #else
    // on AVX2 need 256-bit alignment
    idft((int16_t *)&input[i*fftsize],
-         (fftsize<=512) ? (int16_t *)temp : (int16_t *)&output[(i*fftsize) + ((1+i)*nb_prefix_samples)],
+         (int16_t *)temp,
         1);

 #endif
@@ -167,6 +167,7 @@ void PHY_ofdm_mod(int *input,                       /// pointer to complex input
      /*
 #ifndef __AVX2__
      if (fftsize==128) 
+
 #else
      if (fftsize<=512) 
      #endif*/