From 635e33cd1658e0ef180b50d8ffdc1da26c5d025b Mon Sep 17 00:00:00 2001
From: Daniel van der Schuur <schuur@astron.nl>
Date: Wed, 22 Apr 2015 08:31:10 +0000
Subject: [PATCH] -Updated paths to .rec files  .due to new 'unb1' or 'unb2'
 subdirs in the RadioHDL build directory. -Now also applying BSN filter
 (forwards BSN 5+ because WPFB output with lower  BSNs appear incorrect)
 always; not only in sim.

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

diff --git a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd
index 85fd54445b..d7b1db4869 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd
+++ b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd
@@ -935,19 +935,13 @@ BEGIN
   -- Workaround for simulation: the first WPFB output block is not usable! --FIXME
   -- Forward only blocks with BSN 5+
   -----------------------------------------------------------------------------
-  gen_bsn_filter : IF g_sim = TRUE GENERATE
-    p_bsn_filter : PROCESS(wpfb_snk_in_arr)
-    BEGIN
-      correlator_snk_in_arr <= (OTHERS=>c_dp_sosi_rst);
-      IF TO_UINT(wpfb_src_out_arr(0).bsn)>=5 THEN
-        correlator_snk_in_arr <= wpfb_src_out_arr;
-      END IF;
-    END PROCESS;
-  END GENERATE;
-
-  gen_connect : IF g_sim = FALSE GENERATE
-    correlator_snk_in_arr <= wpfb_src_out_arr;
-  END GENERATE;
+  p_bsn_filter : PROCESS(wpfb_snk_in_arr)
+  BEGIN
+    correlator_snk_in_arr <= (OTHERS=>c_dp_sosi_rst);
+    IF TO_UINT(wpfb_src_out_arr(0).bsn)>=5 THEN
+      correlator_snk_in_arr <= wpfb_src_out_arr;
+    END IF;
+  END PROCESS;
 
   -----------------------------------------------------------------------------
   -- Stream recorder to record the WPFB output stream to a file
@@ -957,7 +951,7 @@ BEGIN
     g_sim            => TRUE,
     g_pass_through   => FALSE,
     g_rec_not_play   => TRUE,
-    g_rec_play_file  => "../../../applications/apertif/designs/apertif_unb1_correlator/tb/rec/wpfb_src_out_arr0.rec",
+    g_rec_play_file  => "../../../../applications/apertif/designs/apertif_unb1_correlator/tb/rec/wpfb_src_out_arr0.rec",
     g_record_invalid => FALSE
   )
   PORT MAP (
@@ -1080,7 +1074,7 @@ BEGIN
       g_sim            => TRUE,
       g_pass_through   => FALSE,
       g_rec_not_play   => TRUE,
-      g_rec_play_file  => "../../../applications/apertif/designs/apertif_unb1_correlator/tb/rec/correlator_src_out_arr0.rec",
+      g_rec_play_file  => "../../../../applications/apertif/designs/apertif_unb1_correlator/tb/rec/correlator_src_out_arr0.rec",
       g_record_invalid => FALSE
     )
     PORT MAP (
-- 
GitLab