Skip to content

V
VME64x core
Commit 6a0fe9f8 authored by Tom Levens's avatar Tom Levens
Browse files
Options

Fixes and cleanup 

Signed-off-by: Tom Levens's avatarTom Levens <tom.levens@cern.ch>
parent 0b5cb429
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
hdl/vme64x-core/rtl/VME_CR_CSR_Space.vhd
View file @ 6a0fe9f8
...@@ -390,14 +390,14 @@ begin ...@@ -390,14 +390,14 @@ begin
end process; end process;
bar_o <= s_reg_bar(7 downto 3); bar_o <= s_reg_bar(7 downto 3);
f0_ader_o <= s_reg_ader(0); f0_ader_o <= s_ader(0) when s_ader(0)(ADER_DFSR) = '0' else (others => '0');
f1_ader_o <= s_reg_ader(1); f1_ader_o <= s_ader(1) when s_ader(1)(ADER_DFSR) = '0' else (others => '0');
f2_ader_o <= s_reg_ader(2); f2_ader_o <= s_ader(2) when s_ader(2)(ADER_DFSR) = '0' else (others => '0');
f3_ader_o <= s_reg_ader(3); f3_ader_o <= s_ader(3) when s_ader(3)(ADER_DFSR) = '0' else (others => '0');
f4_ader_o <= s_reg_ader(4); f4_ader_o <= s_ader(4) when s_ader(4)(ADER_DFSR) = '0' else (others => '0');
f5_ader_o <= s_reg_ader(5); f5_ader_o <= s_ader(5) when s_ader(5)(ADER_DFSR) = '0' else (others => '0');
f6_ader_o <= s_reg_ader(6); f6_ader_o <= s_ader(6) when s_ader(6)(ADER_DFSR) = '0' else (others => '0');
f7_ader_o <= s_reg_ader(7); f7_ader_o <= s_ader(7) when s_ader(7)(ADER_DFSR) = '0' else (others => '0');
module_enable_o <= s_reg_bit_reg(4); module_enable_o <= s_reg_bit_reg(4);
vme_sysfail_ena_o <= s_reg_bit_reg(6); vme_sysfail_ena_o <= s_reg_bit_reg(6);
module_reset_o <= s_reg_bit_reg(7); module_reset_o <= s_reg_bit_reg(7);
......
hdl/vme64x-core/rtl/xvme64x_core.vhd
View file @ 6a0fe9f8
...@@ -315,7 +315,7 @@ begin -- wrapper ...@@ -315,7 +315,7 @@ begin -- wrapper
master_o.adr <= adr_out(29 downto 0) & "00"; master_o.adr <= adr_out(29 downto 0) & "00";
dat_in <= master_i.dat; dat_in <= master_i.dat;
gen_user_cr_csr: if g_user_csr_ext = false generate gen_int_user_csr : if g_user_csr_ext = false generate
U_User_CSR : VME_User_CSR U_User_CSR : VME_User_CSR
generic map ( generic map (
g_wb_data_width => g_wb_data_width g_wb_data_width => g_wb_data_width
...@@ -334,7 +334,7 @@ begin -- wrapper ...@@ -334,7 +334,7 @@ begin -- wrapper
bytes_i => x"0000" bytes_i => x"0000"
); );
end generate; end generate;
gen_no_user_cr_csr: if g_user_csr_ext = true generate gen_ext_user_csr : if g_user_csr_ext = true generate
user_csr_data_in <= user_csr_data_i; user_csr_data_in <= user_csr_data_i;
end generate; end generate;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment