Commit 68e46755 authored by Ille, Ondrej, Ing.'s avatar Ille, Ondrej, Ing.

Removed obsolete frame_store signal. Now "lock" signal

from hardware command is used to store frame meta-data!
parent 486f18f4
......@@ -379,9 +379,6 @@ entity core_top is
signal txt_hw_cmd_i : txt_hw_cmd_type;
--Command for transcieve buffer to store frame on input
signal frame_Store : std_logic;
--Fault confinement signals
--Error counters
signal tx_counter_out : std_logic_vector(8 downto 0);
......@@ -544,7 +541,7 @@ begin
tran_ident_type_in => tran_ident_type_in,
tran_frame_type_in => tran_frame_type_in,
tran_brs_in => tran_brs_in,
frame_store => frame_Store,
frame_store => txt_hw_cmd_i.lock,
tran_ident_base => tran_ident_base,
tran_ident_ext => tran_ident_ext,
......@@ -596,7 +593,6 @@ begin
hard_sync_edge => hard_sync_edge,
frame_store => frame_store,
tran_frame_valid_in=> tran_frame_valid_in,
--tran_lock => tran_lock_i,
......@@ -1083,7 +1079,7 @@ begin
stat_bus(STAT_TRAN_FRAME_TYPE_INDEX) <= tran_frame_type;
stat_bus(STAT_TRAN_DATA_ACK_INDEX) <= txt_hw_cmd_i.lock;
stat_bus(STAT_TRAN_BRS_INDEX) <= tran_brs;
stat_bus(STAT_FRAME_STORE_INDEX) <= frame_Store;
stat_bus(STAT_FRAME_STORE_INDEX) <= txt_hw_cmd_i.lock;
--Error counters and state
stat_bus(STAT_TX_COUNTER_HIGH downto STAT_TX_COUNTER_LOW) <= tx_counter_out;
......
......@@ -181,7 +181,8 @@
-- only then! "is_txt_locked" signal is introduced, to not
-- perform additional locking in SOF if lock was already per-
-- formed in BUS IDLE.
--
-- 17.02.2018 Removed obsolete "frame_store", its functionality is fully
-- replaced with frame_lock
--------------------------------------------------------------------------------
Library ieee;
......@@ -214,9 +215,6 @@ entity protocolControl is
signal tran_frame_type :in std_logic;
signal tran_brs :in std_logic;
--Store frame from TX Arbitrator to the Transcieve Buffer
signal frame_store :out std_logic;
--Valid frame ready to be stored into Transcieeve Buffer
signal tran_frame_valid_in :in std_logic;
......@@ -445,7 +443,6 @@ entity protocolControl is
signal data_tx_r : std_logic;
signal arbitration_lost_r : std_logic;
signal crc_enable_r : std_logic;
signal frame_store_r : std_logic;
signal stuff_enable_r : std_logic;
signal fixed_stuff_r : std_logic;
signal stuff_length_r : std_logic_vector(2 downto 0);
......@@ -683,7 +680,6 @@ begin
PC_State_out <= PC_State;
alc <= alc_r;
data_tx <= data_tx_r;
frame_Store <= frame_Store_r;
arbitration_lost <= arbitration_lost_r;
crc_enable <= crc_enable_r;
stuff_enable <= stuff_enable_r;
......@@ -782,8 +778,6 @@ begin
--------------------------------
--Configuring output registers--
--------------------------------
frame_Store_r <= '0';
txt_hw_cmd.lock <= '0';
txt_hw_cmd.unlock <= '0';
txt_hw_cmd.valid <= '0';
......@@ -995,7 +989,6 @@ begin
inc_one_r <= '0';
inc_eight_r <= '0';
dec_one_r <= '0';
frame_store_r <= '0';
tran_valid_r <= '0';
rec_valid_r <= '0';
......@@ -1080,8 +1073,7 @@ begin
-- If we dont have frame locked, but we have one available
-- the we just lock it!
if (is_txt_locked = '0' and (tran_frame_valid_in = '1')) then
frame_store_r <= '1';
txt_hw_cmd.lock <= '1';
txt_hw_cmd.lock <= '1';
is_txt_locked <= '1';
-- In case that TX Arbitrator provides different frame for
......@@ -1157,7 +1149,6 @@ begin
control_pointer <= 0;
else
frame_store_r <= '0';
--Transcieving the data if we have what to transcieve
if(tran_trig='1')then
......
......@@ -619,7 +619,6 @@ package CANcomponents is
signal tran_frame_type : in std_logic;
signal tran_brs : in std_logic;
signal txt_buf_ptr : out natural range 0 to 15;
signal frame_store : out std_logic;
signal tran_frame_valid_in : in std_logic;
signal txt_hw_cmd : out txt_hw_cmd_type;
signal txtb_changed : in std_logic;
......
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