[DAQ-drivers] driver/ti branch, devel, updated. v18.1
Bryan Moffit
moffit at jlab.org
Fri Mar 14 11:42:53 EDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "driver/ti".
The branch, devel has been updated
via d4a1619bd685a22ce3f880c89e1cec5b8d9ab9d6 (commit)
via 1a43f4bdbbe90a0c08e9dedd99dd08425e79dfe6 (commit)
via d047a9a0293f7c319e5c999dce8a72b254adb878 (commit)
via a4757e1505c4427bdeb4eda8c1089410753875ab (commit)
via 290af390c25ede3dd5e05bb5b939f92e7810d874 (commit)
via 3c92d49a26504e1a693ff75fad6d9c7b8b0bd463 (commit)
via d68e278661b91867384533ca273339e72b6c3e3f (commit)
via dac38715971856bc53b82f354f24f1a682c9a89f (commit)
via 2f7984b55037f936eaeada884ac627ea7421bd2c (commit)
via 4f774434feb8bd3e9473442a9138d449de9e06f1 (commit)
via cac134827b4930ebc7ae6f0f81d1ea8f6813853a (commit)
via 6d207c62174ff268dbb5bebc06b1bd10d430a762 (commit)
via 3fdb11993d5dafa6017b10a3c22996ecf5ce734e (commit)
via 9ea9716aaab091abc44435e6020e28bd461ec638 (commit)
via 28ed0c976f8f230e49e804289c1e36485d679b0c (commit)
via c4a8f55c1a345bbe7384cd96c19efbe006d3ecb0 (commit)
from 62770519153873509aca9458f6110d45f0542ff5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d4a1619bd685a22ce3f880c89e1cec5b8d9ab9d6
Merge: 6277051 1a43f4b
Author: Bryan Moffit <moffit at jlab.org>
Date: Fri Mar 14 11:40:22 2014 -0400
Merge branch 'release-coda3.1' into devel
commit 1a43f4bdbbe90a0c08e9dedd99dd08425e79dfe6
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Mar 13 21:12:58 2014 -0400
tiLib.{c,h}
- Fix some comments when using Fiber 5 for TI Slave in tiInit
- Fix BUG. Should hit Fiber 5 autoalign sync in slave
instead of 1 if fiber 5 was choosen as the TI Slave input
- Fix BUG. Set the TI Master Fiber Compensation for the TI Master
to the global variable tiFiberLatencyOffset, instead of the
old default 0x1f1f1f1f1f
- Add routine to allow for changing the input port of a TI Slave
(1 or 5)
- Add routine that returns the TI Slave fiber port that is configured
(or to be configured).
commit d047a9a0293f7c319e5c999dce8a72b254adb878
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Mar 13 13:13:58 2014 -0400
tiLib.c
- Fix bug where global variable tiFiberLatencyMeasurement was
providing roundtrip time, instead of one way time.
commit a4757e1505c4427bdeb4eda8c1089410753875ab
Author: Bryan Moffit <moffit at jlab.org>
Date: Tue Mar 11 21:09:27 2014 -0400
tiLib.{c,h}
- Add routine to reset MGT
commit 290af390c25ede3dd5e05bb5b939f92e7810d874
Author: Bryan Moffit <moffit at jlab.org>
Date: Fri Mar 7 15:04:32 2014 -0500
tiLib.c
- Perform a Trigger Link Reset during initialization, if a TI master.
commit 3c92d49a26504e1a693ff75fad6d9c7b8b0bd463
Author: Bryan Moffit <moffit at jlab.org>
Date: Wed Mar 5 09:54:48 2014 -0500
tiLib.c
- Add tiAddSlaveMask(..) to provide capability of enabling several
TI-Slaves with one routine.
commit d68e278661b91867384533ca273339e72b6c3e3f
Author: Bryan Moffit <moffit at jlab.org>
Date: Fri Feb 28 13:09:09 2014 -0500
tiLib.{c,h}
- Make sure trigger fiber measurement is done with the correct
selected fiber port (1 or 5)
- Provide routine to return the measured fiber latency
- Fix bug in masks used in the fiberlatencymeasurement register
commit dac38715971856bc53b82f354f24f1a682c9a89f
Author: Bryan Moffit <moffit at jlab.org>
Date: Wed Feb 26 16:43:43 2014 -0500
tiLib.{c,h}
- Provide means for having a TI Slave using Fiber Port 5 as
clock, trigger, sync source.
- - Requires either a call to
tiSetFiberIn_preInit(..)
or Using a iFlag bit & (1<<1) in
tiInit
commit 2f7984b55037f936eaeada884ac627ea7421bd2c
Author: Bryan Moffit <moffit at jlab.org>
Date: Wed Feb 26 15:13:25 2014 -0500
Supported Firmware v18.1
firmware/.currentfw
firmware/ti181.svf
firmware/ti_current_firmware.svf
tiLib.h
- Update files for firmware version 18.1
commit 4f774434feb8bd3e9473442a9138d449de9e06f1
Merge: d6fe5d8 cac1348
Author: Bryan Moffit <moffit at jlab.org>
Date: Wed Feb 26 11:10:37 2014 -0500
Merge branch 'feature-v17.2' into release-coda3.1
commit cac134827b4930ebc7ae6f0f81d1ea8f6813853a
Author: Bryan Moffit <moffit at jlab.org>
Date: Mon Feb 24 15:57:47 2014 -0500
tiLib.c
- Fix bug in tiSetRandomTrigger. Wrong scale factor applied
in some instances.
commit 6d207c62174ff268dbb5bebc06b1bd10d430a762
Author: Bryan Moffit <moffit at jlab.org>
Date: Fri Feb 21 17:07:58 2014 -0500
tiLib.c
- Fix bug in tiGetCrateID and tiGetPortTrigSrcEnabled..
Was returning the wrong info based on port number.
commit 3fdb11993d5dafa6017b10a3c22996ecf5ce734e
Author: Bryan Moffit <moffit at jlab.org>
Date: Fri Feb 21 09:22:15 2014 -0500
tiLib.{c,h}
- Add a couple pre Initialization routines to set default values before
running tiInit
tiSetFiberLatencyOffset_preInit(int flo)
tiSetCrateID_preInit(int cid)
- Fix bug in tiSlaveStatus. Get last blockStatus from adr24 reg
- Fix bug in tiBlockStatus. Get last blockStatus from adr24 reg
- Add option register print out in tiSlaveStatus
commit 9ea9716aaab091abc44435e6020e28bd461ec638
Author: Bryan Moffit <moffit at jlab.org>
Date: Wed Feb 19 17:36:01 2014 -0500
tiFirmwareUpdate.c
- Quiet some of the output to make the Firmware Update fit on much
fewer lines.
commit 28ed0c976f8f230e49e804289c1e36485d679b0c
Author: Bryan Moffit <moffit at jlab.org>
Date: Fri Feb 14 12:53:31 2014 -0500
tiLib.{c,h}
- Add routine tiSlaveStatus that displays currently configured
tiSlaves and Master Loopback status.
- Fixed bug in size of some blank arrays in register structure
commit c4a8f55c1a345bbe7384cd96c19efbe006d3ecb0
Author: Bryan Moffit <moffit at jlab.org>
Date: Fri Feb 14 10:19:07 2014 -0500
Supported Firmware Version 17.2
tiLib.{c,h}
- Add new registers:
- - ts_scaler[6] - TS Input scalers
- - *_tiID - Crate ID, trig sources enabled
- Add routine to support readout of TS Input scalers
- Add routines to support getting the Crate ID and TrigSrc enabled
of connected TI Slaves (and self)
-----------------------------------------------------------------------
Summary of changes:
firmware/.currentfw | 2 +-
firmware/{ti153.svf => ti181.svf} |100000 ++++++++++++++++++------------------
firmware/ti_current_firmware.svf | 1 +
tiLib.c | 454 +-
tiLib.h | 12 +-
5 files changed, 50454 insertions(+), 50015 deletions(-)
copy firmware/{ti153.svf => ti181.svf} (94%)
create mode 120000 firmware/ti_current_firmware.svf
hooks/post-receive
--
driver/ti
More information about the Daq-drivers
mailing list