From b2cc6928aacb705b4fd827ac67c468724b6a37b7 Mon Sep 17 00:00:00 2001 From: hadeshyp Date: Wed, 22 Jul 2009 18:22:37 +0000 Subject: [PATCH] *** empty log message *** --- design/tdc_readout.vhd | 5 ++--- design/tdc_readout_and_trb_interface.vhd | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/design/tdc_readout.vhd b/design/tdc_readout.vhd index 1876539..f248207 100644 --- 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 c3bb29d..afb9ce6 100644 --- 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 -- 2.43.0