From: hadeshyp <hadeshyp>
Date: Fri, 5 Feb 2010 12:36:52 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: oldGBE~339
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=5f0ac53456f4df36a07a2178ccdfb43d678dd9e8;p=trbnet.git

*** empty log message ***
---

diff --git a/trb_net16_hub_ipu_logic.vhd b/trb_net16_hub_ipu_logic.vhd
index c3ab43a..348df1b 100644
--- a/trb_net16_hub_ipu_logic.vhd
+++ b/trb_net16_hub_ipu_logic.vhd
@@ -931,13 +931,13 @@ begin
 ----------------------------------
 --REPLY POOL state machine
 ----------------------------------
-  reply_state_machine : process(REPLY_POOL_next_READ, current_state, packet_counter,
+  reply_state_machine : process(REPLY_POOL_next_READ, current_state, packet_counter, timeout_found,
                                 send_reply_trm, REPLY_combined_trm_F1, REPLY_combined_trm_F2, got_all_DHDR,
                                 comb_REPLY_muxed_DATAREADY, comb_REPLY_muxed_DATA, init_locked,
                                 waiting_for_DHDR_word, locking_point, last_reply_adder_ready,
-                                real_activepoints, locked, MY_ADDRESS_IN, reply_adder_result,
+                                real_activepoints, locked, MY_ADDRESS_IN, reply_adder_result, evt_code_mismatch,
                                 reply_combined_trm_F3, reply_compare_finished, reg_current_reply_auto_reading_dhdr,
-                                reply_adder_final_result, reg_current_reply_reading_dhdr,
+                                reply_adder_final_result, reg_current_reply_reading_dhdr, evt_number_mismatch,
                                 evt_seqnr, evt_dtype, evt_random_code, evt_number, number_of_replies,
                                 reply_data_counter, current_point_length, enable_packing, reply_arbiter_input,
                                 reply_arbiter_result, reply_reading_f2,current_reply_reading_trm)
diff --git a/trb_net16_trigger.vhd b/trb_net16_trigger.vhd
index f0772c3..cb9fb3b 100644
--- a/trb_net16_trigger.vhd
+++ b/trb_net16_trigger.vhd
@@ -84,10 +84,10 @@ begin
   end generate;
 
 
-    process(RESET, transfer_counter, INT_READ_IN, saved_packet_type, buf_TRG_ERROR_PATTERN_IN,
-            reg_TRG_TYPE_OUT, reg_TRG_CODE_OUT, reg_TRG_NUMBER_OUT,
+    process(transfer_counter, INT_READ_IN, saved_packet_type, buf_TRG_ERROR_PATTERN_IN,
+            reg_TRG_TYPE_OUT, reg_TRG_CODE_OUT, reg_TRG_NUMBER_OUT, int_dataready_in,
             reg_TRG_INFORMATION_OUT, reg_TRG_RECEIVED_OUT, INT_PACKET_NUM_IN, INT_DATA_IN,
-            buf_INT_DATA_OUT, TRG_RELEASE_IN, send_trm, buf_INT_DATAREADY_OUT)
+            buf_INT_DATA_OUT, TRG_RELEASE_IN, send_trm, buf_INT_DATAREADY_OUT, seqnr)
       begin
         if USE_TRG_PORT = 1 then
           next_TRG_TYPE_OUT <= reg_TRG_TYPE_OUT;
diff --git a/trb_net_onewire_listener.vhd b/trb_net_onewire_listener.vhd
index a538274..f722d57 100644
--- a/trb_net_onewire_listener.vhd
+++ b/trb_net_onewire_listener.vhd
@@ -79,7 +79,7 @@ begin
       );
 
 
-  PROC_CLEAN_ONEWIRE : process(CLK)
+  PROC_CLEAN_ONEWIRE : process(CLK, CLK_EN)
     begin
       if rising_edge(CLK) and CLK_EN = '1' then
         saved_onewire <= reg_onewire & saved_onewire(7 downto 1);
@@ -91,7 +91,7 @@ begin
       end if;
     end process;
 
-  PROC_SHIFT_BYTES : process(CLK)
+  PROC_SHIFT_BYTES : process(CLK, CLK_EN)
     begin
       if rising_edge(CLK) and CLK_EN = '1' then
         if read_bit_enable = '1' then