From b1908254886636a0c8beb9fa44e6e057f9876943 Mon Sep 17 00:00:00 2001 From: Andreas Neiser Date: Fri, 19 Jun 2015 08:46:35 +0200 Subject: [PATCH] Revert "Produces at least working hitcounters" This reverts commit 0e22be5660cce617c71bd932e28a233afccf0e4b. --- ADC/config.vhd | 2 +- ADC/trb3_periph_adc.vhd | 2 +- ADC/trb3_periph_adc_constraints.lpf | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ADC/config.vhd b/ADC/config.vhd index 138db8d..1a4c7bc 100644 --- a/ADC/config.vhd +++ b/ADC/config.vhd @@ -52,7 +52,7 @@ package config is --> change names in constraints file --ring buffer size: 32,64,96,128,dyn --for TDC v1.6.3, only 0,1,3 are valid - constant RING_BUFFER_SIZE : integer range 0 to 7 := 3; --ring buffer size: 0, 1, 2, 3, 7 + constant RING_BUFFER_SIZE : integer range 0 to 7 := 0; --ring buffer size: 0, 1, 2, 3, 7 constant TDC_CONTROL_REG_NR : integer := 6; diff --git a/ADC/trb3_periph_adc.vhd b/ADC/trb3_periph_adc.vhd index 5622b36..208efdf 100644 --- a/ADC/trb3_periph_adc.vhd +++ b/ADC/trb3_periph_adc.vhd @@ -585,7 +585,7 @@ LED_YELLOW <= not med_stat_op(11); STATUS_REG_NR => 21, -- Number of status regs TDC_VERSION => TDC_VERSION, CONTROL_REG_NR => TDC_CONTROL_REG_NR, -- Number of control regs - higher than 8 check tdc_ctrl_addr - DEBUG => c_YES + DEBUG => c_NO ) port map ( RESET => reset_i, diff --git a/ADC/trb3_periph_adc_constraints.lpf b/ADC/trb3_periph_adc_constraints.lpf index 45dda98..dd0e1ec 100644 --- a/ADC/trb3_periph_adc_constraints.lpf +++ b/ADC/trb3_periph_adc_constraints.lpf @@ -163,7 +163,7 @@ LOCATE UGROUP "THE_ADC_PROC_cfd_11_group" REGION "THE_ADC_PROC_cfd_11_region"; UGROUP "EF_LT2" BBOX 10 51 BLKNAME THE_TDC/ReferenceChannel/Channel200 - BLKNAME THE_TDC/ReferenceChannel/Buffer_128.The_Buffer + BLKNAME THE_TDC/ReferenceChannel/Buffer_32.The_Buffer BLKNAME THE_TDC/GEN_Channels.1.Channels/Channel200 BLKNAME THE_TDC/GEN_Channels.1.Channels/Buffer_32.The_Buffer ; @@ -255,8 +255,8 @@ MULTICYCLE TO CELL "THE_TDC/GEN_Channels*Channels/Channel200/SimAdderNo*FC/FF*" MULTICYCLE TO CELL "THE_TDC/ReferenceChannel/Channel200/SimAdderNo*FC/FF*" 4x; # only relevant when TDC debug mode is c_YES -MULTICYCLE TO CELL "THE_TDC/GEN_Channels*Channels/sync_q*" 4 x; -MULTICYCLE TO CELL "THE_TDC/ReferenceChannel/sync_q*" 4 x; +# MULTICYCLE TO CELL "THE_TDC/GEN_Channels*Channels/sync_q*" 4 x; +# MULTICYCLE TO CELL "THE_TDC/ReferenceChannel/sync_q*" 4 x; MULTICYCLE FROM CELL "THE_TDC/GEN_Channels*Channels/Channel200/RingBuffer*FIFO/FF*" TO CELL "THE_TDC/GEN_Channels*Channels/Channel200/ringBuffer_almost_full_sync*" 2x; MULTICYCLE FROM CELL "THE_TDC/ReferenceChannel/Channel200/RingBuffer*FIFO/FF*" TO CELL "THE_TDC/ReferenceChannel/Channel200/ringBuffer_almost_full_sync*" 2x; -- 2.43.0