From 17926d5d48f0d39110d93eb9decf9944b850c756 Mon Sep 17 00:00:00 2001
From: Eric Kooistra <kooistra@astron.nl>
Date: Mon, 22 Aug 2022 11:29:08 +0200
Subject: [PATCH] Remove unused gn_index input from sdp_info / disturb_info
entity.
---
.../libraries/disturb/src/vhdl/disturb_info.vhd | 3 +--
.../libraries/disturb/src/vhdl/disturb_station.vhd | 4 ++--
.../lofar2/libraries/sdp/src/vhdl/sdp_info.vhd | 1 -
.../lofar2/libraries/sdp/src/vhdl/sdp_station.vhd | 10 +++++-----
4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/applications/disturb2/libraries/disturb/src/vhdl/disturb_info.vhd b/applications/disturb2/libraries/disturb/src/vhdl/disturb_info.vhd
index fb50b588a5..87c09eda8b 100644
--- a/applications/disturb2/libraries/disturb/src/vhdl/disturb_info.vhd
+++ b/applications/disturb2/libraries/disturb/src/vhdl/disturb_info.vhd
@@ -52,12 +52,11 @@ ENTITY disturb_info IS
reg_miso : OUT t_mem_miso;
-- inputs from other blocks
- gn_index : IN NATURAL;
f_adc : IN STD_LOGIC;
fsub_type : IN STD_LOGIC;
-- disturb info
- disturb_info : OUT t_disturb_info
+ disturb_info : OUT t_disturb_info
);
END disturb_info;
diff --git a/applications/disturb2/libraries/disturb/src/vhdl/disturb_station.vhd b/applications/disturb2/libraries/disturb/src/vhdl/disturb_station.vhd
index 40ae21aa8c..bfa362cb2e 100644
--- a/applications/disturb2/libraries/disturb/src/vhdl/disturb_station.vhd
+++ b/applications/disturb2/libraries/disturb/src/vhdl/disturb_station.vhd
@@ -544,10 +544,11 @@ ARCHITECTURE str OF disturb_station IS
BEGIN
+ gn_index <= TO_UINT(gn_id);
+
-----------------------------------------------------------------------------
-- SDP Info register
-----------------------------------------------------------------------------
- gn_index <= TO_UINT(gn_id);
-- derive MAC, IP and UDP Port
cep_eth_src_mac <= c_disturb_cep_eth_src_mac_47_16 & RESIZE_UVEC(this_bck_id, c_byte_w) & RESIZE_UVEC(this_chip_id, c_byte_w); -- Simply use chip_id since we only use 1 of the 6*4 = 24 10GbE port.
cep_ip_src_addr <= c_disturb_cep_ip_src_addr_31_16 & RESIZE_UVEC(this_bck_id, c_byte_w) & INCR_UVEC(RESIZE_UVEC(this_chip_id, c_byte_w), 1); -- +1 to avoid IP = *.*.*.0
@@ -572,7 +573,6 @@ BEGIN
reg_miso => reg_disturb_info_cipo,
-- inputs from other blocks
- gn_index => gn_index,
f_adc => c_f_adc,
fsub_type => c_fsub_type,
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_info.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_info.vhd
index 1e8aa33621..9a81eccb02 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_info.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_info.vhd
@@ -52,7 +52,6 @@ ENTITY sdp_info IS
reg_miso : OUT t_mem_miso;
-- inputs from other blocks
- gn_index : IN NATURAL;
f_adc : IN STD_LOGIC;
fsub_type : IN STD_LOGIC;
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd
index 7455fcaf62..b6286cb5ec 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd
@@ -65,9 +65,9 @@ ENTITY sdp_station IS
dp_clk : IN STD_LOGIC;
-- ID
- gn_id : IN STD_LOGIC_VECTOR(c_sdp_W_gn_id-1 DOWNTO 0);
- this_bck_id : IN STD_LOGIC_VECTOR(6-1 DOWNTO 0);
- this_chip_id : IN STD_LOGIC_VECTOR(2-1 DOWNTO 0);
+ gn_id : IN STD_LOGIC_VECTOR(c_sdp_W_gn_id-1 DOWNTO 0); -- used for udp src port
+ this_bck_id : IN STD_LOGIC_VECTOR(6-1 DOWNTO 0); -- used for src mac / ip
+ this_chip_id : IN STD_LOGIC_VECTOR(2-1 DOWNTO 0); -- used for src mac / ip
-- Transceiver clocks
SA_CLK : IN STD_LOGIC := '0'; -- Clock 10GbE front (qsfp) and ring lines
@@ -559,10 +559,11 @@ ARCHITECTURE str OF sdp_station IS
BEGIN
+ gn_index <= TO_UINT(gn_id);
+
-----------------------------------------------------------------------------
-- SDP Info register
-----------------------------------------------------------------------------
- gn_index <= TO_UINT(gn_id);
-- derive MAC, IP and UDP Port
cep_eth_src_mac <= c_sdp_cep_eth_src_mac_47_16 & RESIZE_UVEC(this_bck_id, c_byte_w) & RESIZE_UVEC(this_chip_id, c_byte_w); -- Simply use chip_id since we only use 1 of the 6*4 = 24 10GbE port.
cep_ip_src_addr <= c_sdp_cep_ip_src_addr_31_16 & RESIZE_UVEC(this_bck_id, c_byte_w) & INCR_UVEC(RESIZE_UVEC(this_chip_id, c_byte_w), 1); -- +1 to avoid IP = *.*.*.0
@@ -587,7 +588,6 @@ BEGIN
reg_miso => reg_sdp_info_cipo,
-- inputs from other blocks
- gn_index => gn_index,
f_adc => c_f_adc,
fsub_type => c_fsub_type,
--
GitLab