[DAQ-drivers] driver/ti branch, devel, updated. v20.3-20-g356a1c2

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

The branch, devel has been updated
       via  356a1c258c93d1157d2c9b007972d48384ba9f9c (commit)
       via  24993acce4a12b79a53422d9fdfcd69703d54869 (commit)
       via  114b012285fc48ca84d5e81be6215ca9fd1513f9 (commit)
       via  d35f8d493e3cdeed6fb57ffed3569291651e2837 (commit)
       via  6ceff0a181ffe2060af05ff2ab543dd6aea566d5 (commit)
       via  7153abb8ced980b06d6cbb3d906bc3a4e65f3d5c (commit)
       via  ab262307b4fd87594dafdfa63e6f5bbcc36d1b2a (commit)
      from  02d21b27755856530ffb1f01e999c2cc6f474ed9 (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 356a1c258c93d1157d2c9b007972d48384ba9f9c
Merge: 02d21b2 24993ac
Author: Bryan Moffit <moffit at jlab.org>
Date:   Tue Sep 2 14:32:31 2014 -0400

    Merge branch 'feature-modTI' into devel

commit 24993acce4a12b79a53422d9fdfcd69703d54869
Author: Bryan Moffit <moffit at jlab.org>
Date:   Tue Sep 2 14:30:39 2014 -0400

    Add in support for fixed SyncReset width of 4 microseconds.
    
    tiLib.{c,h}
     - New routine (that should be set before tiSyncReset is called)
       int tiSetSyncResetType(int type)
     - New global variable tiSyncResetType to keep track of what to use.

commit 114b012285fc48ca84d5e81be6215ca9fd1513f9
Author: Bryan Moffit <moffit at jlab.org>
Date:   Tue Sep 2 14:09:18 2014 -0400

    Supported Firmware Version Type 2 v3.2
    
    mti32.svf
     - Updated firmware file
    
    tiLib.{c,h}
     - Updated register map and mask/bit definitions
    
     - New SyncReset type:
       #define TI_SYNCCOMMAND_SYNCRESET_4US       0xEE
    
     - New routines to support prompt trigger output (OT#2)
       int tiSetPromptTriggerWidth(int width)
       int tiGetPromptTriggerWidth()
    
     - Routines to change trigger coincidence & inhibit window:
       int tiSetTriggerWindow(int window_width)
       int tiGetTriggerWindow()
       int tiSetTriggerInhibitWindow(int window_width)
       int tiGetTriggerInhibitWindow()

commit d35f8d493e3cdeed6fb57ffed3569291651e2837
Merge: 6ceff0a 02d21b2
Author: Bryan Moffit <moffit at jlab.org>
Date:   Tue Sep 2 09:46:41 2014 -0400

    Merge branch 'devel' into feature-modTI
    
    Fixed conflicts in
    	tiLib.c
    	tiLib.h

commit 6ceff0a181ffe2060af05ff2ab543dd6aea566d5
Author: Bryan Moffit <moffit at jlab.org>
Date:   Thu Jun 12 11:22:32 2014 -0400

    Support switching of the maximum number of VME slots in the crate by determining if the
    ti is in a VXS crate.
    
    tiLib.c
     - tiInit: Determine if the TI is in a VXS crate and use its slot ID to switch the
        maximum number of VME slots in the crate.

commit 7153abb8ced980b06d6cbb3d906bc3a4e65f3d5c
Author: Bryan Moffit <moffit at jlab.org>
Date:   Fri Jun 6 15:56:11 2014 -0400

    Change to register map for introductory support of modular TI Firmware.
    
    tiLib.{c,h}
     - new register at offset 0xEC (rocEnable).
       macros added for bits and masks
     - new routines
       tiRocEnable(int roc)
       tiRocEnableMask(int rocmask)
       tiGetRocEnableMask()

commit ab262307b4fd87594dafdfa63e6f5bbcc36d1b2a
Author: Bryan Moffit <moffit at jlab.org>
Date:   Thu Jun 5 14:14:29 2014 -0400

    Supported modTI Firmware 1.3
    
    tiLib.{c,h}
     - Support modTI firmware 1.3
     - tiInit:
       Build in support for handling type 1 and type 2 firmwares.
    
    Include modTI firmware version 1.3

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

Summary of changes:
 firmware/{ti203.svf => mti32.svf} |98654 ++++++++++++++++++------------------
 test/tiGetStatus.c                |   71 +-
 tiLib.c                           |  299 +-
 tiLib.h                           |   50 +-
 4 files changed, 49693 insertions(+), 49381 deletions(-)
 copy firmware/{ti203.svf => mti32.svf} (91%)


hooks/post-receive
-- 
driver/ti