Reinier van der Walle
--- a/libraries/base/dp/src/vhdl/dp_field_blk.vhd
+++ b/libraries/base/dp/src/vhdl/dp_field_blk.vhd
 --   if override = '0' the field is taken from snk_in.data.
 -- . The initial (default) values of the override bits are passed via g_field_sel(one bit per field);
 -- . Both the SLV as the override (ovr) fields can be read back via MM;
-
+-- . g_mode can be used to select in which mode dp_field_blk should work. Most of the time, the
+--   default g_mode = 0 can be used. Forcing either source or sink mode could be done when the
+--   data sosi data length is larger than the field block.
--- a/libraries/base/dp/src/vhdl/dp_repack_data.vhd
+++ b/libraries/base/dp/src/vhdl/dp_repack_data.vhd
  TYPE t_reg IS RECORD
    dat_arr       : t_dat_arr(g_in_nof_words-1 DOWNTO 0);     -- internally use dat_arr[] to represent v.src_out.data
    src_out       : t_dp_sosi;                                -- sosi output
+    src_out_data  : STD_LOGIC_VECTOR(c_in_buf_dat_w-1 DOWNTO 0);
--- a/libraries/io/eth/src/vhdl/eth_tester.vhd
+++ b/libraries/io/eth/src/vhdl/eth_tester.vhd
 -- AUthor: E. Kooistra
 -- Purpose: Test the 1GbE interface by sending and counting received packets.
 -- Description: See detailed design in [1]
 --
--- a/libraries/io/eth/tb/vhdl/tb_eth_tester_high_bw.vhd 0 → 100644
+++ b/libraries/io/eth/tb/vhdl/tb_eth_tester_high_bw.vhd 0 → 100644
+--
+-------------------------------------------------------------------------------
+-- Author: R. vd Walle
+-- Purpose: Test bench for eth_tester using high bandwidth generic configuration
+-- Description: Similar to the 1GbE testbench [1] for the eth tester but using generic
+-- values for usage with high bandwidth, e.g. 10 / 100 GbE.
+--   The g_nof_streams >= 1 are tested independently, using g_bg_ctrl_first for
+--   BG in stream 0 and g_bg_ctrl_others for all other streams.
+--
+-- Usage:
+-- > as 8
+-- # * E.g. view sosi/data signals in dut/gen_streams/u_rx and u_tx
+-- > run -a
+--
+-- References:
+-- [1] https://support.astron.nl/confluence/display/L2M/L6+FWLIB+Design+Document%3A+ETH+tester+unit+for+1GbE
--- a/libraries/io/eth/src/vhdl/eth_tester_rx.vhd
+++ b/libraries/io/eth/src/vhdl/eth_tester_rx.vhd

  CONSTANT c_nof_total_counts     : NATURAL := 3;  -- 0 = nof_sop, 1 = nof_valid, 2 = nof_crc_corrupt

-  CONSTANT c_empty_w              : NATURAL := 2;  -- for 0, 1, 2, 3 empty octets per word
+  CONSTANT c_empty_w              : NATURAL := ceil_log2(g_nof_octet_input);  
  CONSTANT c_error_w              : NATURAL := 1;
+  CONSTANT c_in_data_w            : NATURAL := g_nof_octet_input * c_octet_w;
+  CONSTANT c_repack_data_w        : NATURAL := g_nof_octet_unpack * c_octet_w;
+  CONSTANT c_nof_repack_words     : NATURAL := g_nof_octet_input / g_nof_octet_unpack;

  -- Rx FIFO size can be much less than rx_block_sz_max, because st_clk >
  -- eth_clk rate, but with st level tx-rx loopback the Rx FIFO does need
  -- rx_block_sz_max FIFO size.
-  CONSTANT rx_block_sz_max        : NATURAL := c_eth_tester_rx_block_len_max / c_word_sz;  -- = 9004 / 4 = 2251
-  CONSTANT c_fifo_size            : NATURAL := true_log_pow2(rx_block_sz_max);  -- = 4096 words
+  CONSTANT rx_block_sz_max        : NATURAL := c_eth_tester_rx_block_len_max / g_nof_octet_input; 
--- a/libraries/io/eth/src/vhdl/eth_tester_tx.vhd
+++ b/libraries/io/eth/src/vhdl/eth_tester_tx.vhd
+  CONSTANT c_empty_w              : NATURAL := ceil_log2(g_nof_octet_output);

  -- Choose 10% extra margin for FIFO fill level that will result in BG block
  -- level flow control via  bg_siso.xon. The input eop will release blocks
  -- for FIFO output already before the FIFO is fill level is reached.
  -- Choose FIFO size to fit one more packet on top of FIFO fill level.
-  CONSTANT c_packet_sz_max        : NATURAL := ceil_div(c_eth_tester_bg_block_len_max, c_word_sz);
+  CONSTANT c_packet_sz_max        : NATURAL := ceil_div(c_eth_tester_bg_block_len_max, g_nof_octet_output);
  CONSTANT c_fifo_fill            : NATURAL := c_packet_sz_max * 11 / 10;
-  CONSTANT c_fifo_size            : NATURAL := true_log_pow2(c_fifo_fill + c_packet_sz_max);  -- = 8192
+  CONSTANT c_fifo_size            : NATURAL := true_log_pow2(c_fifo_fill + c_packet_sz_max); 
  CONSTANT c_fifo_size_w          : NATURAL := ceil_log2(c_fifo_size);

  CONSTANT c_nof_total_counts     : NATURAL := 1;  -- one to count Tx packets

+  CONSTANT c_nof_repack_words     : NATURAL := g_nof_octet_output / g_nof_octet_generate;