[DAQ-drivers] driver/ts branch, devel, updated. v8.3-16-g8e43b8e
Bryan Moffit
moffit at jlab.org
Fri Feb 21 11:22:02 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/ts".
The branch, devel has been updated
via 8e43b8eddaf7a7eb81df19b6eea17bf8bdba58b9 (commit)
via 47f01d4f21681be9adb396973fad329e85dec40b (commit)
via 97e9d84e5b1de9b095bc11c60389fd008b684462 (commit)
via 6310c8e76b42f600fc2eb580c9dbcfb116ebdeab (commit)
via 21ccf18bee20bd0ae724cdfcda446ce6ece27f3a (commit)
via 2f5f47100228dd7c66ab86250333faad6db0782e (commit)
via 22de779f92159c9cabab7a818e07e1362e14fb01 (commit)
via 82f5a2d8beb84d6315c595e57bb4c16f96b459bf (commit)
via a9f5207ebd0cfb8b5fd0a5ffeb499b24884a1643 (commit)
via 8a7e9c08e7b2c59ef2366aad5eff51865ae846ab (commit)
from e84892cb66dce32a98f5de2ae2734bbe9bd91585 (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 8e43b8eddaf7a7eb81df19b6eea17bf8bdba58b9
Merge: e84892c 47f01d4
Author: Bryan Moffit <moffit at jlab.org>
Date: Fri Feb 21 11:21:57 2014 -0500
Merge branch 'release-coda3.0' into devel
commit 47f01d4f21681be9adb396973fad329e85dec40b
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Feb 20 09:21:54 2014 -0500
tsFirmwareUpdate.c
- Quiet some of the output to make the Firmware Update fit on much
fewer lines.
commit 97e9d84e5b1de9b095bc11c60389fd008b684462
Author: Bryan Moffit <moffit at jlab.org>
Date: Mon Feb 17 14:30:15 2014 -0500
tsLib.{c,h}
- Add routine to allow for setting the default crateID prior to running tsInit
(so that we can avoid declaring extern variables in other programs)
commit 6310c8e76b42f600fc2eb580c9dbcfb116ebdeab
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Feb 13 16:31:51 2014 -0500
Makefile
- Do not install, by default.
commit 21ccf18bee20bd0ae724cdfcda446ce6ece27f3a
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Feb 13 11:25:34 2014 -0500
tsLib.c
- in tsFind, start scan from slot 21, then go from 2 to 20.
- Remove a debug printf from tsBroadcastBlockLevel
commit 2f5f47100228dd7c66ab86250333faad6db0782e
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Feb 13 09:49:52 2014 -0500
tsLib.{c,h}
- More consistent implementation of blocklevel.
- - tsBlockLevel for current block level,
tsNextBlockLevel for next block level to be set when either:
- Right after a call to tsSyncReset(1)
- At a Sync Event
commit 22de779f92159c9cabab7a818e07e1362e14fb01
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Jan 23 13:00:41 2014 -0500
tsLib.h
- Macros for tsSetTriggerSource arguments
commit 82f5a2d8beb84d6315c595e57bb4c16f96b459bf
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Jan 23 12:39:29 2014 -0500
tsLib.{c,h}
- Set default event format to that expected by CODA 3.x
- Show both states of Bus Errors in tsStatus
- Allow crate ID to be 0
- Automatically set bus error depending on block level in
tiGetCurrentBlockLevel()
- Change definitions of argument to tsSetEventFormat to reflect
current firmware
- Automatically set the correct Bus Error behavior in tsReadBlock
- Properly handle block header behavior when using programmed IO
in tsReadBlock
- Remove 2 arguments in tsReadTriggerBlock. They will be automatically
set depending on current block level.
commit a9f5207ebd0cfb8b5fd0a5ffeb499b24884a1643
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Jan 16 15:04:23 2014 -0500
firmware/Makefile
- Add ts prefix to softlink name
commit 8a7e9c08e7b2c59ef2366aad5eff51865ae846ab
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Jan 16 14:14:06 2014 -0500
firmware/Makefile
- Add recipe for installing firmware files in linuxvme directory
structure
- Replace cp's with install's
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
firmware/.currentfw | 1 +
firmware/Makefile | 17 +++-
firmware/tsFirmwareUpdate.c | 75 +++++++++++++++--
test/tsLibTest.c | 37 ++++++--
tsLib.c | 196 +++++++++++++++++++++++++++++++++++--------
tsLib.h | 19 +++--
7 files changed, 283 insertions(+), 64 deletions(-)
create mode 100644 firmware/.currentfw
hooks/post-receive
--
driver/ts
More information about the Daq-drivers
mailing list