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

ganimede-toplevel-template #13

Merged
Adam merged 41 commits from ganimede-toplevel-template into main 2025-03-13 16:41:18 +01:00
Conversation 0 Commits 41 Files Changed 16 +4 -2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 82278e77cf - Show all commits

3
src/control_socbridge_merge/control_socbridge_tb.vhd
View File

@ -173,7 +173,7 @@ begin
curr_word <= "00101001"; curr_word <= "00101001";
wait for CLK_PERIOD; wait for CLK_PERIOD;
curr_word <= "00000000"; curr_word <= "00000000";
wait for CLK_PERIOD*10; wait for CLK_PERIOD*20;
curr_word <= "01100001"; curr_word <= "01100001";
wait for CLK_PERIOD; wait for CLK_PERIOD;
curr_word <= "00100000"; curr_word <= "00100000";
@ -197,6 +197,7 @@ begin
int_socbridge_in.payload <= std_logic_vector(to_unsigned(input, int_socbridge_in.payload'length)); int_socbridge_in.payload <= std_logic_vector(to_unsigned(input, int_socbridge_in.payload'length));
input := input + 1 mod 256; input := input + 1 mod 256;
wait until rising_edge(clk) and int_socbridge_out.is_full_out = '0'; wait until rising_edge(clk) and int_socbridge_out.is_full_out = '0';
wait until falling_edge(clk);
int_socbridge_in.write_enable_out <= '1'; int_socbridge_in.write_enable_out <= '1';
int_socbridge_in.payload <= std_logic_vector(to_unsigned(input, int_socbridge_in.payload'length)); int_socbridge_in.payload <= std_logic_vector(to_unsigned(input, int_socbridge_in.payload'length));
input := input + 1 mod 256; input := input + 1 mod 256;

3
src/socbridge/socbridge_driver.vhd
View File

@ -166,7 +166,7 @@ begin
when RX_RESPONSE => when RX_RESPONSE =>
-- Wait for read response. -- Wait for read response.
if curr_response = READ_RESPONSE then if curr_response = READ_RESPONSE then
next_state <= RX_BODY_NO_OUT; next_state <= RX_BODY;
else else
next_state <= RX_RESPONSE; next_state <= RX_RESPONSE;
end if; end if;
@ -241,6 +241,7 @@ begin
if st.curr_cmd = WRITE_ADD then if st.curr_cmd = WRITE_ADD then
int_out.is_full_out <= '0'; int_out.is_full_out <= '0';
ext_out_data_cmd := int_in.payload; ext_out_data_cmd := int_in.payload;
report integer'image(to_integer(signed(ext_out_data_cmd))) & " "& integer'image(to_integer(signed(int_in.payload)));
end if; end if;
end case; end case;
next_parity_out <= calc_parity(ext_out_data_cmd); next_parity_out <= calc_parity(ext_out_data_cmd);