Skip to content
Snippets Groups Projects
Commit 17926d5d authored by Eric Kooistra's avatar Eric Kooistra
Browse files

Remove unused gn_index input from sdp_info / disturb_info entity.

parent 01e688c1
No related branches found
No related tags found
1 merge request!273Use t_parameters and t_input to register the statistics info. Make sure that...
...@@ -52,12 +52,11 @@ ENTITY disturb_info IS ...@@ -52,12 +52,11 @@ ENTITY disturb_info IS
reg_miso : OUT t_mem_miso; reg_miso : OUT t_mem_miso;
-- inputs from other blocks -- inputs from other blocks
gn_index : IN NATURAL;
f_adc : IN STD_LOGIC; f_adc : IN STD_LOGIC;
fsub_type : IN STD_LOGIC; fsub_type : IN STD_LOGIC;
-- disturb info -- disturb info
disturb_info : OUT t_disturb_info disturb_info : OUT t_disturb_info
); );
END disturb_info; END disturb_info;
......
...@@ -544,10 +544,11 @@ ARCHITECTURE str OF disturb_station IS ...@@ -544,10 +544,11 @@ ARCHITECTURE str OF disturb_station IS
BEGIN BEGIN
gn_index <= TO_UINT(gn_id);
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- SDP Info register -- SDP Info register
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
gn_index <= TO_UINT(gn_id);
-- derive MAC, IP and UDP Port -- 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_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 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 ...@@ -572,7 +573,6 @@ BEGIN
reg_miso => reg_disturb_info_cipo, reg_miso => reg_disturb_info_cipo,
-- inputs from other blocks -- inputs from other blocks
gn_index => gn_index,
f_adc => c_f_adc, f_adc => c_f_adc,
fsub_type => c_fsub_type, fsub_type => c_fsub_type,
......
...@@ -52,7 +52,6 @@ ENTITY sdp_info IS ...@@ -52,7 +52,6 @@ ENTITY sdp_info IS
reg_miso : OUT t_mem_miso; reg_miso : OUT t_mem_miso;
-- inputs from other blocks -- inputs from other blocks
gn_index : IN NATURAL;
f_adc : IN STD_LOGIC; f_adc : IN STD_LOGIC;
fsub_type : IN STD_LOGIC; fsub_type : IN STD_LOGIC;
......
...@@ -65,9 +65,9 @@ ENTITY sdp_station IS ...@@ -65,9 +65,9 @@ ENTITY sdp_station IS
dp_clk : IN STD_LOGIC; dp_clk : IN STD_LOGIC;
-- ID -- ID
gn_id : IN STD_LOGIC_VECTOR(c_sdp_W_gn_id-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); 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); this_chip_id : IN STD_LOGIC_VECTOR(2-1 DOWNTO 0); -- used for src mac / ip
-- Transceiver clocks -- Transceiver clocks
SA_CLK : IN STD_LOGIC := '0'; -- Clock 10GbE front (qsfp) and ring lines SA_CLK : IN STD_LOGIC := '0'; -- Clock 10GbE front (qsfp) and ring lines
...@@ -559,10 +559,11 @@ ARCHITECTURE str OF sdp_station IS ...@@ -559,10 +559,11 @@ ARCHITECTURE str OF sdp_station IS
BEGIN BEGIN
gn_index <= TO_UINT(gn_id);
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- SDP Info register -- SDP Info register
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
gn_index <= TO_UINT(gn_id);
-- derive MAC, IP and UDP Port -- 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_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 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 ...@@ -587,7 +588,6 @@ BEGIN
reg_miso => reg_sdp_info_cipo, reg_miso => reg_sdp_info_cipo,
-- inputs from other blocks -- inputs from other blocks
gn_index => gn_index,
f_adc => c_f_adc, f_adc => c_f_adc,
fsub_type => c_fsub_type, fsub_type => c_fsub_type,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment