Commit 73e3712c authored by Ille, Ondrej, Ing.'s avatar Ille, Ondrej, Ing.

Updated components CAN top level and core top to new interfaces

parent c0df19a3
......@@ -115,11 +115,8 @@ entity core_top is
-- CAN Core control signals for TX Arbitrator for manipulation with
-- TXT Buffers
signal tran_lock :out std_logic;
signal tran_unlock :out std_logic;
signal tran_drop :out std_logic;
signal mess_src_change :in std_logic;
signal txt_hw_cmd :out txt_hw_cmd_type;
signal txtb_changed :in std_logic;
--Pointer to TXT buffer memory
signal txt_buf_ptr :out natural range 0 to 15;
......@@ -376,9 +373,11 @@ entity core_top is
signal tran_frame_type : std_logic;
signal tran_brs : std_logic;
signal tran_lock_i : std_logic;
signal tran_unlock_i : std_logic;
signal tran_drop_i : std_logic;
--signal tran_lock_i : std_logic;
--signal tran_unlock_i : std_logic;
--signal tran_drop_i : std_logic;
signal txt_hw_cmd_i : txt_hw_cmd_type;
--Command for transcieve buffer to store frame on input
signal frame_Store : std_logic;
......@@ -513,9 +512,10 @@ begin
data_tx <= data_tx_int;
sp_control <= sp_control_int;
sync_control <= sync_control_int;
tran_lock <= tran_lock_i;
tran_unlock <= tran_unlock_i;
tran_drop <= tran_drop_i;
--tran_lock <= tran_lock_i;
--tran_unlock <= tran_unlock_i;
--tran_drop <= tran_drop_i;
txt_hw_cmd <= txt_hw_cmd_i;
rec_ident_out <= rec_ident;
rec_dlc_out <= rec_dlc;
......@@ -599,11 +599,12 @@ begin
frame_store => frame_store,
tran_frame_valid_in=> tran_frame_valid_in,
tran_lock => tran_lock_i,
tran_unlock => tran_unlock_i,
tran_drop => tran_drop_i,
--tran_lock => tran_lock_i,
--tran_unlock => tran_unlock_i,
--tran_drop => tran_drop_i,
mess_src_change => mess_src_change,
txt_hw_cmd => txt_hw_cmd_i,
txtb_changed => txtb_changed,
rec_ident => rec_ident,
rec_dlc => rec_dlc,
......@@ -1080,7 +1081,7 @@ begin
stat_bus(STAT_TRAN_IS_RTR_INDEX) <= tran_is_rtr;
stat_bus(STAT_TRAN_IDENT_TYPE_INDEX) <= tran_ident_type;
stat_bus(STAT_TRAN_FRAME_TYPE_INDEX) <= tran_frame_type;
stat_bus(STAT_TRAN_DATA_ACK_INDEX) <= tran_lock_i;
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;
......
This diff is collapsed.
......@@ -239,7 +239,8 @@ package CANcomponents is
signal txt_hw_cmd_buf_index :in natural range 0 to buf_count - 1;
signal txt_data_word :out std_logic_vector(31 downto 0);
signal txt_data_addr :in natural range 0 to 15;
signal txt_frame_info_out :out std_logic_vector(639 downto 512)
signal txt_frame_info_out :out std_logic_vector(639 downto 512);
signal txt_buf_ready :out std_logic
);
end component;
......@@ -357,10 +358,8 @@ package CANcomponents is
signal tran_frame_type_in : in std_logic;
signal tran_brs_in : in std_logic;
signal tran_frame_valid_in : in std_logic;
signal tran_lock : out std_logic;
signal tran_unlock : out std_logic;
signal tran_drop : out std_logic;
signal mess_src_change : in std_logic;
signal txt_hw_cmd : out txt_hw_cmd_type;
signal txtb_changed : in std_logic;
signal txt_buf_ptr : out natural range 0 to 15;
signal rec_ident_out : out std_logic_vector(28 downto 0);
signal rec_dlc_out : out std_logic_vector(3 downto 0);
......@@ -622,10 +621,8 @@ package CANcomponents is
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 tran_lock : out std_logic;
signal tran_unlock : out std_logic;
signal tran_drop : out std_logic;
signal mess_src_change : in std_logic;
signal txt_hw_cmd : out txt_hw_cmd_type;
signal txtb_changed : in std_logic;
signal br_shifted : out std_logic;
signal rec_ident : out std_logic_vector(28 downto 0);
signal rec_dlc : out std_logic_vector(3 downto 0);
......
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