Merge branch '2v6-finalizations' into 'master'

2v6 finalizations

See merge request canbus/ctucanfd_ip_core!506

Author: Blebowski

src/can_core/protocol_control_fsm.vhd

@@ -1341,7 +1341,7 @@ begin
         ctrl_ctr_one, mr_command_ercrst_q, reinteg_ctr_expired, first_err_delim_q, go_to_stuff_count,
         ack_err_flag, crc_length_i, data_length_bits_c, ctrl_ctr_mem_index, is_bus_off,
         block_txtb_unlock, mr_settings_pex, rx_data_nbs_prev, sync_edge, mr_mode_rom,
-        mr_settings_ilbp, tx_dominant_ack)
+        mr_settings_ilbp, tx_dominant_ack, rec_lbpf_q, rec_ivld_q)
     begin
 
         -------------------------------------------------------------------------------------------

src/packages/can_config_pkg.vhd

@@ -81,7 +81,7 @@ use ieee.std_logic_1164.all;
 package can_config_pkg is
 
     -- IP Core version
-    constant C_CTU_CAN_FD_VERSION_MINOR : std_logic_vector(7 downto 0) := x"05";
+    constant C_CTU_CAN_FD_VERSION_MINOR : std_logic_vector(7 downto 0) := x"06";
     constant C_CTU_CAN_FD_VERSION_MAJOR : std_logic_vector(7 downto 0) := x"02";
 
     -- Number of TXT Buffers

src/rx_buffer/rx_buffer_pointers.vhd

@@ -207,14 +207,23 @@ architecture rtl of rx_buffer_pointers is
     -- by 1.
     signal rx_mem_free_i_inc_1      : unsigned(C_FREE_MEM_WIDTH - 1 downto 0);
 
+    -----------------------------------------------------------------------------------------------
+    -- Auxiliarly signals
+    -----------------------------------------------------------------------------------------------
+    signal abort_applied            : std_logic;
+
 begin
+
     read_pointer        <= std_logic_vector(read_pointer_i);
     read_pointer_inc_1  <= std_logic_vector(read_pointer_inc_1_i);
     write_pointer       <= std_logic_vector(write_pointer_i);
     write_pointer_raw   <= std_logic_vector(write_pointer_raw_i);
     write_pointer_ts    <= std_logic_vector(write_pointer_ts_i);
     rx_mem_free_i       <= std_logic_vector(rx_mem_free_i_i);
 
+    abort_applied <= '1' when (rec_abort_f = '1' or commit_overrun_abort = '1')
+                         else
+                     '0';
 
     -----------------------------------------------------------------------------------------------
     -- Read pointer, incremented during read from RX Buffer FIFO. Moving to next word by reading
@@ -316,7 +325,7 @@ begin
 
                 -- Read of memory word, and abort at the same time. Revert last commited value of
                 -- read pointer incremented by 1.
-                if (rec_abort_f = '1' or commit_overrun_abort = '1') then
+                if (abort_applied = '1') then
                     rx_mem_free_raw <= rx_mem_free_i_inc_1;
 
                 -- Read of memory word and no write of memory word. Load raw value incremented by 1.
@@ -330,7 +339,7 @@ begin
             else
 
                 -- Abort, or abort was previously flaged -> Revert last commited value.
-                if (rec_abort_f = '1' or commit_overrun_abort = '1') then
+                if (abort_applied = '1') then
                     rx_mem_free_raw <= rx_mem_free_i_i;
 
                 -- No read, write only, decrement by 1.