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

Renamed registers entity to "canfd_registers"

parent f0d9aa25
......@@ -46,6 +46,8 @@ use work.CANcomponents.ALL;
-- directly accessing the buffer by avalon access.
-- 10.12.2017 Added "tx_time_sup" to enable/disable transmission at given
-- time and save some LUTs.
-- 12.12.2017 Renamed "registers" entity to "canfd_registers" to avoid
-- possible name conflicts.
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
......@@ -442,7 +444,7 @@ architecture rtl of CAN_top_level is
----------------------------------------------------
-- Defining explicit architectures for used entites
----------------------------------------------------
for reg_comp : registers use entity work.registers(rtl);
for reg_comp : canfd_registers use entity work.canfd_registers(rtl);
for rx_buf_comp : rxBuffer use entity work.rxBuffer(rtl);
for txt1_buf_comp : txtBuffer use entity work.txtBuffer(rtl);
for txt2_buf_comp : txtBuffer use entity work.txtBuffer(rtl);
......@@ -464,7 +466,7 @@ begin
rst_n => res_n_sync
);
reg_comp : registers
reg_comp : canfd_registers
generic map(
compType => CAN_COMPONENT_TYPE,
use_logger => use_logger,
......
......@@ -97,7 +97,7 @@ package CANcomponents is
------------------------------------------------------------------------------
-- Registers
------------------------------------------------------------------------------
component registers is
component canfd_registers is
generic(
constant compType : std_logic_vector(3 downto 0) := CAN_COMPONENT_TYPE;
constant use_logger : boolean := true;
......
......@@ -71,6 +71,8 @@ use work.CANconstants.all;
-- TX_SETTINGS register so that half written frame is not commi-
-- tted to CAN Core for transmission. Added BUF_DIR bit and remo-
-- ved TXT1_COMMIT and TXT2_COMMIT bits
-- 12.12.2017 Renamed entity to "canfd_registers" instead of "registers"
-- to avoid possible name conflicts.
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
......@@ -96,7 +98,7 @@ use work.CANconstants.all;
--------------------------------------------------------------------------------
entity registers is
entity canfd_registers is
generic(
constant compType :std_logic_vector(3 downto 0) := CAN_COMPONENT_TYPE;
......@@ -347,7 +349,7 @@ entity registers is
end entity;
architecture rtl of registers is
architecture rtl of canfd_registers is
--------------------------------------------
-- Default value assignment to registers --
......
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