Merge branch 'master' of git.astron.nl:desp/hdl

applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/mmm_lofar2_unb2b_filterbank.vhd

@@ -284,7 +284,7 @@ BEGIN
                                               PORT MAP(mm_rst, mm_clk, reg_sdp_info_mosi, reg_sdp_info_miso );
 
     u_mm_file_reg_stat_enable        : mm_file GENERIC MAP(mmf_unb_file_prefix(g_sim_unb_nr, c_sim_node_nr, c_sim_node_type) & "REG_STAT_ENABLE")
-                                               PORT MAP(mm_rst, mm_clk, reg_stat_enable_mosi, reg_si_miso );
+                                               PORT MAP(mm_rst, mm_clk, reg_stat_enable_mosi, reg_stat_enable_miso );
 
     u_mm_file_reg_stat_hdr_info      : mm_file GENERIC MAP(mmf_unb_file_prefix(g_sim_unb_nr, c_sim_node_nr, c_sim_node_type) & "REG_STAT_HDR_INFO")
                                                PORT MAP(mm_rst, mm_clk, reg_stat_hdr_dat_mosi, reg_stat_hdr_dat_miso);

applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd

@@ -237,10 +237,9 @@ PACKAGE sdp_pkg is
   CONSTANT c_sdp_stat_hdr_field_sel  : STD_LOGIC_VECTOR(c_sdp_stat_nof_hdr_fields-1 DOWNTO 0) := "101"&"111111111001"&"0111"&"01000000000000000000"&"0";  -- 0=data path, 1=MM controlled TODO
 
   CONSTANT c_sdp_stat_hdr_field_arr : t_common_field_arr(c_sdp_stat_nof_hdr_fields-1 DOWNTO 0) := (
-      ( field_name_pad("eth_dst_mac"                             ), "RW", 48, field_default(x"00074306C700") ), -- 00074306C700=DOP36-eth0 
+      ( field_name_pad("eth_dst_mac"                             ), "RW", 48, field_default(x"001B217176B9") ), -- 001B217176B9 = DOP36-enp2s0 
       ( field_name_pad("eth_src_mac"                             ), "RW", 48, field_default(0) ),
       ( field_name_pad("eth_type"                                ), "RW", 16, field_default(x"0800") ),
-
       ( field_name_pad("ip_version"                              ), "RW",  4, field_default(4) ),
       ( field_name_pad("ip_header_length"                        ), "RW",  4, field_default(5) ),
       ( field_name_pad("ip_services"                             ), "RW",  8, field_default(0) ),
@@ -252,16 +251,13 @@ PACKAGE sdp_pkg is
       ( field_name_pad("ip_protocol"                             ), "RW",  8, field_default(17) ),
       ( field_name_pad("ip_header_checksum"                      ), "RW", 16, field_default(0) ),
       ( field_name_pad("ip_src_addr"                             ), "RW", 32, field_default(0) ),
-      ( field_name_pad("ip_dst_addr"                             ), "RW", 32, field_default(x"C0A80001") ), -- C0A80001=DOP36-eth0 '192.168.0.1'
-      
+      ( field_name_pad("ip_dst_addr"                             ), "RW", 32, field_default(x"0A6300FE") ), -- 0A6300FE = DOP36-enp2s0 '10.99.0.254'
       ( field_name_pad("udp_src_port"                            ), "RW", 16, field_default(0) ), 
       ( field_name_pad("udp_dst_port"                            ), "RW", 16, field_default(5001) ), 
       ( field_name_pad("udp_total_length"                        ), "RW", 16, field_default(7848) ), 
       ( field_name_pad("udp_checksum"                            ), "RW", 16, field_default(0) ),
-      
       ( field_name_pad("sdp_marker"                              ), "RW",  8, field_default(0) ),
       ( field_name_pad("sdp_version_id"                          ), "RW",  8, field_default(5) ),
-      
       ( field_name_pad("sdp_observation_id"                      ), "RW", 32, field_default(0) ),
       ( field_name_pad("sdp_station_id"                          ), "RW", 16, field_default(0) ),
       ( field_name_pad("sdp_source_info_antenna_band_id"         ), "RW",  1, field_default(0) ),
@@ -273,7 +269,6 @@ PACKAGE sdp_pkg is
       ( field_name_pad("sdp_source_info_subband_calibrated_flag" ), "RW",  1, field_default(0) ),
       ( field_name_pad("sdp_source_info_reserved"                ), "RW",  3, field_default(0) ),
       ( field_name_pad("sdp_source_info_gn_id"                   ), "RW",  5, field_default(0) ),
-      
       ( field_name_pad("sdp_reserved"                            ), "RW",  8, field_default(0) ),
       ( field_name_pad("sdp_integration_interval"                ), "RW", 24, field_default(0) ),
       ( field_name_pad("sdp_data_id"                             ), "RW", 32, field_default(0) ),
@@ -281,7 +276,6 @@ PACKAGE sdp_pkg is
       ( field_name_pad("sdp_nof_bytes_per_statistics"            ), "RW",  8, field_default(8) ),
       ( field_name_pad("sdp_nof_statistics_per_packet"           ), "RW", 16, field_default(0) ),
       ( field_name_pad("sdp_block_period"                        ), "RW", 16, field_default(0) ),
-      
       ( field_name_pad("dp_bsn"                                  ), "RW", 64, field_default(0) )
   );
   CONSTANT c_sdp_reg_stat_hdr_dat_addr_w         : NATURAL := ceil_log2(field_nof_words(c_sdp_stat_hdr_field_arr, c_word_w));