From 9f8887e8c58edea191fc2eb51e990b213d80bd78 Mon Sep 17 00:00:00 2001 From: Greek Date: Sat, 20 Feb 2021 14:00:17 +0100 Subject: [PATCH] Testbench wide input_prc fix --- src/Tests/Level_0/L0_rtps_builtin_endpoint_test1.vhd | 2 +- src/Tests/Level_0/L0_rtps_builtin_endpoint_test2.vhd | 2 +- src/Tests/Level_0/L0_rtps_builtin_endpoint_test3.vhd | 2 +- src/Tests/Level_0/L0_rtps_builtin_endpoint_test4.vhd | 2 +- src/Tests/Level_0/L0_rtps_builtin_endpoint_test5.vhd | 2 +- src/Tests/Level_0/L0_rtps_builtin_endpoint_test6.vhd | 2 +- src/Tests/Level_0/L0_rtps_builtin_endpoint_test7.vhd | 2 +- src/Tests/Level_0/L0_rtps_handler_test1.vhd | 2 +- src/Tests/Level_0/L0_rtps_handler_test2.vhd | 2 +- src/Tests/Level_0/L0_rtps_out_test1.vhd | 2 +- src/Tests/Level_0/L0_rtps_reader_test1.vhd | 8 ++++---- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Tests/Level_0/L0_rtps_builtin_endpoint_test1.vhd b/src/Tests/Level_0/L0_rtps_builtin_endpoint_test1.vhd index ca1d61d..6aab308 100644 --- a/src/Tests/Level_0/L0_rtps_builtin_endpoint_test1.vhd +++ b/src/Tests/Level_0/L0_rtps_builtin_endpoint_test1.vhd @@ -551,7 +551,6 @@ begin when IDLE => if (start = '1' and stimulus.length /= 0) then stim_stage <= BUSY; - cnt_stim <= 0; packet_sent <= '0'; end if; when BUSY => @@ -559,6 +558,7 @@ begin if (cnt_stim = stimulus.length-1) then stim_stage <= IDLE; packet_sent <= '1'; + cnt_stim <= 0; else cnt_stim <= cnt_stim + 1; end if; diff --git a/src/Tests/Level_0/L0_rtps_builtin_endpoint_test2.vhd b/src/Tests/Level_0/L0_rtps_builtin_endpoint_test2.vhd index fef8e2f..0408480 100644 --- a/src/Tests/Level_0/L0_rtps_builtin_endpoint_test2.vhd +++ b/src/Tests/Level_0/L0_rtps_builtin_endpoint_test2.vhd @@ -891,7 +891,6 @@ begin when IDLE => if (start = '1' and stimulus.length /= 0) then stim_stage <= BUSY; - cnt_stim <= 0; packet_sent <= '0'; end if; when BUSY => @@ -899,6 +898,7 @@ begin if (cnt_stim = stimulus.length-1) then stim_stage <= IDLE; packet_sent <= '1'; + cnt_stim <= 0; else cnt_stim <= cnt_stim + 1; end if; diff --git a/src/Tests/Level_0/L0_rtps_builtin_endpoint_test3.vhd b/src/Tests/Level_0/L0_rtps_builtin_endpoint_test3.vhd index 90268bf..7450e59 100644 --- a/src/Tests/Level_0/L0_rtps_builtin_endpoint_test3.vhd +++ b/src/Tests/Level_0/L0_rtps_builtin_endpoint_test3.vhd @@ -1178,7 +1178,6 @@ begin when IDLE => if (start = '1' and stimulus.length /= 0) then stim_stage <= BUSY; - cnt_stim <= 0; packet_sent <= '0'; end if; when BUSY => @@ -1186,6 +1185,7 @@ begin if (cnt_stim = stimulus.length-1) then stim_stage <= IDLE; packet_sent <= '1'; + cnt_stim <= 0; else cnt_stim <= cnt_stim + 1; end if; diff --git a/src/Tests/Level_0/L0_rtps_builtin_endpoint_test4.vhd b/src/Tests/Level_0/L0_rtps_builtin_endpoint_test4.vhd index e996cf8..6e50c1e 100644 --- a/src/Tests/Level_0/L0_rtps_builtin_endpoint_test4.vhd +++ b/src/Tests/Level_0/L0_rtps_builtin_endpoint_test4.vhd @@ -336,7 +336,6 @@ begin when IDLE => if (start = '1' and stimulus.length /= 0) then stim_stage <= BUSY; - cnt_stim <= 0; packet_sent <= '0'; end if; when BUSY => @@ -344,6 +343,7 @@ begin if (cnt_stim = stimulus.length-1) then stim_stage <= IDLE; packet_sent <= '1'; + cnt_stim <= 0; else cnt_stim <= cnt_stim + 1; end if; diff --git a/src/Tests/Level_0/L0_rtps_builtin_endpoint_test5.vhd b/src/Tests/Level_0/L0_rtps_builtin_endpoint_test5.vhd index b5715d5..0120320 100644 --- a/src/Tests/Level_0/L0_rtps_builtin_endpoint_test5.vhd +++ b/src/Tests/Level_0/L0_rtps_builtin_endpoint_test5.vhd @@ -461,7 +461,6 @@ begin when IDLE => if (start = '1' and stimulus.length /= 0) then stim_stage <= BUSY; - cnt_stim <= 0; packet_sent <= '0'; end if; when BUSY => @@ -469,6 +468,7 @@ begin if (cnt_stim = stimulus.length-1) then stim_stage <= IDLE; packet_sent <= '1'; + cnt_stim <= 0; else cnt_stim <= cnt_stim + 1; end if; diff --git a/src/Tests/Level_0/L0_rtps_builtin_endpoint_test6.vhd b/src/Tests/Level_0/L0_rtps_builtin_endpoint_test6.vhd index 1112748..e6ea5c4 100644 --- a/src/Tests/Level_0/L0_rtps_builtin_endpoint_test6.vhd +++ b/src/Tests/Level_0/L0_rtps_builtin_endpoint_test6.vhd @@ -328,7 +328,6 @@ begin when IDLE => if (start = '1' and stimulus.length /= 0) then stim_stage <= BUSY; - cnt_stim <= 0; packet_sent <= '0'; end if; when BUSY => @@ -336,6 +335,7 @@ begin if (cnt_stim = stimulus.length-1) then stim_stage <= IDLE; packet_sent <= '1'; + cnt_stim <= 0; else cnt_stim <= cnt_stim + 1; end if; diff --git a/src/Tests/Level_0/L0_rtps_builtin_endpoint_test7.vhd b/src/Tests/Level_0/L0_rtps_builtin_endpoint_test7.vhd index fa10c4c..07c505a 100644 --- a/src/Tests/Level_0/L0_rtps_builtin_endpoint_test7.vhd +++ b/src/Tests/Level_0/L0_rtps_builtin_endpoint_test7.vhd @@ -308,7 +308,6 @@ begin when IDLE => if (start = '1' and stimulus.length /= 0) then stim_stage <= BUSY; - cnt_stim <= 0; packet_sent <= '0'; end if; when BUSY => @@ -316,6 +315,7 @@ begin if (cnt_stim = stimulus.length-1) then stim_stage <= IDLE; packet_sent <= '1'; + cnt_stim <= 0; else cnt_stim <= cnt_stim + 1; end if; diff --git a/src/Tests/Level_0/L0_rtps_handler_test1.vhd b/src/Tests/Level_0/L0_rtps_handler_test1.vhd index 100d491..5664ab7 100644 --- a/src/Tests/Level_0/L0_rtps_handler_test1.vhd +++ b/src/Tests/Level_0/L0_rtps_handler_test1.vhd @@ -1343,7 +1343,6 @@ begin when IDLE => if (start = '1' and stimulus.length /= 0) then stim_stage <= BUSY; - cnt_stim <= 0; packet_sent <= '0'; end if; when BUSY => @@ -1351,6 +1350,7 @@ begin if (cnt_stim = stimulus.length-1) then stim_stage <= IDLE; packet_sent <= '1'; + cnt_stim <= 0; else cnt_stim <= cnt_stim + 1; end if; diff --git a/src/Tests/Level_0/L0_rtps_handler_test2.vhd b/src/Tests/Level_0/L0_rtps_handler_test2.vhd index f93b6dc..d412122 100644 --- a/src/Tests/Level_0/L0_rtps_handler_test2.vhd +++ b/src/Tests/Level_0/L0_rtps_handler_test2.vhd @@ -252,7 +252,6 @@ begin when IDLE => if (start = '1' and stimulus.length /= 0) then stim_stage <= BUSY; - cnt_stim <= 0; packet_sent <= '0'; end if; when BUSY => @@ -260,6 +259,7 @@ begin if (cnt_stim = stimulus.length-1) then stim_stage <= IDLE; packet_sent <= '1'; + cnt_stim <= 0; else cnt_stim <= cnt_stim + 1; end if; diff --git a/src/Tests/Level_0/L0_rtps_out_test1.vhd b/src/Tests/Level_0/L0_rtps_out_test1.vhd index a0e0e21..b890e7d 100644 --- a/src/Tests/Level_0/L0_rtps_out_test1.vhd +++ b/src/Tests/Level_0/L0_rtps_out_test1.vhd @@ -288,7 +288,6 @@ begin when IDLE => if (start = '1' and stimulus(i).length /= 0) then stim_stage(i) <= BUSY; - cnt_stim(i) <= 0; packet_sent(i) <= '0'; end if; when BUSY => @@ -296,6 +295,7 @@ begin if (cnt_stim(i) = stimulus(i).length-1) then stim_stage(i) <= IDLE; packet_sent(i) <= '1'; + cnt_stim(i) <= 0; else cnt_stim(i) <= cnt_stim(i) + 1; end if; diff --git a/src/Tests/Level_0/L0_rtps_reader_test1.vhd b/src/Tests/Level_0/L0_rtps_reader_test1.vhd index 1434a1d..56be9c9 100644 --- a/src/Tests/Level_0/L0_rtps_reader_test1.vhd +++ b/src/Tests/Level_0/L0_rtps_reader_test1.vhd @@ -80,7 +80,7 @@ begin HEARTBEAT_RESPONSE_DELAY => DURATION_ZERO, HEARTBEAT_SUPPRESSION_DELAY => DURATION_ZERO, LEASE_DURATION => DURATION_INFINITE, - WITH_KEY => FALSE, + WITH_KEY => TRUE, MAX_REMOTE_ENDPOINTS => MAX_REMOTE_ENDPOINTS ) port map ( @@ -140,7 +140,7 @@ begin end procedure; begin - SetAlertLogName("rtps_reader - Level 0 - Memory Handling"); + SetAlertLogName("rtps_reader - Level 0 - Metatraffic Handling"); SetAlertEnable(FAILURE, TRUE); SetAlertEnable(ERROR, TRUE); SetAlertEnable(WARNING, TRUE); @@ -393,7 +393,6 @@ begin when IDLE => if (start = '1' and stimulus.length /= 0) then stim_stage <= BUSY; - cnt_stim <= 0; packet_sent <= '0'; end if; when BUSY => @@ -401,6 +400,7 @@ begin if (cnt_stim = stimulus.length-1) then stim_stage <= IDLE; packet_sent <= '1'; + cnt_stim <= 0; else cnt_stim <= cnt_stim + 1; end if; @@ -432,7 +432,7 @@ begin when REMOVE_WRITER => SB_out.check(data_out_hc); when others => - Alert("Uknown HC Opcode", ERROR); + Alert("Unexpected HC Opcode", ERROR); end case; else ack_hc <= '0';