[DAQ-drivers] driver/ti branch, devel, updated. v15.3-24-gd6fe5d8
Bryan Moffit
moffit at jlab.org
Fri Feb 21 11:15:48 EST 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 d6fe5d82bf9d5de776e6461d7d0eb30656b328ad (commit)
via d7967dc2cb0c56b4349eeab53f17205a1bb23059 (commit)
via 556a905a7c7bd906dc2c970424994c3e8e007a19 (commit)
via 39c05201951fb12df02d2481b9a7f0e56fca0737 (commit)
via 990c6097c08bf042f8d8fc36f1345bb49fbd3deb (commit)
via 73d5242504640501f829821590b8c3bf3969f9b2 (commit)
via 1f2d8eb81b75ddaf934baed8256f7876aebc261b (commit)
via ec1c74a1741a73faf09ed9ffb378568077b84a2f (commit)
via 0c177df7a736a8c941535a1a639940071d470ad5 (commit)
via 2cfbb6a1495205fbdccc9d01aee8136cca654adc (commit)
via 0644a921f07e6e2b2275414a7e4e25e13bc42b2a (commit)
via a19bac370e84ab28b15091b5ec980d1fd38e541b (commit)
via d611e02dc5c4178356c373978d68348d116c8484 (commit)
from 7ba7ee31b119bbf5a083663e39f3e3dedca13fea (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 d6fe5d82bf9d5de776e6461d7d0eb30656b328ad
Merge: 7ba7ee3 d7967dc
Author: Bryan Moffit <moffit at jlab.org>
Date: Fri Feb 21 11:15:32 2014 -0500
Merge branch 'release-coda3.0' into devel
commit d7967dc2cb0c56b4349eeab53f17205a1bb23059
Author: Bryan Moffit <moffit at jlab.org>
Date: Fri Feb 21 11:04:06 2014 -0500
Merge in some selections from feature-v17.2 that are still relevant
for current firmware version in this branch.
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 tiBlockStatus. Get last blockStatus from adr24 reg
tiFirmwareUpdate.c
- Quiet some of the output to make the Firmware Update fit on much
fewer lines.
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
commit 556a905a7c7bd906dc2c970424994c3e8e007a19
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Feb 13 11:26:26 2014 -0500
tiLib.c
- in tiFind, start scan from slot 21, then go from 2 to 20
commit 39c05201951fb12df02d2481b9a7f0e56fca0737
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Feb 13 10:27:31 2014 -0500
tiLib.{c,h}
- More consistent implementation of blocklevel.
- - tiBlockLevel for current block level,
tiNextBlockLevel for next block level to be set when either:
- Right after a call to tiSyncReset(1)
- At a Sync Event
commit 990c6097c08bf042f8d8fc36f1345bb49fbd3deb
Author: Bryan Moffit <moffit at jlab.org>
Date: Mon Feb 10 10:56:25 2014 -0500
tiLib.c
- Remove commented out lines from tiCheckAddresses()
- Wrong function name in tiSoftTrig error message
commit 73d5242504640501f829821590b8c3bf3969f9b2
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Jan 23 12:19:03 2014 -0500
tiLib.{c,h}
- Set the default Event Format to that expected by CODA 3.x
- Show if bus errors are disabled in tiStatus
- Do not set the library tiBlockLevel in tiSetBlockLevel
- Change in data format macros.. so changed the forced filler
when it's required to byte align.
- Automatically set the correct bus error behavior in
tiReadBlock
- Properly handle the end of a block when doing programmed IO in
tiReadBlock
- Change maximum words to expect in tiReadTriggerBlock to reflect
what is expected in CODA 3.x event format
commit 1f2d8eb81b75ddaf934baed8256f7876aebc261b
Author: Bryan Moffit <moffit at jlab.org>
Date: Tue Jan 21 16:02:17 2014 -0500
tiLib.{c,h}
- Add new static variable keeping track of current BusError status in
library set in tiEnableBusError and tiDisableBusError
- Automatically set enable state of Bus Error if blocklevel >2, and vice
versa when calling tiGetCurrentBlockLevel, tiReadBlock.
- Remove second and third arguments of tiReadTriggerBlock.. have them
automatically determined from current block level.
- Better use of macros to find block headers and trailers in
tiReadTriggerBlock
commit ec1c74a1741a73faf09ed9ffb378568077b84a2f
Author: Bryan Moffit <moffit at jlab.org>
Date: Fri Jan 17 16:03:57 2014 -0500
tiLib.{c,h}
- Modify dataformat register bits descriptions to match current firmware.
(higher 16 bits of timestamp and eventnumber instead of status word)
commit 0c177df7a736a8c941535a1a639940071d470ad5
Author: Bryan Moffit <moffit at jlab.org>
Date: Fri Jan 17 15:35:51 2014 -0500
tiLib.c
- Allow 0 as a valid crateID (ROCID)
commit 2cfbb6a1495205fbdccc9d01aee8136cca654adc
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Jan 16 15:02:13 2014 -0500
firmware/Makefile
- Add ti prefix to softlink name
commit 0644a921f07e6e2b2275414a7e4e25e13bc42b2a
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Jan 16 14:59:43 2014 -0500
firmware/Makefile
- Fix softlink name suffix.
commit a19bac370e84ab28b15091b5ec980d1fd38e541b
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Jan 16 14:03:37 2014 -0500
firmware/Makefile
- Fix bug in firmware installation directory name from sd to ti
commit d611e02dc5c4178356c373978d68348d116c8484
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Jan 16 14:00:49 2014 -0500
firmware/Makefile
- Add recipe for installing firmware files in linuxvme directory
structure
- Replace cp's with install's
-----------------------------------------------------------------------
Summary of changes:
firmware/.currentfw | 1 +
firmware/Makefile | 17 ++-
firmware/tiFirmwareUpdate.c | 51 ++++++-
test/tiGetStatus.c | 2 +-
test/tiLibTest.c | 28 +++-
tiLib.c | 359 +++++++++++++++++++++++++++++-------------
tiLib.h | 38 +++--
7 files changed, 358 insertions(+), 138 deletions(-)
create mode 100644 firmware/.currentfw
hooks/post-receive
--
driver/ti
More information about the Daq-drivers
mailing list