From a9ab7ccfa02561fb1a2518ac57235c0e22414bf4 Mon Sep 17 00:00:00 2001
From: Daniel van der Schuur <schuur@astron.nl>
Date: Fri, 27 Mar 2015 14:04:58 +0000
Subject: [PATCH] -Cleaned the code.
---
libraries/base/dp/src/vhdl/dp_offload_tx.vhd | 48 +++-----------------
1 file changed, 7 insertions(+), 41 deletions(-)
diff --git a/libraries/base/dp/src/vhdl/dp_offload_tx.vhd b/libraries/base/dp/src/vhdl/dp_offload_tx.vhd
index 96c9109c44..c28bdd1670 100644
--- a/libraries/base/dp/src/vhdl/dp_offload_tx.vhd
+++ b/libraries/base/dp/src/vhdl/dp_offload_tx.vhd
@@ -50,7 +50,7 @@ ENTITY dp_offload_tx IS
g_def_nof_words_per_block : NATURAL;
g_max_nof_blocks_per_packet : NATURAL;
g_def_nof_blocks_per_packet : NATURAL;
- g_output_fifo_depth : NATURAL;
+ g_output_fifo_depth : NATURAL; --FIXME - unused
g_hdr_field_arr : t_common_field_arr;
g_hdr_field_ovr_init : STD_LOGIC_VECTOR;
g_use_post_split_fifo : BOOLEAN := FALSE
@@ -87,8 +87,8 @@ ARCHITECTURE str OF dp_offload_tx IS
CONSTANT c_dp_split_val_latency : NATURAL := 1;
CONSTANT c_dp_packet_merge_val_latency : NATURAL := 2;
CONSTANT c_nof_header_words : NATURAL := field_slv_len(g_hdr_field_arr) / g_data_w;
- CONSTANT c_dp_field_blk_snk_data_w : NATURAL := field_slv_out_len(field_arr_set_mode(g_hdr_field_arr , "RW"));
- CONSTANT c_dp_field_blk_src_data_w : NATURAL := g_data_w;
+ CONSTANT c_dp_field_blk_snk_data_w : NATURAL := field_slv_out_len(field_arr_set_mode(g_hdr_field_arr , "RW"));
+ CONSTANT c_dp_field_blk_src_data_w : NATURAL := g_data_w;
SIGNAL dp_split_snk_in_arr : t_dp_sosi_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL dp_split_snk_out_arr : t_dp_siso_arr(g_nof_streams-1 DOWNTO 0);
@@ -105,28 +105,9 @@ ARCHITECTURE str OF dp_offload_tx IS
SIGNAL dp_field_blk_snk_in_arr : t_dp_sosi_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL dp_field_blk_snk_out_arr : t_dp_siso_arr(g_nof_streams-1 DOWNTO 0);
- SIGNAL dp_field_blk_src_out_arr : t_dp_sosi_arr(g_nof_streams-1 DOWNTO 0);
- SIGNAL dp_field_blk_src_in_arr : t_dp_siso_arr(g_nof_streams-1 DOWNTO 0);
-
- SIGNAL hdr_fields_in_piped_arr : t_slv_1024_arr(g_nof_streams-1 DOWNTO 0);
- SIGNAL hdr_fields_to_field_blk : t_slv_1024_arr(g_nof_streams-1 DOWNTO 0);
-
--- TYPE t_dp_fifo_sc_usedw_arr IS ARRAY(g_nof_streams-1 DOWNTO 0) OF STD_LOGIC_VECTOR(ceil_log2(g_output_fifo_depth)-1 DOWNTO 0);
--- SIGNAL dp_fifo_sc_usedw_arr : t_dp_fifo_sc_usedw_arr;
-
--- SIGNAL dp_frame_rd_frm_req_arr : STD_LOGIC_VECTOR(g_nof_streams-1 DOWNTO 0);
-
--- SIGNAL dp_frame_rd_snk_in_arr : t_dp_sosi_arr(g_nof_streams-1 DOWNTO 0);
--- SIGNAL dp_frame_rd_snk_out_arr : t_dp_siso_arr(g_nof_streams-1 DOWNTO 0);
-
--- SIGNAL dp_frame_rd_src_out_arr : t_dp_sosi_arr(g_nof_streams-1 DOWNTO 0);
-
SIGNAL dp_concat_snk_in_2arr : t_dp_sosi_2arr_2(g_nof_streams-1 DOWNTO 0);
SIGNAL dp_concat_snk_out_2arr : t_dp_siso_2arr_2(g_nof_streams-1 DOWNTO 0);
- SIGNAL udp_total_length_arr : t_slv_16_arr(g_nof_streams-1 DOWNTO 0);
- SIGNAL ip_total_length_arr : t_slv_16_arr(g_nof_streams-1 DOWNTO 0);
-
-- MM control
CONSTANT c_nof_ctrl_fields : NATURAL := 2;
CONSTANT c_ctrl_field_arr : t_common_field_arr(c_nof_ctrl_fields-1 DOWNTO 0) := ( ( field_name_pad("nof_words_per_block" ), "RW", ceil_log2(g_max_nof_words_per_block+1 ), field_default(g_def_nof_words_per_block) ),
@@ -138,14 +119,9 @@ ARCHITECTURE str OF dp_offload_tx IS
TYPE t_nof_words_per_block_arr IS ARRAY(g_nof_streams-1 DOWNTO 0) OF STD_LOGIC_VECTOR(ceil_log2(g_max_nof_words_per_block+1)-1 DOWNTO 0);
SIGNAL nof_words_per_block_arr : t_nof_words_per_block_arr;
--- SIGNAL nof_words_per_block_stat_arr : t_nof_words_per_block_arr;
--- SIGNAL nof_words_per_block_stat_piped_arr : t_nof_words_per_block_arr;
-
TYPE t_nof_blocks_per_packet_arr IS ARRAY(g_nof_streams-1 DOWNTO 0) OF STD_LOGIC_VECTOR(ceil_log2(g_max_nof_blocks_per_packet+1)-1 DOWNTO 0);
SIGNAL nof_blocks_per_packet_arr : t_nof_blocks_per_packet_arr;
--- SIGNAL nof_blocks_per_packet_stat_arr : t_nof_blocks_per_packet_arr;
-
SIGNAL reg_mosi_arr : t_mem_mosi_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL reg_miso_arr : t_mem_miso_arr(g_nof_streams-1 DOWNTO 0);
@@ -197,7 +173,6 @@ BEGIN
clk => dp_clk,
nof_symbols => nof_words_per_block_arr(i),
--- nof_symbols_out => nof_words_per_block_stat_arr(i),
snk_out => dp_split_snk_out_arr(i),
snk_in => dp_split_snk_in_arr(i),
@@ -250,7 +225,6 @@ BEGIN
clk => dp_clk,
nof_pkt => nof_blocks_per_packet_arr(i),
--- nof_pkt_out => nof_blocks_per_packet_stat_arr(i),
snk_out => dp_packet_merge_snk_out_arr(i),
snk_in => dp_packet_merge_snk_in_arr(i),
@@ -303,9 +277,7 @@ BEGIN
src_in => dp_pipeline_hdr_fields_src_in_arr(i)
);
END GENERATE;
-
--- hdr_fields_to_field_blk(i)(field_slv_len(g_hdr_field_arr)-1 DOWNTO 0) <= dp_pipeline_hdr_fields_src_out_arr(i).data(field_slv_len(g_hdr_field_arr)-1 DOWNTO 0);
-
+
---------------------------------------------------------------------------------------
-- Create header block & concatenate header to offload stream.
-- . hdr_fields_in_arr(i) is clocked in at snk_in_arr(i).sop after which it can be
@@ -315,17 +287,14 @@ BEGIN
-- Flow control for the header source. Should not be needed.
dp_pipeline_hdr_fields_src_in_arr(i) <= dp_field_blk_snk_out_arr(i);
-
--- dp_field_blk_snk_in_arr(i).data(c_dp_field_blk_snk_data_w-1 DOWNTO 0) <= hdr_fields_to_field_blk(i)(field_slv_len(g_hdr_field_arr)-1 DOWNTO 0);
--- dp_field_blk_snk_in_arr(i).valid <= dp_packet_merge_src_out_arr(i).sop;
dp_field_blk_snk_in_arr(i) <= dp_pipeline_hdr_fields_src_out_arr(i);
u_dp_field_blk : ENTITY work.dp_field_blk
GENERIC MAP (
g_field_arr => field_arr_set_mode(g_hdr_field_arr , "RW"),
g_ovr_init => g_hdr_field_ovr_init,
- g_snk_data_w => c_dp_field_blk_snk_data_w, --field_slv_out_len(field_arr_set_mode(g_hdr_field_arr , "RW"))
- g_src_data_w => c_dp_field_blk_src_data_w --g_data_w
+ g_snk_data_w => c_dp_field_blk_snk_data_w,
+ g_src_data_w => c_dp_field_blk_src_data_w
)
PORT MAP (
dp_rst => dp_rst,
@@ -336,10 +305,7 @@ BEGIN
snk_in => dp_field_blk_snk_in_arr(i), -- Valid for only one cycle.
snk_out => dp_field_blk_snk_out_arr(i),
-
--- slv_in => hdr_fields_to_field_blk(i)(field_slv_len(g_hdr_field_arr)-1 DOWNTO 0),
--- slv_in_val => dp_packet_merge_src_out_arr(i).sop,
-
+
src_in => dp_concat_snk_out_2arr(i)(1),
src_out => dp_concat_snk_in_2arr(i)(1),
--
GitLab