From f2f9d30e2a65cc1c907a909e4e41cbcc98b4df30 Mon Sep 17 00:00:00 2001
From: Daniel van der Schuur <schuur@astron.nl>
Date: Fri, 27 Mar 2015 12:51:26 +0000
Subject: [PATCH] -Moved mixed width FIFO; -Reverified and -validated
dp_offload_tx.
---
.../src/vhdl/apertif_unb1_correlator.vhd | 58 +++++++++----------
1 file changed, 28 insertions(+), 30 deletions(-)
diff --git a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd
index 4321502d1b..fc0c624427 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd
+++ b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd
@@ -191,9 +191,9 @@ ARCHITECTURE str OF apertif_unb1_correlator IS
CONSTANT c_offload_bg_ctrl : t_diag_block_gen := ('1', -- enable
'0', -- enable_sync
- TO_UVEC( 600, c_diag_bg_samples_per_packet_w),
+ TO_UVEC( 300, c_diag_bg_samples_per_packet_w),
TO_UVEC( 64, c_diag_bg_blocks_per_sync_w),
- TO_UVEC( 24414-600, c_diag_bg_gapsize_w),
+ TO_UVEC( 24414-300, c_diag_bg_gapsize_w),
TO_UVEC( 0, c_diag_bg_mem_low_adrs_w),
TO_UVEC( 0, c_diag_bg_mem_high_adrs_w),
TO_UVEC( 0, c_diag_bg_bsn_init_w));
@@ -307,8 +307,7 @@ ARCHITECTURE str OF apertif_unb1_correlator IS
-- 1GbE Visibility Offload
SIGNAL dp_fifo_dc_mixed_widths_snk_in : t_dp_sosi;
- SIGNAL dp_fifo_dc_mixed_widths_src_out : t_dp_sosi;
- SIGNAL dp_fifo_dc_mixed_widths_src_in : t_dp_siso;
+
SIGNAL apertif_unb1_correlator_vis_offload_snk_in : t_dp_sosi;
SIGNAL apertif_unb1_correlator_vis_offload_snk_out : t_dp_siso;
SIGNAL dp_offload_tx_src_out_arr : t_dp_sosi_arr(1-1 DOWNTO 0);
@@ -763,31 +762,6 @@ BEGIN
dp_fifo_dc_mixed_widths_snk_in.data(64-1 DOWNTO 0) <= correlator_src_out_arr(0).re(64/2-1 DOWNTO 0) & correlator_src_out_arr(0).im(64/2-1 DOWNTO 0);
END PROCESS;
- -----------------------------------------------------------------------------
- -- 64b -> 32b
- -----------------------------------------------------------------------------
- u_dp_fifo_dc_mixed_widths : ENTITY dp_lib.dp_fifo_dc_mixed_widths
- GENERIC MAP (
- g_wr_data_w => 64,
- g_rd_data_w => 32,
- g_use_ctrl => TRUE,
- g_wr_fifo_size => 300
- )
- PORT MAP (
- wr_rst => dp_rst,
- wr_clk => dp_clk,
- rd_rst => dp_rst,
- rd_clk => dp_clk,
-
- snk_in => dp_fifo_dc_mixed_widths_snk_in,
-
- src_in => dp_fifo_dc_mixed_widths_src_in,
- src_out => dp_fifo_dc_mixed_widths_src_out
- );
-
- apertif_unb1_correlator_vis_offload_snk_in <= dp_fifo_dc_mixed_widths_src_out;
- dp_fifo_dc_mixed_widths_src_in <= apertif_unb1_correlator_vis_offload_snk_out;
-
END GENERATE;
-----------------------------------------------------------------------------
@@ -799,6 +773,8 @@ BEGIN
g_nof_streams => 1,
g_use_tx_seq => TRUE,
g_use_bg_buffer_ram => FALSE,
+ g_buf_dat_w => 64,
+ g_seq_dat_w => 64,
g_diag_block_gen_rst => c_offload_bg_ctrl
)
PORT MAP (
@@ -808,10 +784,32 @@ BEGIN
dp_rst => dp_rst,
dp_clk => dp_clk,
- out_sosi_arr(0) => apertif_unb1_correlator_vis_offload_snk_in
+ out_sosi_arr(0) => dp_fifo_dc_mixed_widths_snk_in
);
END GENERATE;
+ -----------------------------------------------------------------------------
+ -- 64b -> 32b
+ -----------------------------------------------------------------------------
+ u_dp_fifo_dc_mixed_widths : ENTITY dp_lib.dp_fifo_dc_mixed_widths
+ GENERIC MAP (
+ g_wr_data_w => 64,
+ g_rd_data_w => 32,
+ g_use_ctrl => TRUE,
+ g_wr_fifo_size => 300
+ )
+ PORT MAP (
+ wr_rst => dp_rst,
+ wr_clk => dp_clk,
+ rd_rst => dp_rst,
+ rd_clk => dp_clk,
+
+ snk_in => dp_fifo_dc_mixed_widths_snk_in,
+
+ src_in => apertif_unb1_correlator_vis_offload_snk_out,
+ src_out => apertif_unb1_correlator_vis_offload_snk_in
+ );
+
-----------------------------------------------------------------------------
-- 1GbE visivility offload
-----------------------------------------------------------------------------
--
GitLab