From e699cb75941a20fb0d0519bb7e4ea07a02b1e05e Mon Sep 17 00:00:00 2001
From: Daniel van der Schuur <schuur@astron.nl>
Date: Tue, 24 Mar 2015 16:17:27 +0000
Subject: [PATCH] -Set override bits and default value for IP- and UPD-lentghs;
they're no longer inserted by dp_offload_tx.
---
.../src/vhdl/apertif_unb1_correlator_vis_offload.vhd | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_vis_offload.vhd b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_vis_offload.vhd
index 998c416e35..beaff3e9fd 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_vis_offload.vhd
+++ b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_vis_offload.vhd
@@ -72,7 +72,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
( field_name_pad("ip_version" ), " ", 4, field_default(4) ),
( field_name_pad("ip_header_length" ), " ", 4, field_default(5) ),
( field_name_pad("ip_services" ), " ", 8, field_default(0) ),
- ( field_name_pad("ip_total_length" ), " ", 16, field_default(0) ),
+ ( field_name_pad("ip_total_length" ), " ", 16, field_default(2468) ), --2448+20
( field_name_pad("ip_identification" ), " ", 16, field_default(0) ),
( field_name_pad("ip_flags" ), " ", 3, field_default(2) ),
( field_name_pad("ip_fragment_offset" ), " ", 13, field_default(0) ),
@@ -83,7 +83,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
( field_name_pad("ip_dst_addr" ), " ", 32, field_default(x"0A6300FE") ), -- dop17
( field_name_pad("udp_src_port" ), " ", 16, field_default(4000) ),
( field_name_pad("udp_dst_port" ), " ", 16, field_default(4000) ),
- ( field_name_pad("udp_total_length" ), " ", 16, field_default(0) ),
+ ( field_name_pad("udp_total_length" ), " ", 16, field_default(2448) ),
( field_name_pad("udp_checksum" ), " ", 16, field_default(0) ),
( field_name_pad("id_marker_byte" ), " ", 8, field_default(65) ), -- ASCII 'A'
( field_name_pad("id_format_version" ), " ", 8, field_default(1) ),
@@ -295,8 +295,8 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
CONSTANT c_hdr_field_flags_ovr_init : STD_LOGIC_VECTOR(c_nof_flags_per_input-1 DOWNTO 0) := "1"; -- All 8 flags combined in one register for now.
CONSTANT c_hdr_field_ovr_init : STD_LOGIC_VECTOR(c_nof_hdr_fields-1 DOWNTO 0) := "1101" & -- Eth header fields: eth_src_mac from data path (others use MM default value).
- "111011111101" & -- IP header fields: ip_total_length* and ip_src_addr from data path (others use MM default value).
- "1101"& -- UDP header fields: udp_total_length* from data path. *Length fields inserted by dp_offload_tx
+ "111111111101" & -- IP header fields: ip_src_addr from data path (others use MM default value).
+ "1111"& -- UDP header fields
c_hdr_field_id_ovr_init & -- ID header fields
c_hdr_field_flags_ovr_init & -- Flags input 0
c_hdr_field_flags_ovr_init & -- Flags input 1
--
GitLab