From: Jan Michel <michel@physik.uni-frankfurt.de>
Date: Thu, 20 Jul 2023 13:46:59 +0000 (+0200)
Subject: add further conditions to TRM reading in hub
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=e9f40df44429b2dbfcaccf40a32f001c5401022c;p=trbnet.git

add further conditions to TRM reading in hub
---

diff --git a/trb_net16_hub_logic_2.vhd b/trb_net16_hub_logic_2.vhd
index be0631b..93ca9de 100644
--- a/trb_net16_hub_logic_2.vhd
+++ b/trb_net16_hub_logic_2.vhd
@@ -238,7 +238,7 @@ begin
     reply_data_in_i(i*16+15 downto i*16)     <= REPLY_DATA_IN(i*16+15 downto i*16);
     reply_packet_num_in_i(i*3+2 downto i*3)  <= REPLY_PACKET_NUM_IN(i*3+2 downto i*3);
   
-    TRM_packet(i) <= '1' when REPLY_DATA_IN(i*16+2 downto i*16) = TYPE_TRM and REPLY_PACKET_NUM_IN(i*3+2 downto i*3) = c_H0 else '0';
+    TRM_packet(i) <= '1' when REPLY_DATA_IN(i*16+2 downto i*16) = TYPE_TRM and REPLY_PACKET_NUM_IN(i*3+2 downto i*3) = c_H0 and REPLY_DATAREADY_IN(i) = '1' and real_active_points(i) = '1' else '0';
   end generate;
 
   
diff --git a/trb_net16_ibuf.vhd b/trb_net16_ibuf.vhd
index c6be94a..430014d 100644
--- a/trb_net16_ibuf.vhd
+++ b/trb_net16_ibuf.vhd
@@ -16,7 +16,7 @@ entity trb_net16_ibuf is
     USE_VENDOR_CORES : integer range 0 to 1 := c_YES;
     USE_ACKNOWLEDGE  : integer range 0 to 1 := std_USE_ACKNOWLEDGE;
     USE_CHECKSUM     : integer range 0 to 1 := c_YES;
-    SBUF_VERSION     : integer range 0 to 1 := std_SBUF_VERSION;
+    SBUF_VERSION     : integer range 0 to 6 := std_SBUF_VERSION;
     INIT_CAN_RECEIVE_DATA  : integer range 0 to 1 := c_YES;
     REPLY_CAN_RECEIVE_DATA : integer range 0 to 1 := c_YES
     );
diff --git a/trb_net16_iobuf.vhd b/trb_net16_iobuf.vhd
index 3bc038e..a51f2dd 100644
--- a/trb_net16_iobuf.vhd
+++ b/trb_net16_iobuf.vhd
@@ -13,7 +13,7 @@ entity trb_net16_iobuf is
   generic (
     IBUF_DEPTH            : integer range 0 to 6 := c_FIFO_BRAM;--std_FIFO_DEPTH;
     IBUF_SECURE_MODE      : integer range 0 to 1 := c_NO;--std_IBUF_SECURE_MODE;
-    SBUF_VERSION          : integer range 0 to 1 := std_SBUF_VERSION;
+    SBUF_VERSION          : integer range 0 to 6 := std_SBUF_VERSION;
     SBUF_VERSION_OBUF     : integer range 0 to 6 := std_SBUF_VERSION;
     OBUF_DATA_COUNT_WIDTH : integer range 2 to 7 := std_DATA_COUNT_WIDTH;
     USE_ACKNOWLEDGE       : integer range 0 to 1 := std_USE_ACKNOWLEDGE;
diff --git a/trb_net_components.vhd b/trb_net_components.vhd
index ccd835e..2c35780 100644
--- a/trb_net_components.vhd
+++ b/trb_net_components.vhd
@@ -1710,7 +1710,7 @@ end component;
     generic (
       IBUF_DEPTH             : integer range 0 to 6 := c_FIFO_BRAM;  --std_FIFO_DEPTH;
       IBUF_SECURE_MODE       : integer range 0 to 1 := c_NO;  --std_IBUF_SECURE_MODE;
-      SBUF_VERSION           : integer range 0 to 1 := std_SBUF_VERSION;
+      SBUF_VERSION           : integer range 0 to 6 := std_SBUF_VERSION;
       SBUF_VERSION_OBUF      : integer range 0 to 6 := std_SBUF_VERSION;
       OBUF_DATA_COUNT_WIDTH  : integer range 2 to 7 := std_DATA_COUNT_WIDTH;
       USE_ACKNOWLEDGE        : integer range 0 to 1 := std_USE_ACKNOWLEDGE;
@@ -3513,7 +3513,7 @@ end component;
   component trb_net16_term_ibuf is
     generic(
       SECURE_MODE  : integer range 0 to 1 := std_TERM_SECURE_MODE;
-      SBUF_VERSION : integer range 0 to 1 := std_SBUF_VERSION
+      SBUF_VERSION : integer range 0 to 6 := std_SBUF_VERSION
       );
     port(
       --  Misc