[DAQ-drivers] driver/f1tdc branch, v2.v3-devel, updated. v2.10-v3.17-5-g320c434

[Bryan Moffit]

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/f1tdc".

The branch, v2.v3-devel has been updated
       via  320c4347b30a35e84d15f06dddc93c59e5d5232c (commit)
       via  7d2868d7f216168ee5cee61d8b405430936e594c (commit)
       via  aeab00f9e1fb2aeeeb0025d18c78e206d084f068 (commit)
       via  721ada59e148d523076b42a32e04956bed6a5126 (commit)
       via  9512d08fa85dd4b159862ddc56292e2dcf20f29c (commit)
      from  816d0ddfff7827964420d455c29beb077dd80371 (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 320c4347b30a35e84d15f06dddc93c59e5d5232c
Merge: 816d0dd 7d2868d
Author: Bryan Moffit <moffit at jlab.org>
Date:   Fri Nov 7 14:21:16 2014 -0500

    Merge branch 'release-2.10-3.17' into v2.v3-devel

commit 7d2868d7f216168ee5cee61d8b405430936e594c
Author: Bryan Moffit <moffit at jlab.org>
Date:   Fri Nov 7 14:18:05 2014 -0500

    Determine firmware file version type from filename (yuck).  Compare to
    version of modules before updating.
    
    f1FirmwareUpdate.c
    f1GFirmwareUpdate.c
      - Determine firmware file version type from filename... compare it to the
        version(s) of the modules to update.  Fail if not consistent.
      - Lock VME Bus Mutex around firmware updating.

commit aeab00f9e1fb2aeeeb0025d18c78e206d084f068
Author: Bryan Moffit <moffit at jlab.org>
Date:   Fri Nov 7 14:06:40 2014 -0500

    Change ERRORs to WARNs when looping through list to find f1TDCs.
    
    f1tdcLib.c
     - f1Init
      Changed ERRORs to WARNs in standard out, when not finding a module at an
      address.

commit 721ada59e148d523076b42a32e04956bed6a5126
Author: Bryan Moffit <moffit at jlab.org>
Date:   Fri Nov 7 13:49:26 2014 -0500

    Fix bug where some functions were not correctly identifying the version of the f1TDC module (V2 vs V3).
    
    f1tdcLib.c
      - Fixed bit shifting to determine V2 or V3 version in routines:
    	f1SetConfig
    	f1GStatus
    	f1SetChannel
    	f1SetChannelMask
    	f1DataDecode
         For the most part, this bug only caused problems when channels were masked, or
         in the standard output messages.

commit 9512d08fa85dd4b159862ddc56292e2dcf20f29c
Author: Bryan Moffit <moffit at jlab.org>
Date:   Fri Nov 7 13:25:27 2014 -0500

    And VME mutex lock/unlock around firmware updates.

-----------------------------------------------------------------------

Summary of changes:
 f1tdcLib.c                   |   16 +++++-----
 firmware/f1FirmwareUpdate.c  |   54 ++++++++++++++++++++++++++++---
 firmware/f1GFirmwareUpdate.c |   70 +++++++++++++++++++++++++++++++++++++----
 3 files changed, 119 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
driver/f1tdc