From: hadeshyp <hadeshyp>
Date: Tue, 22 Jan 2008 14:42:33 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: oldGBE~615
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=b781b3f11cc387b7b0639e5fadd9bfa561db3724;p=trbnet.git

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

diff --git a/trb_net16_endpoint_0_trg_1_api.vhd b/trb_net16_endpoint_0_trg_1_api.vhd
index e592841..6b37c90 100644
--- a/trb_net16_endpoint_0_trg_1_api.vhd
+++ b/trb_net16_endpoint_0_trg_1_api.vhd
@@ -419,8 +419,8 @@ begin
         API_TYPE          => API_TYPE,
         FIFO_TO_INT_DEPTH => FIFO_TO_INT_DEPTH,
         FIFO_TO_APL_DEPTH => FIFO_TO_APL_DEPTH,
-        USE_REPLY_CHANNEL => c_USE_REPLY_CHANNEL(DAT_CHANNEL),
-        FORCE_REPLY       => c_FORCE_REPLY(DAT_CHANNEL),
+        USE_REPLY_CHANNEL => cfg_USE_REPLY_CHANNEL(DAT_CHANNEL),
+        FORCE_REPLY       => cfg_FORCE_REPLY(DAT_CHANNEL),
         SBUF_VERSION      => SBUF_VERSION
         )
       port map (
@@ -478,8 +478,8 @@ begin
         API_TYPE          => API_TYPE,
         FIFO_TO_INT_DEPTH => FIFO_TO_INT_DEPTH,
         FIFO_TO_APL_DEPTH => FIFO_TO_APL_DEPTH,
-        USE_REPLY_CHANNEL => c_USE_REPLY_CHANNEL(DAT_CHANNEL),
-        FORCE_REPLY       => c_FORCE_REPLY(DAT_CHANNEL),
+        USE_REPLY_CHANNEL => cfg_USE_REPLY_CHANNEL(DAT_CHANNEL),
+        FORCE_REPLY       => cfg_FORCE_REPLY(DAT_CHANNEL),
         SBUF_VERSION      => SBUF_VERSION
         )
       port map (
@@ -556,8 +556,8 @@ IOBUF: trb_net16_iobuf
     REPLY_DEPTH         => REPLY_DEPTH,
     IBUF_SECURE_MODE    => IBUF_SECURE_MODE,
     SBUF_VERSION        => SBUF_VERSION,
-    USE_ACKNOWLEDGE     => c_USE_ACKNOWLEDGE(DAT_CHANNEL),
-    USE_REPLY_CHANNEL   => c_USE_REPLY_CHANNEL(DAT_CHANNEL),
+    USE_ACKNOWLEDGE     => cfg_USE_ACKNOWLEDGE(DAT_CHANNEL),
+    USE_REPLY_CHANNEL   => cfg_USE_REPLY_CHANNEL(DAT_CHANNEL),
     INIT_CAN_SEND_DATA  => INIT_CAN_SEND_DATA,
     REPLY_CAN_SEND_DATA => REPLY_CAN_SEND_DATA
     )
diff --git a/trb_net16_ibuf.vhd b/trb_net16_ibuf.vhd
index 71e867c..7278ccb 100644
--- a/trb_net16_ibuf.vhd
+++ b/trb_net16_ibuf.vhd
@@ -192,14 +192,11 @@ begin
           if MED_PACKET_NUM_IN = "10" then
             next_rec_buffer_size_out <= MED_DATA_IN(3 downto 0);
           end if;
-        else
-          if fifo_full = '0' then
-            fifo_write <=  '1';
-          else
+        elsif not (current_packet_type = TYPE_ILLEGAL) then
+          fifo_write <=  '1';
+          if fifo_full = '1' then
             next_error_state <= GOT_OVERFLOW_ERROR;
           end if;
---         elsif is_locked = '1' then
---           next_error_state <= GOT_LOCKED_ERROR;
         end if;
       end if;
       if fifo_full = '0' then
@@ -289,7 +286,7 @@ begin
     end process;
 
 
---BUGBUG HDR retransmit needed
+--BUGBUG HDR retransmit needed -> not here but in HUB
 
   release_locked <= CTRL_LOCKED(0);
   STAT_LOCKED(0) <= is_locked;
diff --git a/trb_net_std.vhd b/trb_net_std.vhd
index 514b531..0a6dc21 100644
--- a/trb_net_std.vhd
+++ b/trb_net_std.vhd
@@ -58,7 +58,7 @@ package trb_net_std is
   constant std_IBUF_SECURE_MODE : integer := c_SECURE_MODE;
   constant std_USE_ACKNOWLEDGE  : integer := c_YES;
   constant std_USE_REPLY_CHANNEL: integer := c_YES;
-  constant std_FIFO_DEPTH       : integer := c_SMALL;
+  constant std_FIFO_DEPTH       : integer := c_FIFO_SMALL;
   constant std_DATA_COUNT_WIDTH : integer := 5; --max 7
   constant std_TERM_SECURE_MODE : integer := c_NO;
   constant std_MUX_SECURE_MODE  : integer := c_NO;