From 5aea94cfab4f65b8b28f1048684eb6e9822421ee Mon Sep 17 00:00:00 2001
From: Erik Kooistra <kooistra@astron.nl>
Date: Tue, 21 Aug 2018 14:28:16 +0000
Subject: [PATCH] Remove default c_wpfb from wpfb_pkg.vhd and from g_wpfb map
to enforce explicite asignment of g_wpfb per instance.
---
libraries/dsp/wpfb/src/vhdl/wpfb_pkg.vhd | 6 ------
libraries/dsp/wpfb/src/vhdl/wpfb_unit.vhd | 2 +-
libraries/dsp/wpfb/src/vhdl/wpfb_unit_dev.vhd | 2 +-
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/libraries/dsp/wpfb/src/vhdl/wpfb_pkg.vhd b/libraries/dsp/wpfb/src/vhdl/wpfb_pkg.vhd
index bb6eeea6b6..c359f89fe3 100644
--- a/libraries/dsp/wpfb/src/vhdl/wpfb_pkg.vhd
+++ b/libraries/dsp/wpfb/src/vhdl/wpfb_pkg.vhd
@@ -66,12 +66,6 @@ package wpfb_pkg is
end record;
- -- Default
- constant c_wpfb : t_wpfb := (4, 1024, 0, 1,
- 16, 0, 8, 16, 16,
- true, false, true, 16, 16, 0, c_dsp_mult_w, 2, true, 56, 2, 800000,
- c_fft_pipeline, c_fft_pipeline, c_fil_ppf_pipeline);
-
-----------------------------------------------------------------------------
-- Apertif application specfic settings
-----------------------------------------------------------------------------
diff --git a/libraries/dsp/wpfb/src/vhdl/wpfb_unit.vhd b/libraries/dsp/wpfb/src/vhdl/wpfb_unit.vhd
index e09c66e6dd..2bfba7f1b1 100644
--- a/libraries/dsp/wpfb/src/vhdl/wpfb_unit.vhd
+++ b/libraries/dsp/wpfb/src/vhdl/wpfb_unit.vhd
@@ -62,7 +62,7 @@ use work.wpfb_pkg.all;
entity wpfb_unit is
generic (
- g_wpfb : t_wpfb := c_wpfb;
+ g_wpfb : t_wpfb;
g_use_prefilter : boolean := TRUE;
g_stats_ena : boolean := TRUE; -- Enables the statistics unit
g_use_bg : boolean := FALSE;
diff --git a/libraries/dsp/wpfb/src/vhdl/wpfb_unit_dev.vhd b/libraries/dsp/wpfb/src/vhdl/wpfb_unit_dev.vhd
index 92fda4ada6..4654f302ed 100644
--- a/libraries/dsp/wpfb/src/vhdl/wpfb_unit_dev.vhd
+++ b/libraries/dsp/wpfb/src/vhdl/wpfb_unit_dev.vhd
@@ -359,7 +359,7 @@ use work.wpfb_pkg.all;
entity wpfb_unit_dev is
generic (
g_big_endian_wb_in : boolean := true;
- g_wpfb : t_wpfb := c_wpfb;
+ g_wpfb : t_wpfb;
g_dont_flip_channels: boolean := false; -- True preserves channel interleaving for pipelined FFT
g_use_prefilter : boolean := TRUE;
g_stats_ena : boolean := TRUE; -- Enables the statistics unit
--
GitLab