Commit 0bb998cf authored by Ille, Ondrej, Ing.'s avatar Ille, Ondrej, Ing.

Merge branch '318-remove-can-id-from-can_top_level' into 'master'

src,test: Remove obsolete CAN ID from can_top_level.

Closes #318

See merge request !265
parents e3e3fec0 cc950e05
Pipeline #11583 canceled with stages
in 3 minutes and 24 seconds
......@@ -78,9 +78,6 @@ entity can_top_level is
-- RX Buffer RAM size (32 bit words)
rx_buffer_size : natural range 32 to 4096 := 128;
-- ID (bits 19-16 of adress)
ID : natural range 0 to 15 := 1;
-- Insert Filter A
sup_filtA : boolean := true;
......@@ -492,7 +489,6 @@ begin
G_SUP_RANGE => sup_range,
G_SUP_TRAFFIC_CTRS => sup_traffic_ctrs,
G_TXT_BUFFER_COUNT => C_TXT_BUFFER_COUNT,
G_ID => ID,
G_INT_COUNT => C_INT_COUNT,
G_TRV_CTR_WIDTH => C_TRV_CTR_WIDTH,
G_DEVICE_ID => C_CAN_DEVICE_ID,
......
......@@ -63,9 +63,6 @@ package can_components is
-- RX Buffer RAM size (32 bit words)
rx_buffer_size : natural range 32 to 4096 := 128;
-- ID (bits 19-16 of adress)
ID : natural range 0 to 15 := 1;
-- Insert Filter A
sup_filtA : boolean := true;
......@@ -2962,9 +2959,6 @@ package can_components is
-- Number of TXT Buffers
G_TXT_BUFFER_COUNT : natural range 0 to 7 := 4;
-- ID on Memory bus
G_ID : natural := 1;
-- Number of Interrupts
G_INT_COUNT : natural := 12;
......
......@@ -91,9 +91,6 @@ entity memory_registers is
-- Number of TXT Buffers
G_TXT_BUFFER_COUNT : natural range 0 to 7 := 4;
-- ID on Memory bus
G_ID : natural := 1;
-- Number of Interrupts
G_INT_COUNT : natural := 12;
......@@ -351,10 +348,7 @@ begin
'0';
end generate txtb_port_a_cs_gen;
can_core_cs <= '1' when (scs = ACT_CSC) and
(adress(ID_ADRESS_HIGHER downto ID_ADRESS_LOWER) =
std_logic_vector(to_unsigned(G_ID, 4)))
else
can_core_cs <= '1' when (scs = ACT_CSC) else
'0';
......
......@@ -152,8 +152,7 @@ begin
g_inst: for i in 1 to 2 generate
CAN_inst: CAN_top_level
generic map(
rx_buffer_size => 64,
ID => i
rx_buffer_size => 64
)
port map(
clk_sys => p(i).clk_sys,
......
......@@ -273,8 +273,7 @@ begin
----------------------------------------------------------------------------
CAN_inst : CAN_top_level
generic map(
rx_buffer_size => 64,
ID => 0
rx_buffer_size => 64
)
port map(
clk_sys => clk_sys,
......
......@@ -459,8 +459,7 @@ begin
comp_gen : for i in 1 to NODE_COUNT generate
can_inst : CAN_top_level
generic map(
rx_buffer_size => 64,
ID => i
rx_buffer_size => 64
)
port map(
res_n => res_n_v(i),
......
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