*** empty log message ***

diff --git a/design/tdc_readout.vhd b/design/tdc_readout.vhd
index 1876539a953e11e22c469e76b28a6aac0ff4aed9..f2482074c3a8d4e4dd533244e66b6ca1d4855668 100644 (file)
--- a/design/tdc_readout.vhd
+++ b/design/tdc_readout.vhd
@@ -112,7 +112,6 @@ signal clear_saved_data_new_format_hit_0_1_cal : std_logic;
 
 --test data
 type state_type_test_data is (idle_state_test_data, send_data_with_valid_test_data,
-                              send_data_with_valid_next_test_data,
                               send_data_with_valid_next_test_data,
                               check_dataword_number_test_data,
                               send_token_state_test_data);
@@ -192,8 +191,8 @@ begin  -- behavioral
        if A_DST_IN = '1' and A_AOD_IN = '1' then
 --         next_state <= save_L_word_state_next;
          next_state <= wait_1_state;
---        elsif TOKEN_IN = x"1" then  --token and NO data
---          next_state <= send_token_state_2;
+       elsif TOKEN_IN = x"1" then  --token and NO data
+         next_state <= send_token_state_1;
 --         elsif TOKEN_IN = x"2" then --NO token and NO data
 --           next_state <= send_token_state_3;
        end if;

diff --git a/design/tdc_readout_and_trb_interface.vhd b/design/tdc_readout_and_trb_interface.vhd
index c3bb29d8ce82737f633305d569ebf5ccdae041e6..afb9ce6f184ae8940fb955247c04065b1380bbd5 100644 (file)
--- a/design/tdc_readout_and_trb_interface.vhd
+++ b/design/tdc_readout_and_trb_interface.vhd
@@ -470,7 +470,7 @@ process(current_state_fsm_multiplexer, header_data_fifo_out_i, reg_ipu_start_rea
       when send_data_state_fsm_multiplexer =>
         next_ipu_data      <= fee_data_fifo_out_i(31 downto 0);
         next_ipu_dataready <= fee_data_fifo_data_valid;
-        read_fee_data_fifo <= IPU_READ_IN or not fee_data_fifo_data_valid;
+        read_fee_data_fifo <= IPU_READ_IN or (not fee_data_fifo_data_valid and not last_read_fee_data_fifo);
 
         if (empty_flag_fee_data_fifo_i = '1' and last_read_fee_data_fifo = '0' and fee_data_fifo_data_valid = '0')
            or ( fee_data_fifo_out_i(35 downto 32) /= reg_flag_in_header and fee_data_fifo_data_valid = '1') then