Skip to content
Snippets Groups Projects
Commit f3c0e1eb authored by Daniel van der Schuur's avatar Daniel van der Schuur
Browse files

-Removed ovverride interface.

parent 9ec38e9d
No related branches found
No related tags found
No related merge requests found
...@@ -50,9 +50,8 @@ ENTITY dp_offload_tx IS ...@@ -50,9 +50,8 @@ ENTITY dp_offload_tx IS
g_def_nof_words_per_block : NATURAL; g_def_nof_words_per_block : NATURAL;
g_max_nof_blocks_per_packet : NATURAL; g_max_nof_blocks_per_packet : NATURAL;
g_def_nof_blocks_per_packet : NATURAL; g_def_nof_blocks_per_packet : NATURAL;
g_output_fifo_depth : NATURAL; --FIXME - unused
g_hdr_field_arr : t_common_field_arr; g_hdr_field_arr : t_common_field_arr;
g_hdr_field_ovr_init : STD_LOGIC_VECTOR; --FIXME - rename to g_hdr_field_sel g_hdr_field_sel : STD_LOGIC_VECTOR;
g_use_post_split_fifo : BOOLEAN := FALSE g_use_post_split_fifo : BOOLEAN := FALSE
); );
PORT ( PORT (
...@@ -68,9 +67,6 @@ ENTITY dp_offload_tx IS ...@@ -68,9 +67,6 @@ ENTITY dp_offload_tx IS
reg_hdr_dat_mosi : IN t_mem_mosi; reg_hdr_dat_mosi : IN t_mem_mosi;
reg_hdr_dat_miso : OUT t_mem_miso; reg_hdr_dat_miso : OUT t_mem_miso;
reg_hdr_ovr_mosi : IN t_mem_mosi;
reg_hdr_ovr_miso : OUT t_mem_miso;
snk_in_arr : IN t_dp_sosi_arr(g_nof_streams-1 DOWNTO 0); snk_in_arr : IN t_dp_sosi_arr(g_nof_streams-1 DOWNTO 0);
snk_out_arr : OUT t_dp_siso_arr(g_nof_streams-1 DOWNTO 0); snk_out_arr : OUT t_dp_siso_arr(g_nof_streams-1 DOWNTO 0);
...@@ -128,9 +124,6 @@ ARCHITECTURE str OF dp_offload_tx IS ...@@ -128,9 +124,6 @@ ARCHITECTURE str OF dp_offload_tx IS
SIGNAL reg_hdr_dat_mosi_arr : t_mem_mosi_arr(g_nof_streams-1 DOWNTO 0); SIGNAL reg_hdr_dat_mosi_arr : t_mem_mosi_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL reg_hdr_dat_miso_arr : t_mem_miso_arr(g_nof_streams-1 DOWNTO 0); SIGNAL reg_hdr_dat_miso_arr : t_mem_miso_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL reg_hdr_ovr_mosi_arr : t_mem_mosi_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL reg_hdr_ovr_miso_arr : t_mem_miso_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL dp_pipeline_hdr_fields_snk_in_arr : t_dp_sosi_arr(g_nof_streams-1 DOWNTO 0); SIGNAL dp_pipeline_hdr_fields_snk_in_arr : t_dp_sosi_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL dp_pipeline_hdr_fields_snk_out_arr : t_dp_siso_arr(g_nof_streams-1 DOWNTO 0); SIGNAL dp_pipeline_hdr_fields_snk_out_arr : t_dp_siso_arr(g_nof_streams-1 DOWNTO 0);
...@@ -218,7 +211,7 @@ BEGIN ...@@ -218,7 +211,7 @@ BEGIN
gen_dp_packet_merge : FOR i IN 0 TO g_nof_streams-1 GENERATE gen_dp_packet_merge : FOR i IN 0 TO g_nof_streams-1 GENERATE
u_dp_packet_merge : ENTITY work.dp_packet_merge u_dp_packet_merge : ENTITY work.dp_packet_merge
GENERIC MAP ( GENERIC MAP (
g_nof_pkt => g_max_nof_blocks_per_packet g_nof_pkt => g_max_nof_blocks_per_packet
) )
PORT MAP ( PORT MAP (
rst => dp_rst, rst => dp_rst,
...@@ -277,7 +270,7 @@ BEGIN ...@@ -277,7 +270,7 @@ BEGIN
u_dp_field_blk : ENTITY work.dp_field_blk u_dp_field_blk : ENTITY work.dp_field_blk
GENERIC MAP ( GENERIC MAP (
g_field_arr => field_arr_set_mode(g_hdr_field_arr , "RW"), g_field_arr => field_arr_set_mode(g_hdr_field_arr , "RW"),
g_field_sel => g_hdr_field_ovr_init, g_field_sel => g_hdr_field_sel,
g_snk_data_w => c_dp_field_blk_snk_data_w, g_snk_data_w => c_dp_field_blk_snk_data_w,
g_src_data_w => c_dp_field_blk_src_data_w g_src_data_w => c_dp_field_blk_src_data_w
) )
...@@ -295,10 +288,7 @@ BEGIN ...@@ -295,10 +288,7 @@ BEGIN
src_out => dp_concat_snk_in_2arr(i)(1), src_out => dp_concat_snk_in_2arr(i)(1),
reg_slv_mosi => reg_hdr_dat_mosi_arr(i), reg_slv_mosi => reg_hdr_dat_mosi_arr(i),
reg_slv_miso => reg_hdr_dat_miso_arr(i), reg_slv_miso => reg_hdr_dat_miso_arr(i)
reg_ovr_mosi => reg_hdr_ovr_mosi_arr(i),
reg_ovr_miso => reg_hdr_ovr_miso_arr(i)
); );
END GENERATE; END GENERATE;
...@@ -370,16 +360,4 @@ BEGIN ...@@ -370,16 +360,4 @@ BEGIN
miso_arr => reg_hdr_dat_miso_arr miso_arr => reg_hdr_dat_miso_arr
); );
u_common_mem_mux_hdr_ovr : ENTITY common_lib.common_mem_mux
GENERIC MAP (
g_nof_mosi => g_nof_streams,
g_mult_addr_w => ceil_log2(g_hdr_field_arr'LENGTH)
)
PORT MAP (
mosi => reg_hdr_ovr_mosi,
miso => reg_hdr_ovr_miso,
mosi_arr => reg_hdr_ovr_mosi_arr,
miso_arr => reg_hdr_ovr_miso_arr
);
END str; END str;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment