[DAQ-drivers] driver/ctp branch, devel, updated. 0003-15-gf6b3dea

[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/ctp".

The branch, devel has been updated
       via  f6b3dea228e28fcb08aa7e240303ca16165fcc42 (commit)
       via  fdac1c7d874b2adbb018da27ba1fe20ae0e107f4 (commit)
       via  e48cb96031eb9061c647e1e28320866b750aa5bd (commit)
       via  76a1f299f2e7d1e3fd250bb9d800a7d28e90004f (commit)
       via  508faebac9213ebd05a6bee0261b1ff4609ffd79 (commit)
       via  296941ccc081a4a0dcb5c48cdfbb1859cfa0d471 (commit)
       via  1eaca11fe183b9170fdac53c3111f40eda628592 (commit)
       via  fd0ba3a7185bbad2204eaa49701ebb3498897d23 (commit)
       via  dbe6d92515e3dfae5be891d9eb6f652dd167d454 (commit)
      from  a45b46100e80b1585f0ac7d6a0f2ac798cd5ad6e (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 f6b3dea228e28fcb08aa7e240303ca16165fcc42
Merge: a45b461 fdac1c7
Author: Bryan Moffit <moffit at jlab.org>
Date:   Mon Mar 31 13:25:50 2014 -0400

    Merge branch 'release-coda3.1' into devel

commit fdac1c7d874b2adbb018da27ba1fe20ae0e107f4
Merge: dbe6d92 e48cb96
Author: Bryan Moffit <moffit at jlab.org>
Date:   Mon Mar 31 13:25:16 2014 -0400

    Merge branch 'update-bcal' into release-coda3.1

commit e48cb96031eb9061c647e1e28320866b750aa5bd
Author: Bryan Moffit <moffit at jlab.org>
Date:   Mon Mar 31 13:23:21 2014 -0400

    Updated firmware MCS files for version 4.

commit 76a1f299f2e7d1e3fd250bb9d800a7d28e90004f
Author: Bryan Moffit <moffit at jlab.org>
Date:   Mon Mar 31 13:20:06 2014 -0400

    ctpLib.{c,h}
     - Better handling of supported firmware... especially with different
       combinations of u24 firmware.
     - Skip checking of initial firmware write to SRAM during firmware
       update

commit 508faebac9213ebd05a6bee0261b1ff4609ffd79
Author: Bryan Moffit <moffit at jlab.org>
Date:   Fri Mar 28 15:57:21 2014 -0400

    firmware/BCAL_CTPV2_FX100T_U24_TOP_ver0600.mcs
     - Update firmware file with firmware bug fixes.

commit 296941ccc081a4a0dcb5c48cdfbb1859cfa0d471
Author: Bryan Moffit <moffit at jlab.org>
Date:   Mon Mar 24 14:48:12 2014 -0400

    ctpLib.c
     - Add FPGA names to ERROR/WARN on Firmware version mismatches
     - Bug: FPGA versions weren't shifted to check against project numbers
       for BCAL routines

commit 1eaca11fe183b9170fdac53c3111f40eda628592
Author: Bryan Moffit <moffit at jlab.org>
Date:   Thu Mar 20 16:28:34 2014 -0400

    ctpLib.c
     - Fix bug in display of up and down lanes of payload ports/vmeslots
     - #ifdef out the down states... redundant info
     - Begin showing vme slots at slot 2 (to support 20 slot crates)
     - Use jvme routine instead of going through bits for vmeslot
       to payload port converstion

commit fd0ba3a7185bbad2204eaa49701ebb3498897d23
Author: Bryan Moffit <moffit at jlab.org>
Date:   Thu Mar 20 14:56:02 2014 -0400

    Added Support for U24 Firmware 0x0600
    
    ctpLib.{c,h}
     - Some firmware updating routine changes for better display of update
     - Fix for new project/version scheme in bits of status2 of u24
     - Remove static function that turned payload port arrays into vme slot
       arrays
     - Use masks instead of arrays in ctpStatus
     - Add routine to get the firmware version of specified FPGA
     - BCAL routines added:
     - - ctpSetFPInputMask
     - - ctpGetFPInputMask
     - - ctpSetBCALWindowWidth
     - - ctpGetBCALWindowWidth
     - - ctpSetBCALThreshold
     - - ctpGetBCALThreshold
    
    firmware/ctpFirmwareUpdate.c
     - better display of update procedure

commit dbe6d92515e3dfae5be891d9eb6f652dd167d454
Author: Bryan Moffit <moffit at jlab.org>
Date:   Fri Mar 14 14:32:00 2014 -0400

    firmware/BCAL_CTPV2_FX100T_U24_TOP_ver0600.mcs
     - New firmware to support BCAL cosmics
    
    ctpLib.{c,h}
     - Update to U24 register map for ver0600
     - Add routines to support CrateID sent to SSP

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

Summary of changes:
 ctpLib.c                                           |  580 +-
 ctpLib.h                                           |   45 +-
 firmware/.currentfw                                |    6 +-
 ...3.mcs => BCAL_CTPV2_FX100T_U24_TOP_ver0600.mcs} |615616 ++++++++++----------
 ...ver403.mcs => CTPV2_FX100T_U24_TOP_ver0404.mcs} |615616 ++++++++++----------
 ..._ver0103.mcs => CTPV2_FX70T_U1_TOP_ver0104.mcs} |422376 +++++++-------
 ..._ver0303.mcs => CTPV2_FX70T_U3_TOP_ver0304.mcs} |422376 +++++++-------
 firmware/ctpFirmwareUpdate.c                       |   26 +-
 test/ctpLibTest.c                                  |    6 +-
 9 files changed, 1038528 insertions(+), 1038119 deletions(-)
 copy firmware/{CTPV2_FX100T_U24_TOP_ver403.mcs => BCAL_CTPV2_FX100T_U24_TOP_ver0600.mcs} (81%)
 rename firmware/{CTPV2_FX100T_U24_TOP_ver403.mcs => CTPV2_FX100T_U24_TOP_ver0404.mcs} (83%)
 rename firmware/{CTPV2_FX70T_U1_TOP_ver0103.mcs => CTPV2_FX70T_U1_TOP_ver0104.mcs} (80%)
 rename firmware/{CTPV2_FX70T_U3_TOP_ver0303.mcs => CTPV2_FX70T_U3_TOP_ver0304.mcs} (80%)


hooks/post-receive
-- 
driver/ctp