From f84d5a6d43d4eaf0b3186fcfb3e5dac506144aee Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Wed, 28 Nov 2007 17:52:47 +0000 Subject: [PATCH] Renaming NoMPF/WithMPF NoAsyn/WithAsyn. --- motorExApp/NoAsyn/Makefile | 40 ++++++++++++++-------------- motorExApp/NoAsyn/NoAsynMain.c | 2 +- motorExApp/NoAsyn/NoMPFInclude.dbd | 6 ----- motorExApp/NoAsyn/NoMPFMain.c | 21 --------------- motorExApp/NoAsyn/NoMPFVxInclude.dbd | 6 ----- 5 files changed, 21 insertions(+), 54 deletions(-) delete mode 100644 motorExApp/NoAsyn/NoMPFInclude.dbd delete mode 100644 motorExApp/NoAsyn/NoMPFMain.c delete mode 100644 motorExApp/NoAsyn/NoMPFVxInclude.dbd diff --git a/motorExApp/NoAsyn/Makefile b/motorExApp/NoAsyn/Makefile index 1e777bf7..202dff3e 100644 --- a/motorExApp/NoAsyn/Makefile +++ b/motorExApp/NoAsyn/Makefile @@ -5,31 +5,31 @@ include $(TOP)/configure/CONFIG # ADD MACRO DEFINITIONS AFTER THIS LINE #============================= -DBD += NoMPF.dbd -DBD += NoMPFVx.dbd +DBD += NoAsyn.dbd +DBD += NoAsynVx.dbd -PROD_IOC_DEFAULT = NoMPF -PROD_IOC_vxWorks = NoMPFVx +PROD_IOC_DEFAULT = NoAsyn +PROD_IOC_vxWorks = NoAsynVx -NoMPF_SRCS += NoMPF_registerRecordDeviceDriver.cpp -NoMPF_SRCS_DEFAULT += NoMPFMain.cpp -#!NoMPF_LIBS += MXmotor -#!NoMPF_LIBS += softMotor -#!NoMPF_LIBS += oms -NoMPF_LIBS += motor -NoMPF_LIBS += asyn -NoMPF_LIBS += $(EPICS_BASE_IOC_LIBS) +NoAsyn_SRCS += NoAsyn_registerRecordDeviceDriver.cpp +NoAsyn_SRCS_DEFAULT += NoAsynMain.cpp +#!NoAsyn_LIBS += MXmotor +#!NoAsyn_LIBS += softMotor +#!NoAsyn_LIBS += oms +NoAsyn_LIBS += motor +NoAsyn_LIBS += asyn +NoAsyn_LIBS += $(EPICS_BASE_IOC_LIBS) -NoMPFVx_SRCS += NoMPFVx_registerRecordDeviceDriver.cpp -#!NoMPFVx_LIBS += softMotor -#!NoMPFVx_LIBS += oms -#!NoMPFVx_LIBS += DeltaTau -NoMPFVx_LIBS += motor -NoMPFVx_LIBS += asyn +NoAsynVx_SRCS += NoAsynVx_registerRecordDeviceDriver.cpp +#!NoAsynVx_LIBS += softMotor +#!NoAsynVx_LIBS += oms +#!NoAsynVx_LIBS += DeltaTau +NoAsynVx_LIBS += motor +NoAsynVx_LIBS += asyn -NoMPFVx_OBJS += $(EPICS_BASE_BIN)/vxComLibrary -NoMPFVx_LIBS += $(EPICS_BASE_IOC_LIBS) +NoAsynVx_OBJS += $(EPICS_BASE_BIN)/vxComLibrary +NoAsynVx_LIBS += $(EPICS_BASE_IOC_LIBS) #=========================== diff --git a/motorExApp/NoAsyn/NoAsynMain.c b/motorExApp/NoAsyn/NoAsynMain.c index 9b873cc9..0de40d2b 100644 --- a/motorExApp/NoAsyn/NoAsynMain.c +++ b/motorExApp/NoAsyn/NoAsynMain.c @@ -1,4 +1,4 @@ -/* NoMPFMain.c */ +/* NoAsynMain.c */ /* Author: Ron Sluiter */ #include diff --git a/motorExApp/NoAsyn/NoMPFInclude.dbd b/motorExApp/NoAsyn/NoMPFInclude.dbd deleted file mode 100644 index b30d332a..00000000 --- a/motorExApp/NoAsyn/NoMPFInclude.dbd +++ /dev/null @@ -1,6 +0,0 @@ -include "base.dbd" -include "asyn.dbd" -include "motorSupport.dbd" -#!include "devSoftMotor.dbd" -#!include "devOms.dbd" -#!include "devMXmotor.dbd" diff --git a/motorExApp/NoAsyn/NoMPFMain.c b/motorExApp/NoAsyn/NoMPFMain.c deleted file mode 100644 index 9b873cc9..00000000 --- a/motorExApp/NoAsyn/NoMPFMain.c +++ /dev/null @@ -1,21 +0,0 @@ -/* NoMPFMain.c */ -/* Author: Ron Sluiter */ - -#include -#include -#include -#include -#include - -#include "epicsThread.h" -#include "iocsh.h" - -int main(int argc,char *argv[]) -{ - if(argc>=2) { - iocsh(argv[1]); - epicsThreadSleep(.2); - } - iocsh(NULL); - return(0); -} diff --git a/motorExApp/NoAsyn/NoMPFVxInclude.dbd b/motorExApp/NoAsyn/NoMPFVxInclude.dbd deleted file mode 100644 index 00a33324..00000000 --- a/motorExApp/NoAsyn/NoMPFVxInclude.dbd +++ /dev/null @@ -1,6 +0,0 @@ -include "base.dbd" -include "asyn.dbd" -include "motorSupport.dbd" -#!include "devOms.dbd" -#!include "devDeltaTau.dbd" -#!include "devSoftMotor.dbd"