pfff

configure/RELEASE

@@ -37,8 +37,7 @@ TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
 ## Required Modules ##
 
 # PCI and VME64x support library
-DEVLIB2=/nix/store/i8b9n9qdv3v8rvpmabbq1aqispmg5s7a-devlib2-2.12
+#DEVLIB2=$(TOP)/../devlib2
 
 # EPICS_BASE usually appears last so other apps can override stuff:
-EPICS_BASE=/nix/store/3jdcplbpdj2177csm7nbw3prjlaq1bdn-epics-base-7.0.7
-
+#EPICS_BASE=/usr/lib/epics

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/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/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/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