Menu
▾
▴
[Nscldaq-cvscommits] dashdaq/camac Asserts.h, 1.1, 1.2 CBiRA1302CES8210.cpp, 1.1, 1.2 CCESCBD8210.cpp, 1.2, 1.3 CCESCBD8210.h, 1.1, 1.2 Makefile.am, 1.6, 1.7 TestFake.cpp, 1.3, 1.4
|
From: Ron F. <ro...@us...> - 2006-06-27 19:55:01
|
Update of /cvsroot/nscldaq/dashdaq/camac In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28517/camac Modified Files: Asserts.h CBiRA1302CES8210.cpp CCESCBD8210.cpp CCESCBD8210.h Makefile.am TestFake.cpp Log Message: Test CCESCBD8210 class. Index: CCESCBD8210.cpp =================================================================== RCS file: /cvsroot/nscldaq/dashdaq/camac/CCESCBD8210.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CCESCBD8210.cpp 27 Jun 2006 18:15:51 -0000 1.2 --- CCESCBD8210.cpp 27 Jun 2006 19:54:57 -0000 1.3 *************** *** 36,41 **** static const int MAXBRANCH(7); static const long BRANCH0 (0x800000); ! static const long BRANCHSIZE(0x100000); ! static const long CRATESIZE (0x020000); static const unsigned long SLOTSHIFT(11); --- 36,41 ---- static const int MAXBRANCH(7); static const long BRANCH0 (0x800000); ! static const long BRANCHSIZE(0x080000); ! static const long CRATESIZE (0x010000); static const unsigned long SLOTSHIFT(11); *************** *** 157,161 **** { unsigned long address = offset(BZ.slot, BZ.function, BZ.subaddress); ! m_pRegisters->pokew(address, 0); } /*! --- 157,161 ---- { unsigned long address = offset(BZ.slot, BZ.function, BZ.subaddress); ! m_pRegisters->pokew(address/sizeof(short), 0); } /*! *************** *** 166,170 **** { unsigned long csrloc = offset(CSR.slot, CSR.function, CSR.subaddress); ! return m_pRegisters->peekw(csrloc); } /*! --- 166,170 ---- { unsigned long csrloc = offset(CSR.slot, CSR.function, CSR.subaddress); ! return m_pRegisters->peekw(csrloc/sizeof(short)); } /*! *************** *** 178,182 **** { unsigned address = offset(CSR.slot, CSR.function, CSR.subaddress); ! m_pRegisters->pokew(address, datum); } /*! --- 178,182 ---- { unsigned address = offset(CSR.slot, CSR.function, CSR.subaddress); ! m_pRegisters->pokew(address/sizeof(short), datum); } /*! *************** *** 199,213 **** } - /*! - - Read the interrupt flag register. - - */ - unsigned short - CCESCBD8210::readITF() - { - unsigned long address = offset(ITF.slot, ITF.function, ITF.subaddress); - return m_pRegisters->peekw(address); - } /*! Write the interrupt flag register (this is needed to clear the IT2/IT4 bits). --- 199,202 ---- *************** *** 217,221 **** { unsigned long address = offset(ITF.slot, ITF.function, ITF.subaddress); ! m_pRegisters->pokew(address, datum); } --- 206,210 ---- { unsigned long address = offset(ITF.slot, ITF.function, ITF.subaddress); ! m_pRegisters->pokew(address/sizeof(short), datum); } *************** *** 228,232 **** { unsigned long address = offset(BTB.slot, BTB.function, BTB.subaddress); ! return m_pRegisters->peekw(address); } --- 217,221 ---- { unsigned long address = offset(BTB.slot, BTB.function, BTB.subaddress); ! return m_pRegisters->peekw(address/sizeof(short)); } Index: TestFake.cpp =================================================================== RCS file: /cvsroot/nscldaq/dashdaq/camac/TestFake.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestFake.cpp 27 Jun 2006 14:41:33 -0000 1.3 --- TestFake.cpp 27 Jun 2006 19:54:57 -0000 1.4 *************** *** 9,12 **** --- 9,13 ---- #include <string> + using namespace std; Index: CCESCBD8210.h =================================================================== RCS file: /cvsroot/nscldaq/dashdaq/camac/CCESCBD8210.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CCESCBD8210.h 27 Jun 2006 14:41:33 -0000 1.1 --- CCESCBD8210.h 27 Jun 2006 19:54:57 -0000 1.2 *************** *** 74,78 **** - unsigned short readITF(); void writeITF(unsigned short datum); --- 74,77 ---- Index: Makefile.am =================================================================== RCS file: /cvsroot/nscldaq/dashdaq/camac/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 27 Jun 2006 14:41:33 -0000 1.6 --- Makefile.am 27 Jun 2006 19:54:57 -0000 1.7 *************** *** 38,42 **** FACTORYTESTS = FactoryTest.cpp ! CAMACTESTS = subsystemTests.cpp TESTS = $(TESTHARNESS) $(FACTORYTESTS) $(CAMACTESTS) --- 38,42 ---- FACTORYTESTS = FactoryTest.cpp ! CAMACTESTS = subsystemTests.cpp ces8210Tests.cpp TESTS = $(TESTHARNESS) $(FACTORYTESTS) $(CAMACTESTS) Index: CBiRA1302CES8210.cpp =================================================================== RCS file: /cvsroot/nscldaq/dashdaq/camac/CBiRA1302CES8210.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CBiRA1302CES8210.cpp 27 Jun 2006 14:41:33 -0000 1.1 --- CBiRA1302CES8210.cpp 27 Jun 2006 19:54:57 -0000 1.2 *************** *** 166,170 **** validateRead(slot, f, a); unsigned long addr = offset(slot, f, a, false); ! unsigned long data = m_pCrate->peekl(addr); return (data & 0xffffff); // Don't want to chance bits set in top 8 bits. } --- 166,176 ---- validateRead(slot, f, a); unsigned long addr = offset(slot, f, a, false); ! ! // Note the interface is d16: ! ! unsigned long data = m_pCrate->peekw(addr/sizeof(short)) ; ! data = (data << 16) | ! m_pCrate->peekw((addr+sizeof(short))/sizeof(short)); ! return (data & 0xffffff); // Don't want to chance bits set in top 8 bits. } *************** *** 178,182 **** validateRead(slot, f, a); unsigned long addr = offset(slot, f, a); ! return m_pCrate->peekw(addr); } /*! --- 184,188 ---- validateRead(slot, f, a); unsigned long addr = offset(slot, f, a); ! return m_pCrate->peekw(addr/sizeof(short)); } /*! *************** *** 192,196 **** validateWrite(slot, f, a); unsigned long addr = offset(slot, f, a, false); ! m_pCrate->pokel(addr, datum); } /*! --- 198,207 ---- validateWrite(slot, f, a); unsigned long addr = offset(slot, f, a, false); ! ! // Interface has a 16 bit data path!! ! ! m_pCrate->pokew(addr/sizeof(short), datum >> 16); ! m_pCrate->pokew(addr/sizeof(short)+1, datum & 0xffff); ! } /*! *************** *** 203,207 **** validateWrite(slot, f, a); unsigned long addr = offset(slot, f, a); ! m_pCrate->pokew(addr, datum); } /*! --- 214,218 ---- validateWrite(slot, f, a); unsigned long addr = offset(slot, f, a); ! m_pCrate->pokew(addr/sizeof(short), datum); } /*! *************** *** 216,220 **** unsigned long addr = offset(slot, f, a); ! m_pCrate->pokew(addr, 0); } --- 227,231 ---- unsigned long addr = offset(slot, f, a); ! m_pCrate->pokew(addr/sizeof(short), 0); } Index: Asserts.h =================================================================== RCS file: /cvsroot/nscldaq/dashdaq/camac/Asserts.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Asserts.h 6 Jun 2006 17:20:24 -0000 1.1 --- Asserts.h 27 Jun 2006 19:54:57 -0000 1.2 *************** *** 2,5 **** --- 2,8 ---- #define __ASSERTS_H + #include <iostream> + #include <string> + // Abbreviations for assertions in cppunit. *************** *** 23,26 **** --- 26,37 ---- } + class Warning { + + public: + Warning(std::string message) { + std::cerr << message << std::endl; + } + }; + #endif |