Commit 38a9df35 authored by Ille, Ondrej, Ing.'s avatar Ille, Ondrej, Ing.
Browse files

Merge branch '137-remove-simulation-warnings' into 'master'

Resolve "Remove simulation warnings"

Closes #137

See merge request illeondr/CAN_FD_IP_Core!71
parents e1eeb945 40cc0b8b
......@@ -130,7 +130,7 @@ begin
-- that input values are properly defined
l0_val_proc:process(prio_valid)
begin
if (prio_valid(i) /= '0' and prio_valid(i) /= '1') then
if (prio_valid(i) /= '0' and prio_valid(i) /= '1' and now /= 0 fs) then
report "Input values not exactly defined" severity error;
end if;
end process;
......
......@@ -1009,7 +1009,7 @@ begin
variable cmd_join : std_logic_vector(3 downto 0);
begin
-- pragma translate_off
if (rising_edge(clk_sys)) then
if (rising_edge(clk_sys) and now /= 0 fs) then
if (store_metadata = '1' and rx_fsm /= rxb_idle) then
report "RX Buffer: Store metadata command did NOT come during " &
"'rx_buf_idle'!"severity error;
......@@ -1057,7 +1057,7 @@ begin
variable act_data_stores : natural := 0;
begin
-- pragma translate_off
if (rising_edge(clk_sys)) then
if (rising_edge(clk_sys) and now /= 0 fs) then
-- Calculate number of expected "store_data" commands from CAN Core.
if (rec_abort = '1') then
......
......@@ -390,7 +390,7 @@ begin
inc_dec_assert_proc : process(clk_sys)
begin
-- pragma translate_off
if (rising_edge(clk_sys)) then
if (rising_edge(clk_sys) and now /= 0 fs) then
if (joined_ctr /= "000" and joined_ctr /= "001" and
joined_ctr /= "010" and joined_ctr /= "100") then
report "Error counters commands from Protocol Control to " &
......
......@@ -1729,6 +1729,10 @@ begin
drv_bus(767 downto 748) <= (OTHERS=>'0');
drv_bus(735 downto 614) <= (OTHERS=>'0');
drv_bus(387 downto 376) <= (OTHERS=>'0');
drv_bus(367) <= '0';
drv_bus(357) <= '0';
--Prescaler data and bus timing
......
......@@ -202,16 +202,16 @@ begin
CAN_comp:CAN_top_level
generic map(
use_logger => use_logger,
rx_buffer_size => rx_buffer_size,
use_sync => use_sync,
use_logger => false,
rx_buffer_size => 4096,
use_sync => true,
ID => ID,
sup_filtA => sup_filtA,
sup_filtB => sup_filtB,
sup_filtC => sup_filtC,
sup_range => sup_range,
tx_time_sup => tx_time_sup,
sup_be => sup_be,
sup_filtA => true,
sup_filtB => true,
sup_filtC => true,
sup_range => true,
tx_time_sup => true,
sup_be => true,
logger_size => logger_size
)
port map(
......
......@@ -99,6 +99,7 @@ proc start_CAN_simulation {test_wrapper} {
proc run_simulation {} {
#Import global variables
global WAIT_ON_END
global NumericStdNoWarnings
# Set what happedns when simulation is interrupted
if {$WAIT_ON_END == true} {
......@@ -107,7 +108,12 @@ proc run_simulation {} {
} else {
onbreak { resume }
}
# Avoid warnings at time 0
set NumericStdNoWarnings 1
run 0 ns
set NumericStdNoWarnings 0
#Run the simulation
run -all
}
......
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