greek64/rtps-fpga
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Modify DDS Writer/Reader to instantiate the Key Holder only when WITH_KEY=true

Browse Source
This commit is contained in:
John Ring 2023-07-23 20:34:02 +02:00
parent d3a69dbe99
commit 0e085a3b03
2 changed files with 62 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/dds_reader.vhd
View File

@ -992,28 +992,37 @@ begin
--*****COMPONENT INSTANTIATION***** --*****COMPONENT INSTANTIATION*****
key_holder_gen : for i in 0 to NUM_READERS-1 generate key_holder_gen : for i in 0 to NUM_READERS-1 generate
key_holder_inst : key_holder key_holder_if_gen : if CONFIG_ARRAY_T(i).WITH_KEY generate
port map ( key_holder_inst : key_holder
-- SYSTEM port map (
clk => clk, -- SYSTEM
reset => reset, clk => clk,
-- CONTROL reset => reset,
start => start_kh(i), -- CONTROL
opcode => opcode_kh(i), start => start_kh(i),
ack => ack_kh(i), opcode => opcode_kh(i),
decode_error => decode_error_kh(i), ack => ack_kh(i),
abort => abort_kh(i), decode_error => decode_error_kh(i),
-- INPUT abort => abort_kh(i),
ready_in => ready_out_kh(i), -- INPUT
valid_in => valid_out_kh(i), ready_in => ready_out_kh(i),
data_in => data_out_kh(i), valid_in => valid_out_kh(i),
last_word_in => last_word_out_kh(i), data_in => data_out_kh(i),
-- OUTPUT last_word_in => last_word_out_kh(i),
ready_out => ready_in_kh(i), -- OUTPUT
valid_out => valid_in_kh(i), ready_out => ready_in_kh(i),
data_out => data_in_kh(i), valid_out => valid_in_kh(i),
last_word_out => last_word_in_kh(i) data_out => data_in_kh(i),
); last_word_out => last_word_in_kh(i)
);
else generate
ack_kh(i) <= '0';
decode_error_kh(i) <= '0';
ready_in_kh(i) <= '0';
valid_out_kh(i) <= '0';
last_word_out_kh(i) <= '0';
data_out_kh(i) <= (others => '0');
end generate;
end generate; end generate;
sample_mem_ctrl_gen : for i in 0 to NUM_READERS-1 generate sample_mem_ctrl_gen : for i in 0 to NUM_READERS-1 generate

53
src/dds_writer.vhd
View File

@ -825,28 +825,37 @@ begin
--*****COMPONENT INSTANTIATION***** --*****COMPONENT INSTANTIATION*****
key_holder_gen : for i in 0 to NUM_WRITERS-1 generate key_holder_gen : for i in 0 to NUM_WRITERS-1 generate
key_holder_inst : key_holder key_holder_if_gen : if CONFIG_ARRAY_T(i).WITH_KEY generate
port map ( key_holder_inst : key_holder
-- SYSTEM port map (
clk => clk, -- SYSTEM
reset => reset, clk => clk,
-- CONTROL reset => reset,
start => start_kh(i), -- CONTROL
opcode => opcode_kh(i), start => start_kh(i),
ack => ack_kh(i), opcode => opcode_kh(i),
decode_error => decode_error_kh(i), ack => ack_kh(i),
abort => abort_kh(i), decode_error => decode_error_kh(i),
-- INPUT abort => abort_kh(i),
ready_in => ready_out_kh(i), -- INPUT
valid_in => valid_out_kh(i), ready_in => ready_out_kh(i),
data_in => data_out_kh(i), valid_in => valid_out_kh(i),
last_word_in => last_word_out_kh(i), data_in => data_out_kh(i),
-- OUTPUT last_word_in => last_word_out_kh(i),
ready_out => ready_in_kh(i), -- OUTPUT
valid_out => valid_in_kh(i), ready_out => ready_in_kh(i),
data_out => data_in_kh(i), valid_out => valid_in_kh(i),
last_word_out => last_word_in_kh(i) data_out => data_in_kh(i),
); last_word_out => last_word_in_kh(i)
);
else generate
ack_kh(i) <= '0';
decode_error_kh(i) <= '0';
ready_in_kh(i) <= '0';
valid_out_kh(i) <= '0';
last_word_out_kh(i) <= '0';
data_out_kh(i) <= (others => '0');
end generate;
end generate; end generate;
sample_mem_ctrl_gen : for i in 0 to NUM_WRITERS-1 generate sample_mem_ctrl_gen : for i in 0 to NUM_WRITERS-1 generate