Job van Wee · Reinier van der Walle · Job van Wee
--- a/applications/lofar2/libraries/ddrctrl/src/vhdl/ddrctrl_input_repack.vhd
+++ b/applications/lofar2/libraries/ddrctrl/src/vhdl/ddrctrl_input_repack.vhd
    clk                     : IN  STD_LOGIC;
    rst                     : IN  STD_LOGIC;
    in_data                 : IN  STD_LOGIC_VECTOR(g_in_data_w-1 DOWNTO 0);                                                                   -- input data
+    in_bsn                  : IN  STD_LOGIC_VECTOR(c_dp_stream_bsn_w-1 DOWNTO 0);                                                             -- input bsn
+    in_stop                 : IN  STD_LOGIC := '0';
+    in_adr                     : IN  NATURAL;
--- a/applications/lofar2/libraries/ddrctrl/src/vhdl/ddrctrl_input_repack.vhd
+++ b/applications/lofar2/libraries/ddrctrl/src/vhdl/ddrctrl_input_repack.vhd

  -- type for statemachine
-  TYPE t_state IS (OVERFLOW_OUTPUT, FILL_VECTOR, FIRST_OUTPUT, RESET);
+  TYPE t_state IS (OVERFLOW_OUTPUT, FILL_VECTOR, FIRST_OUTPUT, RESET, STOP);

  -- record for readability
  TYPE t_reg IS RECORD
  state                     : t_state;                                                                                                        -- the state the process is currently in;
-  a_of                      : NATURAL;                                                                                                        -- amount of overflow
  c_v                       : STD_LOGIC_VECTOR(k_c_v_w-1 DOWNTO 0);                                                                           -- the vector that stores the input data until the data is put into the output data vector
  c_v_count                 : NATURAL;                                                                                                        -- the amount of times the c_v vector received data from the input since the last time it was filled completely
  out_data_count            : NATURAL;                                                                                                        -- the amount of times the output data vector has been filled since the last time c_v was filled completely
+  out_bsn_written           : STD_LOGIC;
  out_of                    : NATURAL;
  out_sosi                  : t_dp_sosi;
+  out_bsn_ds                : NATURAL;
--- a/applications/lofar2/libraries/ddrctrl/src/vhdl/ddrctrl_input_repack.vhd
+++ b/applications/lofar2/libraries/ddrctrl/src/vhdl/ddrctrl_input_repack.vhd

    CASE q_reg.state IS
    WHEN FILL_VECTOR =>                                                                                                                       -- if the input data doesn't exceeds the output data vector width
-      v.c_v(g_in_data_w*(q_reg.c_v_count+1)+q_reg.a_of-1 DOWNTO g_in_data_w*q_reg.c_v_count+q_reg.a_of) := in_data(g_in_data_w-1 DOWNTO 0);   -- fill c_v
+      v.c_v(g_in_data_w*(q_reg.c_v_count+1)+q_reg.out_of-1 DOWNTO g_in_data_w*q_reg.c_v_count+q_reg.out_of) := in_data(g_in_data_w-1 DOWNTO 0);   -- fill c_v
      v.c_v_count := q_reg.c_v_count+1;                                                                                                       -- increase the counter of c_v with 1
      v.out_sosi.valid := '0';                                                                                                                -- out_sosi.valid 0

+      -- BSN_INPUT
--- a/applications/lofar2/libraries/ddrctrl/src/vhdl/ddrctrl_input_repack.vhd
+++ b/applications/lofar2/libraries/ddrctrl/src/vhdl/ddrctrl_input_repack.vhd
+      END IF;
+
+
    WHEN FIRST_OUTPUT =>                                                                                                                      -- if the input data exceeds output data vector width but not the c_v width
-       v.c_v(g_in_data_w*(q_reg.c_v_count+1)+q_reg.a_of-1 DOWNTO g_in_data_w*q_reg.c_v_count+q_reg.a_of) := in_data(g_in_data_w-1 DOWNTO 0);  -- fill c_v
-       v.c_v_count := q_reg.c_v_count + 1;                                                                                                    -- increase the counter of c_v with 1
-       v.out_sosi.data(c_out_data_w - 1 DOWNTO 0) := v.c_v(c_out_data_w - 1 DOWNTO 0);                                                        -- fill out_sosi.data with 1st part of c_v
-       v.out_sosi.valid := '1';                                                                                                               -- out_sosi.valid 1
-       v.out_data_count := q_reg.out_data_count+1;                                                                                            -- increase the counter of out_sosi.data with 1
+      v.c_v(g_in_data_w*(q_reg.c_v_count+1)+q_reg.out_of-1 DOWNTO g_in_data_w*q_reg.c_v_count+q_reg.out_of) := in_data(g_in_data_w-1 DOWNTO 0);   -- fill c_v
+      v.c_v_count := q_reg.c_v_count+1;                                                                                                     -- increase the counter of c_v with 1
+      v.out_sosi.data(c_out_data_w-1 DOWNTO 0) := v.c_v(c_out_data_w-1 DOWNTO 0);                                                         -- fill out_sosi.data with 1st part of c_v
+      v.out_sosi.valid := '1';                                                                                                                -- out_sosi.valid 1
+      v.out_data_count := q_reg.out_data_count+1;                                                                                             -- increase the counter of out_sosi.data with 1
+
+      IF in_adr = 0 AND q_reg.out_bsn_written = '0' THEN
--- a/applications/lofar2/libraries/ddrctrl/tb/vhdl/tb_ddrctrl.vhd
+++ b/applications/lofar2/libraries/ddrctrl/tb/vhdl/tb_ddrctrl.vhd
+      bsn <= ADD_UVEC(bsn, "0001", c_dp_stream_bsn_w);
+      WAIT FOR c_clk_period*1;
+    END LOOP;
+
+    -- sending a stop signal
+    stop_in <= '1';
+
+    -- filling the input data vectors with the corresponding numbers
+    make_data_1 : FOR J IN 0 TO c_sim_length-1 LOOP
      in_data_cnt     <= in_data_cnt+1;
-      fill_in_sosi_arr_rest : FOR I IN 0 TO g_nof_streams-1 LOOP
+      fill_in_sosi_arr_1 : FOR I IN 0 TO g_nof_streams-1 LOOP
        in_sosi_arr(I).data(g_data_w-1 DOWNTO 0)   <= c_total_vector(g_data_w*(I+1)+J*c_in_data_w-1 DOWNTO g_data_w*I+J*c_in_data_w);
      END LOOP;
+      in_sosi_arr(0).bsn(c_dp_stream_bsn_w-1 DOWNTO 0) <= bsn(c_dp_stream_bsn_w-1 DOWNTO 0);
+      bsn <= ADD_UVEC(bsn, "0001", c_dp_stream_bsn_w);