From: Adrian Weber <adrian.a.weber@exp2.physik.uni-giessen.de>
Date: Mon, 21 Sep 2020 10:29:42 +0000 (+0200)
Subject: latest small fixes in Trbnet2Cri part
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=98b62e503c47a2e854180c90d23acc277f9968cb;p=cri.git

latest small fixes in Trbnet2Cri part
---

diff --git a/src/cri_data_sender.vhd b/src/cri_data_sender.vhd
index a907527..7f9fe72 100644
--- a/src/cri_data_sender.vhd
+++ b/src/cri_data_sender.vhd
@@ -577,8 +577,9 @@ begin
     else
       if ((send_state_current = PREPARE_SEND) or 
           (send_state_current = LOAD) or
-          (send_state_current = FINISH_SEND) or
-          (send_state_current = STOP_SEND))
+          (send_state_current = FINISH_SEND) --or
+          --(send_state_current = STOP_SEND)
+         )
       then
         cri_apl_send <= '1';
       else 
diff --git a/src/trb_net16_cri_interface.vhd b/src/trb_net16_cri_interface.vhd
index 0a10412..27ebca4 100644
--- a/src/trb_net16_cri_interface.vhd
+++ b/src/trb_net16_cri_interface.vhd
@@ -415,6 +415,8 @@ begin
   THE_IOBUF_1 : trb_net16_iobuf
     generic map(
       IBUF_DEPTH             => 6,
+      --SBUF_VERSION           => 0,
+      --SBUF_VERSION_OBUF      => 6,
       USE_ACKNOWLEDGE        => cfg_USE_ACKNOWLEDGE(1),
       USE_CHECKSUM           => cfg_USE_CHECKSUM(1),
       INIT_CAN_SEND_DATA     => c_YES,
@@ -591,6 +593,8 @@ begin
   THE_IOBUF_3 : trb_net16_iobuf
     generic map(
       IBUF_DEPTH             => 6,
+      --SBUF_VERSION           => 0,
+      --SBUF_VERSION_OBUF      => 6,
       USE_ACKNOWLEDGE        => cfg_USE_ACKNOWLEDGE(3),
       USE_CHECKSUM           => cfg_USE_CHECKSUM(3),
       INIT_CAN_SEND_DATA     => c_NO,--MII_IS_DOWNLINK(mii),
@@ -656,6 +660,12 @@ begin
 -- Multiplexer
 ---------------------------------------------------------------------
  MPLEX: trb_net16_io_multiplexer
+      --generic map (
+      --  USE_INPUT_SBUF => (c_NO,c_NO,
+      --                     1,1,
+      --                     c_NO, c_NO,
+      --                     1,1)
+     -- )
       port map (
         CLK      => CLK,
         RESET    => reset_i_mux_io,
@@ -729,6 +739,7 @@ begin
      MONITOR_SELECT_DROP_IN_IN    => (others => '0'), --dbg_select_drop_in,
      MONITOR_SELECT_DROP_OUT_IN   => (others => '0'), --dbg_select_drop_out,
      MONITOR_SELECT_GEN_DBG_IN    => (others => '0'), --monitor_gen_dbg, --dbg_select_gen,
+     MONITOR_IP_IN                => (others => '0'),
      
      DUMMY_EVENT_SIZE_OUT         => open,--dummy_event,
      DUMMY_TRIGGERED_MODE_OUT     => open,