correct git error

evgMrmApp/Db/Makefile

@@ -26,7 +26,6 @@ DB += evgAcTrig.db
 DB += evgInput.db
 DB += evgOutput.db
 DB += evgSoftSeq.db
-DB += evgSoftSeq.template
 DB += evm-fct.template
 DB += cpci-evg-300.db
 DB += vme-evg230.db

evgMrmApp/Db/evgInput.db

@@ -18,15 +18,3 @@ record(bi, "$(P)EnaIrq-RB") {
     field( ZNAM, "Disabled")
     field( ONAM, "Enabled")
 }
-
-record(ao, "$(P)FPMask-Sel") {
-    field( DESC, "FPxMask")
-    field( DTYP, "Obj Prop uint32")
-    field( OUT , "@OBJ=$(OBJ), PROP=FPMASK")
-    field( FLNK, "$(P)FPMask-RB")
-}
-record(ai, "$(P)FPMask-RB") {
-    field( DESC, "FPxMask")
-    field( DTYP, "Obj Prop uint32")
-    field( INP , "@OBJ=$(OBJ), PROP=FPMASK")
-}

evgMrmApp/Db/evgTrigEvt.db

@@ -66,6 +66,7 @@ record(mbbo, "$(P)TrigSrc-Sel") {
     field( FLNK, "$(P)TrigSrc-MbbiDir_")
     info( autosaveFields_pass0, "VAL")
 }
+
 record(mbbiDirect, "$(P)TrigSrc-MbbiDir_") {
     field( DESC, "EVG Trig Evt Trig")
     field( INP,  "$(P)TrigSrc-Sel.RVAL")

evgMrmApp/src/Makefile

@@ -23,7 +23,7 @@ LIBRARY_IOC += evgmrm
 # INC += evgOutput.h
 # INC += mrmevgseq.h
 
-SRC_DIRS += ../devSupport
+SRC_DIRS += ../devSupport 
 
 #All the source files that are compiled and put in the library.
 evgmrm_SRCS += evgInit.cpp

evgMrmApp/src/evg.cpp

@@ -28,8 +28,6 @@ OBJECT_BEGIN(evgDbus) {
 
 OBJECT_BEGIN(evgInput) {
     OBJECT_PROP2("IRQ", &evgInput::getExtIrq, &evgInput::setExtIrq);
-    OBJECT_PROP2("FPMASK", &evgInput::getHwMask, &evgInput::setHwMask);
-    OBJECT_PROP1("FPMASK", &evgInput::stateChange);
 } OBJECT_END(evgInput)
 
 OBJECT_BEGIN(evgMxc) {

evgMrmApp/src/evgInit.cpp

@@ -133,7 +133,7 @@ evgShutdown(void*)
     mrf::Object::visitObjects(&disableIRQ,0);
 }
 
-static void
+static void 
 inithooks(initHookState state) {
     epicsUInt8 lvl;
     switch(state) {
@@ -225,7 +225,7 @@ mrmEvgSetupVME (
         printf("##### Setting up MRF EVG in VME Slot %d #####\n",slot);
         printf("Found Vendor: %08x\nBoard: %08x\nRevision: %08x\n",
                info.vendor, info.board, info.revision);
-
+        
         epicsUInt32 xxx = CSRRead32(csrCpuAddr + CSR_FN_ADER(1));
         if(xxx)
             printf("Warning: EVG not in power on state! (%08x)\n", xxx);
@@ -536,14 +536,6 @@ mrmEvgSetupPCI (
             delete evg;
             return -1;
         } else {
-            // By default the IRQPollers for EVRU/D are disabled.
-            // __IRQP_EVRU/D_PRD selects the polling perdiod [s] and enables the equivalent EVM embedded EVR.
-#ifdef __IRQP_EVRU_PRD
-            new IRQPoller(&EVRMRM::isr_poll, static_cast<void *>(evg->getEvruMrm()), __IRQP_EVRU_PRD);
-#endif
-#ifdef __IRQP_EVRD_PRD
-            new IRQPoller(&EVRMRM::isr_poll, static_cast<void *>(evg->getEvrdMrm()), __IRQP_EVRD_PRD);
-#endif
             printf("PCI interrupt connected!\n");
         }
 
@@ -570,7 +562,7 @@ static const iocshArg * const mrmEvgSetupVMEArgs[5] = { &mrmEvgSetupVMEArg0,
 static const iocshFuncDef mrmEvgSetupVMEFuncDef = { "mrmEvgSetupVME", 5,
                                                     mrmEvgSetupVMEArgs };
 
-static void
+static void 
 mrmEvgSetupVMECallFunc(const iocshArgBuf *args) {
     mrmEvgSetupVME(args[0].sval,
             args[1].ival,
@@ -758,15 +750,15 @@ reportCard(mrf::Object* obj, void* arg) {
     }
 
     evg->show(*level);
-
+    
     if(*level >= 2)
         printregisters(evg->getRegAddr());
 
     printf("\n");
     return true;
 }
 
-static long
+static long 
 report(int level) {
     printf("===  Begin MRF EVG support   ===\n");
     mrf::Object::visitObjects(&reportCard, (void*)&level);

evgMrmApp/src/evgInput.cpp

@@ -46,27 +46,6 @@ evgInput::getExtIrq() const {
     return  (nat_ioread32(m_pInReg) & (epicsUInt32)EVG_EXT_INP_IRQ_ENA) != 0;
 }
 
-epicsUInt32 evgInput::getHwMask() const
-{
-    epicsUInt32 val;
-
-    printf("HW Mask getter\n");
-    printf("Register sequencer : %u\n", nat_ioread32(m_pInReg));
-    val = (nat_ioread32(m_pInReg) & EVG_INP_FP_MASK) >> EVG_INP_FP_MASK_shift;
-    printf("Response sequencer : %u\n", val);
-    return val;
-}
-
-void evgInput::setHwMask(epicsUInt32 src)
-{
-
-    printf( ("HW Mask setter\n"));
-    epicsUInt32 inReg=nat_ioread32(m_pInReg) & ~(EVG_INP_FP_MASK);
-    nat_iowrite32(m_pInReg, inReg | (src<<EVG_INP_FP_MASK_shift));
-    scanIoRequest(changed);
-}
-
-
 void
 evgInput::setDbusMap(epicsUInt16 dbus, bool ena) {
     if(dbus > 7)

evgMrmApp/src/evgInput.h

@@ -7,7 +7,6 @@
 
 #include <epicsTypes.h>
 #include "mrf/object.h"
-#include <dbScan.h>
 
 enum InputType {
     NoneInp = 0,
@@ -32,9 +31,6 @@ class evgInput : public mrf::ObjectInst<evgInput> {
     void setExtIrq(bool);
     bool getExtIrq() const;
 
-    void setHwMask(epicsUInt32);
-    epicsUInt32 getHwMask() const;
-
     void setDbusMap(epicsUInt16, bool);
     bool getDbusMap(epicsUInt16) const;
 
@@ -44,14 +40,9 @@ class evgInput : public mrf::ObjectInst<evgInput> {
     void setTrigEvtMap(epicsUInt16, bool);
     bool getTrigEvtMap(epicsUInt16) const;
 
-    IOSCANPVT stateChange() const { return changed; }
-
-
 private:
     const epicsUInt32          m_num;
     const InputType            m_type;
     volatile epicsUInt8* const m_pInReg;
-    IOSCANPVT changed;
-
 };
 #endif //EVG_INPUT_H

evgMrmApp/src/evgMrm.h

@@ -41,9 +41,9 @@
 #include "drvem.h"
 
 /*********
- * Each EVG will be represented by the instance of class 'evgMrm'. Each evg
+ * Each EVG will be represented by the instance of class 'evgMrm'. Each evg 
  * object maintains a list to all the evg sub-componets i.e. Event clock,
- * Software Events, Trigger Events, Distributed bus, Multiplex Counters,
+ * Software Events, Trigger Events, Distributed bus, Multiplex Counters, 
  * Input, Output etc.
  */
 class wdTimer;
@@ -198,9 +198,6 @@ class evgMrm : public mrf::ObjectInst<evgMrm>,
     // EVM only
     mrf::auto_ptr<FCT> fct;
     mrf::auto_ptr<EVRMRM> evru, evrd;
-public:
-    EVRMRM* getEvruMrm() const { return evru.get(); } // EVRU MRM accessor
-    EVRMRM* getEvrdMrm() const { return evrd.get(); } // EVRD MRM accessor
 };
 
 #endif //EVG_MRM_H

evgMrmApp/src/evgMxc.cpp

@@ -63,8 +63,10 @@ evgMxc::getPrescaler() const {
 
 void
 evgMxc::setFrequency(epicsFloat64 freq) {
-    epicsFloat64 clkSpeed = m_owner->getFrequency() * pow(10.0, 6);
-    epicsUInt32 preScaler = (epicsUInt32)lround(clkSpeed / freq);
+    epicsUInt32 clkSpeed = (epicsUInt32)(getFrequency() *
+                            pow(10.0, 6));
+    epicsUInt32 preScaler = (epicsUInt32)((epicsFloat64)clkSpeed / freq);
+
     setPrescaler(preScaler);
 }
 
@@ -96,3 +98,4 @@ evgMxc::getTrigEvtMap(epicsUInt16 trigEvt) const {
     epicsUInt32    mask = 1 << (trigEvt+MuxControl_TrigMap_SHIFT);
     return READ32(m_pReg, MuxControl(m_id))&mask;
 }
+

evgMrmApp/src/evgRegMap.h

@@ -259,12 +259,6 @@
 #define  EVG_SEQ_RAM_SINGLE     0x00100000  // Single-Shot Mode: Disable on completion
 #define  EVG_SEQ_RAM_RECYCLE    0x00080000  // Continuous Mode: Repeat on completion
 
-//Mask registers
-#define  EVG_SEQ_RAM_SWMASK         0x0000F000  // Sequence RAM Software mask
-#define  EVG_SEQ_RAM_SWMASK_shift   12
-#define  EVG_SEQ_RAM_SWENABLE       0x00000F00  // Sequence RAM Software enable
-#define  EVG_SEQ_RAM_SWENABLE_shift 8
-
 /**************************************************************************************************/
 /* Control Register flags                                                                         */
 /**************************************************************************************************/
@@ -279,10 +273,6 @@
 /**************************************************************************************************/
 /* Input                                                                                          */
 /**************************************************************************************************/
-#define  EVG_INP_FP_ENA         0x0F000000
-#define  EVG_INP_FP_ENA_shift   24 
-#define  EVG_INP_FP_MASK        0xF0000000
-#define  EVG_INP_FP_MASK_shift  28
 
 #define  EVG_EXT_INP_IRQ_ENA    0x01000000
 

evrMrmApp/Db/Makefile

@@ -10,12 +10,8 @@ DB += mrmevrbase.template
 DB += mrmevrdc.template
 DB += mrmevrbufrx.db
 DB += mrmevrtsbuf.db
-DB += mrmevroutint.db
 DB += sequencedemo.db
 DB += mrmevrdlymodule.template
-DB += evrdcpulser.template
-DB += evrSoftSeq.template
-DB += evrSoftEvt.template
 
 DB += evr-pmc-230.db
 DB += evr-cpci-230.db
@@ -24,8 +20,6 @@ DB += evr-vmerf-230.db
 DB += evr-tg-300.db
 DB += evr-mtca-300.db
 DB += evr-pcie-300dc.db
-DB += evr-mtca-300rf.db
-DB += evr-mtca-300u.db
 
 ifdef BASE_3_15
 DB += evr-mtca-300u.db

mrmShared/Db/Makefile

@@ -6,7 +6,6 @@ include $(TOP)/configure/CONFIG
 DB += databuftx.db
 DB += databuftxCtrl.db
 DB += sfp.db
-DB += mrmSoftSeq.template
 
 include $(TOP)/configure/RULES
 #----------------------------------------

mrmShared/Db/mrmSoftSeq.template

@@ -60,43 +60,6 @@ record(mbbi, "$(P)TsResolution-RB") {
     field( UNSV, "INVALID")
 }
 
-record(waveform, "$(P)EvtEna-SP") {
-    field( DTYP, "Obj Prop waveform out")
-    field( DESC, "Sequence event enable array")
-    field( INP,  "@OBJ=$(EVG):SEQ$(seqNum), CLASS=SeqManager, PARENT=$(EVG):SEQMGR, PROP=ENA")
-    field( NELM, "$(NELM)")
-    field( FTVL, "UCHAR")
-    info( autosaveFields_pass1, "VAL")
-}
-
-record(waveform, "$(P)EvtEna-RB") {
-    field( DTYP, "Obj Prop waveform in")
-    field( DESC, "Sequence event enable readback")
-    field( INP,  "@OBJ=$(EVG):SEQ$(seqNum), CLASS=SeqManager, PARENT=$(EVG):SEQMGR, PROP=ENA")
-    field( SCAN, "I/O Intr")
-    field( NELM, "$(NELM)")
-    field( FTVL, "UCHAR")
-}
-
-
-record(waveform, "$(P)EvtMask-SP") {
-    field( DTYP, "Obj Prop waveform out")
-    field( DESC, "Sequence event mask array")
-    field( INP,  "@OBJ=$(EVG):SEQ$(seqNum), CLASS=SeqManager, PARENT=$(EVG):SEQMGR, PROP=MASK")
-    field( NELM, "$(NELM)")
-    field( FTVL, "UCHAR")
-    info( autosaveFields_pass1, "VAL")
-}
-
-record(waveform, "$(P)EvtMask-RB") {
-    field( DTYP, "Obj Prop waveform in")
-    field( DESC, "Sequence event mask readback")
-    field( INP,  "@OBJ=$(EVG):SEQ$(seqNum), CLASS=SeqManager, PARENT=$(EVG):SEQMGR, PROP=MASK")
-    field( SCAN, "I/O Intr")
-    field( NELM, "$(NELM)")
-    field( FTVL, "UCHAR")
-}
-
 record(waveform, "$(P)EvtCode-SP") {
     field( DTYP, "Obj Prop waveform out")
     field( DESC, "Sequence event code array")
@@ -115,33 +78,6 @@ record(waveform, "$(P)EvtCode-RB") {
     field( FTVL, "UCHAR")
 }
 
-record(mbbo, "$(P)SwMask-Sel") {
-
- field( DTYP, "Obj Prop uint32")
-    field( DESC, "Sequence RAM soft trigger")
-    field( OUT,  "@OBJ=$(EVG):SEQ$(seqNum), CLASS=SeqManager, PARENT=$(EVG):SEQMGR, PROP=SWMASK")
-}
-
-record(mbbi, "$(P)SwMask-RB") {
-    field( DTYP, "Obj Prop uint32")
-    field( DESC, "Sequence RAM soft trigger")
-    field( INP,  "@OBJ=$(EVG):SEQ$(seqNum), CLASS=SeqManager, PARENT=$(EVG):SEQMGR, PROP=SWMASK")
-    field( SCAN, "I/O Intr")
-}
-
-record(mbbo, "$(P)SwEna-Sel") {
-    field( DTYP, "Obj Prop uint32")
-    field( DESC, "Sequence RAM soft trigger")
-    field( OUT,  "@OBJ=$(EVG):SEQ$(seqNum), CLASS=SeqManager, PARENT=$(EVG):SEQMGR, PROP=SWENA")
-}
-
-record(mbbi, "$(P)SwEna-RB") {
-    field( DTYP, "Obj Prop uint32")
-    field( DESC, "Sequence RAM soft trigger")
-    field( INP,  "@OBJ=$(EVG):SEQ$(seqNum), CLASS=SeqManager, PARENT=$(EVG):SEQMGR, PROP=SWENA")
-    field( SCAN, "I/O Intr")
-}
-
 record(waveform, "$(P)Timestamp-SP") {
     field( DTYP, "Obj Prop waveform out")
     field( DESC, "Sequence timestamp array")