kryddan/exjobb-public
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

ganimede-rework #20

Closed
kryddan wants to merge 25 commits from ganimede-rework into ganimede-single-issue
pull from: ganimede-rework
merge into: kryddan:ganimede-single-issue
Conversation 0 Commits 25 Files Changed 10 +4 -3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 07d7fce6b9 - Show all commits

7
src/fifo_buffer/fifo_buffer.vhd
View File

@ -53,7 +53,8 @@ begin
techmap_ram_inst : entity techmap.syncram_2p techmap_ram_inst : entity techmap.syncram_2p
generic map(tech => tech, generic map(tech => tech,
abits => address_bits, abits => address_bits,
dbits => fifo_width dbits => fifo_width,
sepclk => 1
) )
port map( port map(
rclk => out_clk, rclk => out_clk,
@ -97,8 +98,8 @@ begin
if rising_edge(in_clk) and valid_in = '1' and buffer_full = '0' then if rising_edge(in_clk) and valid_in = '1' and buffer_full = '0' then
write_pointer <= std_logic_vector(unsigned(write_pointer) + 1); write_pointer <= std_logic_vector(unsigned(write_pointer) + 1);
end if; end if;
if rising_edge(out_clk) then if falling_edge(out_clk) then
if ready_in = '1' and buffer_empty = '0' and unsigned(read_pointer) + 1 /= unsigned(write_pointer) then if ready_in = '1' and buffer_empty = '0' then
read_pointer <= std_logic_vector(unsigned(read_pointer) + 1); read_pointer <= std_logic_vector(unsigned(read_pointer) + 1);
valid_out <= '1'; valid_out <= '1';
else else