Commit graph

9,307 commits

Author SHA1 Message Date
stephan
e1dc995b49 adc128s102: add pragma synthesis, syn_preserve to inverted output
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3303 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-17 17:37:57 +00:00
stephan
7a5126185f adc128s102: merge -c 3298 from ana/em/v03: pragma synthesis, syn_preserve
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3302 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-17 17:35:01 +00:00
stephan
890d4e88d0 heteptana: use the registered inverted ADC control outputs from aschedule
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3301 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-17 17:31:47 +00:00
stephan
6382c652ec sfilter: forward inverted adc control outputs
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3300 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-17 17:30:40 +00:00
stephan
d87dba3619 adc128s102: add inverted adc control outputs to aschedule
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3299 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-17 17:21:30 +00:00
stephan
b148e76803 heteptana em/v03: add pragma syn_preserve to ADC control output registers
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3298 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-17 09:54:30 +00:00
stephan
8adb40c9b3 heteptana em/v03: merge -c 2388,3296: sync with dig/v05
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3297 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-16 21:56:04 +00:00
stephan
13a90fb836 heteptdig em/v05: merge r2413-2927: sersplit fixes, irrelevant for synthesis
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3296 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-16 21:49:48 +00:00
stephan
e70cc07b7f heteptana em/v03: update ram sim model from dig/v05
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3295 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-16 21:39:43 +00:00
stephan
1b5bf503d8 heteptana em/v03: update ram sim model from dig/v05
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3294 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-16 21:36:40 +00:00
stephan
b059af4743 heteptana em/v03: gold lost+found
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3293 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-16 21:31:59 +00:00
stephan
500312eba9 heteptdig sim: 5 reg readout gold
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3292 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-16 21:09:24 +00:00
stephan
81f46ac1b2 heteptana em/v03:
merge -c 3285,3286,3287,3288

	Replicate all registers that drive multiple copies 
	of ADC control signals, so that those registers can
	be place into, or at least close to the IO pads.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3291 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-16 19:47:21 +00:00
stephan
b0936c6deb heteptdig: merge -c 2703 from em/v04
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3290 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-16 19:02:35 +00:00
stephan
d93a1a9f17 heteptdig em/v05: merge -c 3187,3252,3136: minor adjustments
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3289 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-16 18:52:16 +00:00
stephan
775b0e03b1 heteptana:
use the FO parameter to the adc scheduler to replicate the
	adc control signals to three sets of science ADC pads, and two
	sets of HK adc pads.

	This change should allow to place the registers into the IO pads, 
	or at least close to the pads.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3288 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-16 16:47:41 +00:00
stephan
753923daef adc128 filter:
support new FO parameter of the adcschedule module


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3287 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-16 16:43:33 +00:00
stephan
8af5003d17 hkadc:
support new FO parameter of the adcschedule module


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3286 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-16 16:40:50 +00:00
stephan
ed6a5555a6 adcschedule:
add parameter FO=1
	for ADC control signal register replication
	to fanout to multiple IO pads with minimum delay.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3285 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-16 16:39:43 +00:00
stephan
f2b2249296 stein: review sc scheduler: spelling, DOUT mux fix, active
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3284 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-16 14:04:27 +00:00
wetzel
917d90eee0 sc sched: redesign of sc sched Finished and tested
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3283 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-16 12:45:09 +00:00
terasa
b4034866b6 step*.l3: Histogram code for single hit triggers.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3282 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-16 12:22:29 +00:00
wetzel
770459d9eb sc sched: redesign of sc sched, STILL IN PROGRESS - NOT(!) Finished
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3281 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-15 21:19:41 +00:00
wetzel
70a0c2b5af stein_ix_controller: changed order of declaration (actel compiler)
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3280 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-15 12:42:45 +00:00
wetzel
f349e044d7 stein_ix_acquire_switch: changed order of declaration (actel compiler)
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3279 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-15 12:41:55 +00:00
wetzel
c7e25fae13 stein_core: changed order of declaration (actel compiler)
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3278 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-15 12:41:04 +00:00
wetzel
3bc6672b64 stein_adc_controller: changed order of declaration (actel compiler)
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3277 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-15 12:39:47 +00:00
rasch
863f0f04b7 Fixed IO bug that appeared during modularization.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3276 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-15 10:46:55 +00:00
stephan
4ca4020e35 heteptdig em/v05: merge -c 3180,3188: arb without telemetry
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3275 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-15 09:21:48 +00:00
stephan
9a71d063d7 heteptdig em v05:
new gold
	use heteptana em/v03 (from v01)
	not changes to heteptdig synth


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3274 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-15 09:17:32 +00:00
stephan
2c7808ea68 heteptdig em v05: rep copy from .../v04
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3273 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-15 06:58:15 +00:00
stephan
6b55c7d3e5 heteptana em v03: merge -c3269: HSDATA IOpad register
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3272 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-15 06:53:50 +00:00
stephan
4a615d51d3 heteptana em v03: merge -r2252-3268: hkadc testjig fixes, no synth changes
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3271 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-15 06:51:59 +00:00
stephan
7d2cb90982 heteptana gold for -c 3264,3269
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3270 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-15 06:46:14 +00:00
stephan
6c3616c6df hkadc:
Add a register to HSDATA, to allow placement in an IO-pad.
	This improves round trip delay clk->HSCLK->HSDATA->clk.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3269 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-14 20:42:47 +00:00
stephan
30af9f3aa4 hkadc: testjig: reduce number of ADC from 5 to 4
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3268 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-14 20:40:11 +00:00
stephan
22b5c9af42 hkadc: make testjig more reproducable, by removing randomness
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3267 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-14 20:26:42 +00:00
stephan
e40c0f79fc hkadc: fix testjig
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3266 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-14 20:16:03 +00:00
stephan
8a7802a1b5 heteptana em v03: merge -c 3264: SDATA IO pad registers
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3265 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-14 18:43:19 +00:00
stephan
63e4ec9c56 sfilter.v:
This patch adds a register at the DOUT/SDATA input, before it is
	distributed to four SRAM blocks.

	This is necessary to meet worst case timing requirements of the ADCs.
	The ADCs require 27ns propagation delay from SCLK to SDATA.  The FPGA 
	must ensure the roundtrip clk -> SCLK -> SDATA -> clk takes no more
	than 62.5ns.  The aim is to constrain synthesis such that the sum of the
	delay clk->SCLK plus setup time DOUT->clk is shorter than 25ns.

	Obviously, there should be a register in the input pads of DOUT/SDATA.

	All inwards bound timing output of the aschedule module needs to be
	delayed by one clk cycle to cover for the extra register, that's all.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3264 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-14 18:40:42 +00:00
terasa
271fd18200 step*.l3: Initial commit of STEP L3 trigger code.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3263 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-14 15:50:13 +00:00
stephan
cc8db1362d heteptana em:
branch v03 from v02
	will become QM
	reason for the change: add IO-register to ASDATA 


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3262 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-14 14:46:14 +00:00
stephan
bc941d2433 adamhist.awk now allows to cut on multiplicities
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3261 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-14 14:42:07 +00:00
stephan
c2f526aea1 tarena: new data with filter=2
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3260 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-14 14:41:13 +00:00
stephan
e6481a358c print.gpt no does enhanced
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3259 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-14 14:40:24 +00:00
stephan
5b3337e12b tarena: read_delay parameter means (n+1) µs now
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3258 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-14 14:39:25 +00:00
stephan
32b31790ee pipe: fix indentation
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3257 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-14 14:38:38 +00:00
wetzel
068a0b5299 stein_ix_controller: changed order of declaration (actel compiler)
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3256 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-14 13:19:58 +00:00
wetzel
fa73a92515 stein_ix_controller: changed order of declaration (actel compiler)
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3255 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-14 13:18:08 +00:00
wetzel
49b86b3130 stein_ix_controller: changed order of declaration (actel compiler)
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3254 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-14 13:16:15 +00:00