From 8164bf1cb1ad15b92da66bd2e26b36afa18b7e05 Mon Sep 17 00:00:00 2001 From: Erik Kooistra <kooistra@astron.nl> Date: Tue, 23 Aug 2016 15:01:27 +0000 Subject: [PATCH] Added g_align_at_sync to tb and tb_tb, but only verified it manually in wave window with tb. --- .../base/dp/tb/vhdl/tb_dp_packet_merge.vhd | 4 ++- .../base/dp/tb/vhdl/tb_tb_dp_packet_merge.vhd | 31 ++++++++++--------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/libraries/base/dp/tb/vhdl/tb_dp_packet_merge.vhd b/libraries/base/dp/tb/vhdl/tb_dp_packet_merge.vhd index cd24e0b842..afbb9d176a 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_packet_merge.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_packet_merge.vhd @@ -65,6 +65,7 @@ ENTITY tb_dp_packet_merge IS g_nof_pkt : NATURAL := 3; g_pkt_len : NATURAL := 10; g_pkt_gap : NATURAL := 0; + g_align_at_sync : BOOLEAN := FALSE; g_use_dp_packet_unmerge : BOOLEAN := FALSE ); END tb_dp_packet_merge; @@ -257,7 +258,8 @@ BEGIN -- Merge every g_nof_pkt incomming packets into output packets u_dp_packet_merge : ENTITY work.dp_packet_merge GENERIC MAP ( - g_nof_pkt => g_nof_pkt + g_nof_pkt => g_nof_pkt, + g_align_at_sync => g_align_at_sync ) PORT MAP ( rst => rst, diff --git a/libraries/base/dp/tb/vhdl/tb_tb_dp_packet_merge.vhd b/libraries/base/dp/tb/vhdl/tb_tb_dp_packet_merge.vhd index 0aede0de94..94ee35dd29 100644 --- a/libraries/base/dp/tb/vhdl/tb_tb_dp_packet_merge.vhd +++ b/libraries/base/dp/tb/vhdl/tb_tb_dp_packet_merge.vhd @@ -50,24 +50,25 @@ BEGIN -- g_nof_pkt : NATURAL := 3; -- g_pkt_len : NATURAL := 29; -- g_pkt_gap : NATURAL := 0; + -- g_align_at_sync : BOOLEAN := FALSE; -- g_use_dp_packet_unmerge : BOOLEAN := FALSE - u_act_act_8_nof_0 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_active, e_active, 8, c_nof_repeat, 0, 29, 0, FALSE); - u_act_act_8_nof_1 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_active, e_active, 8, c_nof_repeat, 1, 29, 0, FALSE); - u_act_act_8_nof_2 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_active, e_active, 8, c_nof_repeat, 2, 29, 0, FALSE); - u_act_act_8_nof_3 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_active, e_active, 8, c_nof_repeat, 3, 29, 0, FALSE); - u_act_act_8_nof_4 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_active, e_active, 8, c_nof_repeat, 4, 29, 0, FALSE); - u_act_act_8_nof_5 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_active, e_active, 8, c_nof_repeat, 5, 29, 0, FALSE); - u_act_act_8_nof_6 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_active, e_active, 8, c_nof_repeat, 6, 29, 0, FALSE); - u_act_act_8_nof_7 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_active, e_active, 8, c_nof_repeat, 7, 29, 0, FALSE); + u_act_act_8_nof_0 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_active, e_active, 8, c_nof_repeat, 0, 29, 0, FALSE, FALSE); + u_act_act_8_nof_1 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_active, e_active, 8, c_nof_repeat, 1, 29, 0, FALSE, FALSE); + u_act_act_8_nof_2 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_active, e_active, 8, c_nof_repeat, 2, 29, 0, FALSE, FALSE); + u_act_act_8_nof_3 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_active, e_active, 8, c_nof_repeat, 3, 29, 0, FALSE, FALSE); + u_act_act_8_nof_4 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_active, e_active, 8, c_nof_repeat, 4, 29, 0, FALSE, FALSE); + u_act_act_8_nof_5 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_active, e_active, 8, c_nof_repeat, 5, 29, 0, FALSE, FALSE); + u_act_act_8_nof_6 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_active, e_active, 8, c_nof_repeat, 6, 29, 0, FALSE, FALSE); + u_act_act_8_nof_7 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_active, e_active, 8, c_nof_repeat, 7, 29, 0, FALSE, FALSE); - u_rnd_act_8_nof_3 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_random, e_active, 8, c_nof_repeat, 3, 29, 0, FALSE); - u_rnd_rnd_8_nof_3 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_random, e_random, 8, c_nof_repeat, 3, 29, 0, FALSE); - u_pls_act_8_nof_3 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_pulse, e_active, 8, c_nof_repeat, 3, 29, 0, FALSE); - u_pls_rnd_8_nof_3 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_pulse, e_random, 8, c_nof_repeat, 3, 29, 0, FALSE); - u_pls_pls_8_nof_3 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_pulse, e_pulse, 8, c_nof_repeat, 3, 29, 0, FALSE); + u_rnd_act_8_nof_3 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_random, e_active, 8, c_nof_repeat, 3, 29, 0, FALSE, FALSE); + u_rnd_rnd_8_nof_3 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_random, e_random, 8, c_nof_repeat, 3, 29, 0, FALSE, FALSE); + u_pls_act_8_nof_3 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_pulse, e_active, 8, c_nof_repeat, 3, 29, 0, FALSE, FALSE); + u_pls_rnd_8_nof_3 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_pulse, e_random, 8, c_nof_repeat, 3, 29, 0, FALSE, FALSE); + u_pls_pls_8_nof_3 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_pulse, e_pulse, 8, c_nof_repeat, 3, 29, 0, FALSE, FALSE); - u_rnd_act_8_nof_1 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_random, e_active, 8, c_nof_repeat, 1, 29, 0, FALSE); - u_rnd_act_8_nof_3_gap : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_random, e_active, 8, c_nof_repeat, 3, 29, 17, FALSE); + u_rnd_act_8_nof_1 : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_random, e_active, 8, c_nof_repeat, 1, 29, 0, FALSE, FALSE); + u_rnd_act_8_nof_3_gap : ENTITY work.tb_dp_packet_merge GENERIC MAP ( e_random, e_active, 8, c_nof_repeat, 3, 29, 17, FALSE, FALSE); END tb; -- GitLab