From 8a44724f71f1cc989e68785ee0a0c2aa0b4f8f43 Mon Sep 17 00:00:00 2001
From: Daniel van der Schuur <schuur@astron.nl>
Date: Thu, 12 Feb 2015 13:57:11 +0000
Subject: [PATCH] -Set WPFB reorder to False.

---
 .../src/vhdl/apertif_unb1_correlator.vhd                 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/applications/apertif/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd b/applications/apertif/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd
index 5720af9efa..2ebe1093e6 100644
--- a/applications/apertif/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd
+++ b/applications/apertif/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd
@@ -143,10 +143,11 @@ ARCHITECTURE str OF apertif_unb1_correlator IS
   CONSTANT c_wpfb_in_dat_w          : NATURAL := 8; --6;                    -- = 8, number of input bits                           
   CONSTANT c_wpfb_out_dat_w         : NATURAL := 14; --12;                   -- = 14, number of output bits: in_dat_w + natural((cei
   CONSTANT c_wpfb_use_separate      : BOOLEAN := FALSE;                -- = false for complex input, true for two real inputs
+  CONSTANT c_wpfb_use_reorder       : BOOLEAN := TRUE;
 
   CONSTANT c_wpfb : t_wpfb  := (c_wpfb_wb_factor, c_wpfb_nof_points, c_wpfb_nof_chan, c_wpfb_nof_wb_streams,
                                 c_wpfb_nof_taps, c_wpfb_in_dat_w, 16, 16,
-                                true, c_wpfb_use_separate, 16, c_wpfb_out_dat_w, 18, 2, true, 56, 2,                      
+                                c_wpfb_use_reorder, c_wpfb_use_separate, 16, c_wpfb_out_dat_w, 18, 2, true, 56, 2,                      
                                 c_fft_pipeline, c_fft_pipeline, c_fil_ppf_pipeline);
 
   CONSTANT c_wpfb_coefs_file_prefix : STRING  := "../../../../../UniBoard/trunk/Firmware/dsp/filter/build/data/coefs_wide1_p64_t8";
@@ -193,7 +194,7 @@ BEGIN
     g_nof_output_streams => c_nof_input_streams,
     g_buf_dat_w          => 2*c_complex_data_w,
     g_buf_addr_w         => ceil_log2(TO_UINT(c_bg_ctrl.samples_per_packet)),
-    g_file_name_prefix   => "../../../applications/apertif_unb1_correlator/src/hex/composite_signals",
+    g_file_name_prefix   => "../../../applications/apertif/apertif_unb1_correlator/src/hex/composite_signals",
     g_diag_block_gen_rst => c_bg_ctrl
   )
   PORT MAP (
@@ -262,7 +263,7 @@ BEGIN
     g_sim            => TRUE,
     g_pass_through   => FALSE,
     g_rec_not_play   => TRUE,
-    g_rec_play_file  => "../../../applications/apertif_unb1_correlator/tb/rec/wpfb_src_out_arr0.rec",
+    g_rec_play_file  => "../../../applications/apertif/apertif_unb1_correlator/tb/rec/wpfb_src_out_arr0.rec",
     g_record_invalid => FALSE
   )
   PORT MAP (
@@ -303,7 +304,7 @@ BEGIN
     g_sim            => TRUE,
     g_pass_through   => FALSE,
     g_rec_not_play   => TRUE,
-    g_rec_play_file  => "../../../applications/apertif_unb1_correlator/tb/rec/correlator_src_out_arr0.rec",
+    g_rec_play_file  => "../../../applications/apertif/apertif_unb1_correlator/tb/rec/correlator_src_out_arr0.rec",
     g_record_invalid => FALSE
   )
   PORT MAP (
-- 
GitLab