Commit c3ba2cce authored by Ille, Ondrej, Ing.'s avatar Ille, Ondrej, Ing.

src: internal copy of arbitration_lost signal to support Vivado build.

Signed-off-by: Pavel Pisa's avatarPavel Pisa <pisa@cmp.felk.cvut.cz>

# Conflicts:
#	src/can_core/protocol_control/protocol_control_fsm.vhd
parent 4af58ac4
Pipeline #9414 failed with stages
in 93 minutes and 2 seconds
...@@ -576,6 +576,9 @@ architecture rtl of protocol_control_fsm is ...@@ -576,6 +576,9 @@ architecture rtl of protocol_control_fsm is
-- Arbitration lost condition -- Arbitration lost condition
signal arbitration_lost_condition : std_logic; signal arbitration_lost_condition : std_logic;
-- Loss of arbitration -> Turn receiver!
signal arbitration_lost_i : std_logic;
-- Transmission failed (due to reached number of retransmissions), or -- Transmission failed (due to reached number of retransmissions), or
-- first error, arb lost when there are 0 retransmissions allowed! -- first error, arb lost when there are 0 retransmissions allowed!
...@@ -1330,7 +1333,7 @@ begin ...@@ -1330,7 +1333,7 @@ begin
crc_clear_match_flag <= '0'; crc_clear_match_flag <= '0';
err_pos <= ERC_POS_OTHER; err_pos <= ERC_POS_OTHER;
arbitration_lost <= '0'; arbitration_lost_i <= '0';
set_transmitter_i <= '0'; set_transmitter_i <= '0';
set_receiver_i <= '0'; set_receiver_i <= '0';
set_idle_i <= '0'; set_idle_i <= '0';
...@@ -1493,7 +1496,7 @@ begin ...@@ -1493,7 +1496,7 @@ begin
if (arbitration_lost_condition = '1') then if (arbitration_lost_condition = '1') then
txtb_hw_cmd_d.unlock <= '1'; txtb_hw_cmd_d.unlock <= '1';
arbitration_lost <= '1'; arbitration_lost_i <= '1';
stuff_enable_clear <= '1'; stuff_enable_clear <= '1';
if (tx_failed = '1') then if (tx_failed = '1') then
txtb_hw_cmd_d.failed <= '1'; txtb_hw_cmd_d.failed <= '1';
...@@ -1525,7 +1528,7 @@ begin ...@@ -1525,7 +1528,7 @@ begin
if (arbitration_lost_condition = '1') then if (arbitration_lost_condition = '1') then
txtb_hw_cmd_d.unlock <= '1'; txtb_hw_cmd_d.unlock <= '1';
arbitration_lost <= '1'; arbitration_lost_i <= '1';
stuff_enable_clear <= '1'; stuff_enable_clear <= '1';
if (tx_failed = '1') then if (tx_failed = '1') then
txtb_hw_cmd_d.failed <= '1'; txtb_hw_cmd_d.failed <= '1';
...@@ -1565,7 +1568,7 @@ begin ...@@ -1565,7 +1568,7 @@ begin
if (ide_is_arbitration = '1' and arbitration_lost_condition = '1') then if (ide_is_arbitration = '1' and arbitration_lost_condition = '1') then
txtb_hw_cmd_d.unlock <= '1'; txtb_hw_cmd_d.unlock <= '1';
arbitration_lost <= '1'; arbitration_lost_i <= '1';
stuff_enable_clear <= '1'; stuff_enable_clear <= '1';
if (tx_failed = '1') then if (tx_failed = '1') then
txtb_hw_cmd_d.failed <= '1'; txtb_hw_cmd_d.failed <= '1';
...@@ -1611,7 +1614,7 @@ begin ...@@ -1611,7 +1614,7 @@ begin
if (arbitration_lost_condition = '1') then if (arbitration_lost_condition = '1') then
txtb_hw_cmd_d.unlock <= '1'; txtb_hw_cmd_d.unlock <= '1';
arbitration_lost <= '1'; arbitration_lost_i <= '1';
stuff_enable_clear <= '1'; stuff_enable_clear <= '1';
if (tx_failed = '1') then if (tx_failed = '1') then
txtb_hw_cmd_d.failed <= '1'; txtb_hw_cmd_d.failed <= '1';
...@@ -1642,7 +1645,7 @@ begin ...@@ -1642,7 +1645,7 @@ begin
if (arbitration_lost_condition = '1') then if (arbitration_lost_condition = '1') then
txtb_hw_cmd_d.unlock <= '1'; txtb_hw_cmd_d.unlock <= '1';
arbitration_lost <= '1'; arbitration_lost_i <= '1';
stuff_enable_clear <= '1'; stuff_enable_clear <= '1';
if (tx_failed = '1') then if (tx_failed = '1') then
txtb_hw_cmd_d.failed <= '1'; txtb_hw_cmd_d.failed <= '1';
...@@ -2689,7 +2692,7 @@ begin ...@@ -2689,7 +2692,7 @@ begin
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
retr_ctr_add <= '0' when (retr_ctr_clear_i = '1' or drv_retr_lim_ena = '0' retr_ctr_add <= '0' when (retr_ctr_clear_i = '1' or drv_retr_lim_ena = '0'
or is_receiver = '1' or retr_ctr_add_block = '1') else or is_receiver = '1' or retr_ctr_add_block = '1') else
'1' when (arbitration_lost = '1' and rx_trigger = '1') else '1' when (arbitration_lost_i = '1' and rx_trigger = '1') else
'1' when (err_frm_req = '1') else '1' when (err_frm_req = '1') else
'0'; '0';
...@@ -2849,6 +2852,7 @@ begin ...@@ -2849,6 +2852,7 @@ begin
is_arbitration <= is_arbitration_i; is_arbitration <= is_arbitration_i;
crc_spec_enable <= crc_spec_enable_i; crc_spec_enable <= crc_spec_enable_i;
retr_ctr_clear <= retr_ctr_clear_i; retr_ctr_clear <= retr_ctr_clear_i;
arbitration_lost <= arbitration_lost_i;
----------------------------------------------------------------------- -----------------------------------------------------------------------
-- Assertions -- Assertions
...@@ -2867,4 +2871,4 @@ begin ...@@ -2867,4 +2871,4 @@ begin
-- " since they should occur in different pipeline stages!" -- " since they should occur in different pipeline stages!"
-- severity error; -- severity error;
end architecture; end architecture;
\ No newline at end of file
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