Fix hardcoded buffer sizes for RDO, now read again from config.vhd

diff --git a/padiwa/trb3sc_padiwa.vhd b/padiwa/trb3sc_padiwa.vhd
index 451cdca950640b0cb370096758b3e25e22a1a1fd..a8ca9202307acddce79768e5b1b1549fa0786496 100644 (file)
--- a/padiwa/trb3sc_padiwa.vhd
+++ b/padiwa/trb3sc_padiwa.vhd
@@ -241,9 +241,9 @@ begin
       TIMING_TRIGGER_RAW        => c_YES,
       --Configure data handler
       DATA_INTERFACE_NUMBER     => 1,
-      DATA_BUFFER_DEPTH         => 10,
+      DATA_BUFFER_DEPTH         => EVENT_BUFFER_SIZE,
       DATA_BUFFER_WIDTH         => 32,
-      DATA_BUFFER_FULL_THRESH   => 2**8,
+      DATA_BUFFER_FULL_THRESH   => 2**EVENT_BUFFER_SIZE-EVENT_MAX_SIZE,
       TRG_RELEASE_AFTER_DATA    => c_YES,
       HEADER_BUFFER_DEPTH       => 9,
       HEADER_BUFFER_FULL_THRESH => 2**8

diff --git a/tdctemplate/trb3sc_tdctemplate.vhd b/tdctemplate/trb3sc_tdctemplate.vhd
index f9d643e98b104f7cd597a3d714f5997968838972..3bc30fbd527cbc105d69e94863338b9a9783fa64 100644 (file)
--- a/tdctemplate/trb3sc_tdctemplate.vhd
+++ b/tdctemplate/trb3sc_tdctemplate.vhd
@@ -261,9 +261,9 @@ begin
       TIMING_TRIGGER_RAW        => c_YES,
       --Configure data handler
       DATA_INTERFACE_NUMBER     => 1,
-      DATA_BUFFER_DEPTH         => 10,
+      DATA_BUFFER_DEPTH         => EVENT_BUFFER_SIZE,
       DATA_BUFFER_WIDTH         => 32,
-      DATA_BUFFER_FULL_THRESH   => 2**8,
+      DATA_BUFFER_FULL_THRESH   => 2**EVENT_BUFFER_SIZE-EVENT_MAX_SIZE,
       TRG_RELEASE_AFTER_DATA    => c_YES,
       HEADER_BUFFER_DEPTH       => 9,
       HEADER_BUFFER_FULL_THRESH => 2**8

diff --git a/template/trb3sc_basic.vhd b/template/trb3sc_basic.vhd
index 7b81fb5dd89f027849e2e29e1a9ea3790c7be711..a346d1dafb3e14e24a11955de020181b3e82be76 100644 (file)
--- a/template/trb3sc_basic.vhd
+++ b/template/trb3sc_basic.vhd
@@ -254,14 +254,14 @@ THE_ENDPOINT : entity work.trb_net16_endpoint_hades_full_handler_record
     BROADCAST_BITMASK            => x"FF",
     REGIO_INIT_ENDPOINT_ID       => x"0001",
     TIMING_TRIGGER_RAW           => c_YES,
-    --Configure data handler
-    DATA_INTERFACE_NUMBER        => 1,
-    DATA_BUFFER_DEPTH            => 13,
-    DATA_BUFFER_WIDTH            => 32,
-    DATA_BUFFER_FULL_THRESH      => 2**12+2**11,
-    TRG_RELEASE_AFTER_DATA       => c_YES,
-    HEADER_BUFFER_DEPTH          => 9,
-    HEADER_BUFFER_FULL_THRESH    => 2**8
+      --Configure data handler
+    DATA_INTERFACE_NUMBER     => 1,
+    DATA_BUFFER_DEPTH         => EVENT_BUFFER_SIZE,
+    DATA_BUFFER_WIDTH         => 32,
+    DATA_BUFFER_FULL_THRESH   => 2**EVENT_BUFFER_SIZE-EVENT_MAX_SIZE,
+    TRG_RELEASE_AFTER_DATA    => c_YES,
+    HEADER_BUFFER_DEPTH       => 9,
+    HEADER_BUFFER_FULL_THRESH => 2**8
     )
 
   port map(