[DAQ-drivers] driver/jvme branch, devel, updated. v1.2-4-gfbd0e6b

Bryan Moffit moffit at jlab.org
Tue Jul 28 14:20:35 EDT 2015


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

The branch, devel has been updated
       via  fbd0e6b24d68270e3167ddd1af252abd569f8e31 (commit)
       via  ee5bf527cd43c09c67614acd16ad43496fab0645 (commit)
       via  7b3b55c7dc2f41cca49f7de4fdc19c8549fc0b12 (commit)
       via  4e0fd48a141d1f5120a129d4a9c0912bbd0f09d3 (commit)
      from  0ee11716c2547c60b6efab701997ab99d382b3a5 (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 fbd0e6b24d68270e3167ddd1af252abd569f8e31
Merge: 0ee1171 ee5bf52
Author: Bryan Moffit <moffit at jlab.org>
Date:   Tue Jul 28 14:18:26 2015 -0400

    Merge branch 'feature-vmeBus_routines' into devel

commit ee5bf527cd43c09c67614acd16ad43496fab0645
Author: Bryan Moffit <moffit at jlab.org>
Date:   Tue Jul 28 14:17:22 2015 -0400

    Small fix to structure to 8-byte align partition.

commit 7b3b55c7dc2f41cca49f7de4fdc19c8549fc0b12
Author: Bryan Moffit <moffit at jlab.org>
Date:   Thu Jul 23 16:41:46 2015 -0400

    Provide capability of changing the default width of A32Blt Window.
    Change vmeBusRead*/vmeBusWrite* routines to use gefVmeRead*/gefVmeWrite* routines.
    
    jlabgef.{c,h}
     - new routines to perform vme reads and writes without requiring the vme
       address to fall within the standard windows.
    	unsigned int jlabgefVmeRead32(int amcode, unsigned int addr);
    	unsigned short jlabgefVmeRead16(int amcode, unsigned int addr);
    	unsigned char jlabgefVmeRead8(int amcode, unsigned int addr);
    	void jlabgefVmeWrite32(int amcode, unsigned int addr, unsigned int wval);
    	void jlabgefVmeWrite16(int amcode, unsigned int addr, unsigned short wval);
    	void jlabgefVmeWrite8(int amcode, unsigned int addr, unsigned char wval);
     - provide capability to change size of default a32blt window..
     - better handling of closing default windows when the were not opened properly
    
    jvme.{c,h}
     - Change vmeBusRead/vmeBusWrite routines to use the jlabgef equivs

commit 4e0fd48a141d1f5120a129d4a9c0912bbd0f09d3
Author: Bryan Moffit <moffit at jlab.org>
Date:   Wed Mar 18 16:32:00 2015 -0400

    Addition of read/write routines with VME Bus address as input, instead of local address.
    
    jvme.{c,h}
     - New VME Bus Read/Write routines:
    	unsigned char  vmeBusRead8(int amcode, unsigned int vmeaddr);
    	unsigned short vmeBusRead16(int amcode, unsigned int vmeaddr);
    	unsigned int   vmeBusRead32(int amcode, unsigned int vmeaddr);
    	void vmeBusWrite8(int amcode, unsigned int vmeaddr, unsigned char val);
    	void vmeBusWrite16(int amcode, unsigned int vmeaddr, unsigned short val);
    	void vmeBusWrite32(int amcode, unsigned int vmeaddr, unsigned int val);

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

Summary of changes:
 dmaPList.h      |   2 +-
 jlabgef.c       | 375 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 jlabgef.h       |   6 +
 jvme.c          |  61 ++++++++-
 jvme.h          |   8 ++
 test/jvmeTest.c |  24 +++-
 6 files changed, 430 insertions(+), 46 deletions(-)


hooks/post-receive
-- 
driver/jvme


More information about the Daq-drivers mailing list