Commit 4fb18df6 authored by Ille, Ondrej, Ing.'s avatar Ille, Ondrej, Ing.

Merge branch '321-fix-active-error-overload-flag-signalling' into 'master'

src: Fix, only active error flag should be considered.

Closes #321

See merge request !266
parents 0bb998cf 4dfff836
Pipeline #11594 failed with stages
in 42 minutes and 15 seconds
......@@ -120,7 +120,7 @@ begin
---------------------------------------------------------------------------
-- Increment RX Error counter by 1 when Receiver detects an error which
-- is not during Error flag or overload flag!
-- is not during Active Error flag or overload flag!
---------------------------------------------------------------------------
inc_one <= '1' when (err_detected = '1' and act_err_ovr_flag = '0' and
is_receiver = '1')
......
......@@ -2383,7 +2383,7 @@ begin
end if;
-- Node received dominant bit as first bit after Error flag!
-- This shall be treated as primamry error
-- This shall be treated as primary error
if (rx_data_nbs = DOMINANT and first_err_delim_q = '1') then
primary_err_i <= '1';
first_err_delim_d <= '0';
......@@ -2628,8 +2628,8 @@ begin
sp_control_q_i;
---------------------------------------------------------------------------
-- Indicates that Error or Overload flag is being transmitted! Can't
-- be part of current state, since it must be valid also during
-- Indicates that Active Error or Overload flag is being transmitted!
-- Can't be part of current state, since it must be valid also during
-- error condition to distiguish error during error flag!
---------------------------------------------------------------------------
act_err_ovr_flag <= '1' when (curr_state = s_pc_act_err_flag) else
......
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