From: Jan Michel Date: Fri, 11 Aug 2017 15:01:04 +0000 (+0200) Subject: Fix hardcoded buffer sizes for RDO, now read again from config.vhd X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=b3e93f64efeb4ab077c527c68d6307088266b8c1;p=trb3sc.git 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 451cdca..a8ca920 100644 --- 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 f9d643e..3bc30fb 100644 --- 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 7b81fb5..a346d1d 100644 --- 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(