From 1a6d3ce6fe262613ab4104cb92e19b6f4476c6a1 Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Wed, 28 Nov 2007 18:00:28 +0000 Subject: [PATCH] Renaming NoMPF/WithMPF NoAsyn/WithAsyn. --- motorExApp/WithAsyn/Makefile | 86 ++++++++++++------------ motorExApp/WithAsyn/WithAsynMain.c | 2 +- motorExApp/WithAsyn/WithMPFInclude.dbd | 15 ----- motorExApp/WithAsyn/WithMPFMain.c | 21 ------ motorExApp/WithAsyn/WithMPFVxInclude.dbd | 23 ------- 5 files changed, 44 insertions(+), 103 deletions(-) delete mode 100644 motorExApp/WithAsyn/WithMPFInclude.dbd delete mode 100644 motorExApp/WithAsyn/WithMPFMain.c delete mode 100644 motorExApp/WithAsyn/WithMPFVxInclude.dbd diff --git a/motorExApp/WithAsyn/Makefile b/motorExApp/WithAsyn/Makefile index 5fa5c1ac..1065155d 100644 --- a/motorExApp/WithAsyn/Makefile +++ b/motorExApp/WithAsyn/Makefile @@ -7,63 +7,63 @@ TOP = ../.. include $(TOP)/configure/CONFIG ifeq ($(OS_CLASS), vxWorks) -DBD += WithMPFVx.dbd +DBD += WithAsynVx.dbd endif -DBD += WithMPF.dbd +DBD += WithAsyn.dbd -PROD_IOC_DEFAULT = WithMPF -PROD_IOC_vxWorks = WithMPFVx +PROD_IOC_DEFAULT = WithAsyn +PROD_IOC_vxWorks = WithAsynVx -WithMPF_SRCS += WithMPF_registerRecordDeviceDriver.cpp -WithMPFVx_SRCS += WithMPFVx_registerRecordDeviceDriver.cpp -WithMPF_SRCS_DEFAULT += WithMPFMain.cpp +WithAsyn_SRCS += WithAsyn_registerRecordDeviceDriver.cpp +WithAsynVx_SRCS += WithAsynVx_registerRecordDeviceDriver.cpp +WithAsyn_SRCS_DEFAULT += WithAsynMain.cpp # Support from EPICS base -WithMPF_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary +WithAsyn_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary # Support from IPAC R2.5 and below. -#!WithMPFVx_LDOBJS_vxWorks += $(IPAC_BIN)/ipacLib -#!WithMPFVx_OBJS_vxWorks += $(IPAC_BIN)/tyGSOctal +#!WithAsynVx_LDOBJS_vxWorks += $(IPAC_BIN)/ipacLib +#!WithAsynVx_OBJS_vxWorks += $(IPAC_BIN)/tyGSOctal -#!WithMPF_LIBS += oms -#!WithMPF_LIBS += Mclennan -#!WithMPF_LIBS += Micos -#!WithMPF_LIBS += MicroMo -#!WithMPF_LIBS += PI -#!WithMPF_LIBS += Acs -#!WithMPF_LIBS += Ims -#!WithMPF_LIBS += Newport -#!WithMPF_LIBS += softMotor -#!WithMPF_LIBS += motorSimSupport -#!WithMPF_LIBS += SmartMotor -#!WithMPF_LIBS += KohzuMotor -WithMPF_LIBS += motor -WithMPF_LIBS += asyn +#!WithAsyn_LIBS += oms +#!WithAsyn_LIBS += Mclennan +#!WithAsyn_LIBS += Micos +#!WithAsyn_LIBS += MicroMo +#!WithAsyn_LIBS += PI +#!WithAsyn_LIBS += Acs +#!WithAsyn_LIBS += Ims +#!WithAsyn_LIBS += Newport +#!WithAsyn_LIBS += softMotor +#!WithAsyn_LIBS += motorSimSupport +#!WithAsyn_LIBS += SmartMotor +#!WithAsyn_LIBS += KohzuMotor +WithAsyn_LIBS += motor +WithAsyn_LIBS += asyn # Needed for Newport SNL programs -#!WithMPF_LIBS += seq pv -WithMPF_LIBS += $(EPICS_BASE_IOC_LIBS) +#!WithAsyn_LIBS += seq pv +WithAsyn_LIBS += $(EPICS_BASE_IOC_LIBS) -#!WithMPFVx_LIBS += oms -#!WithMPFVx_LIBS += Mclennan -#!WithMPFVx_LIBS += Micos -#!WithMPFVx_LIBS += MicroMo -#!WithMPFVx_LIBS += PI -#!WithMPFVx_LIBS += Acs -#!WithMPFVx_LIBS += Ims -#!WithMPFVx_LIBS += Newport -#!WithMPFVx_LIBS += softMotor -#!WithMPFVx_LIBS += motorSimSupport -#!WithMPFVx_LIBS += SmartMotor -#!WithMPFVx_LIBS += KohzuMotor -WithMPFVx_LIBS += motor +#!WithAsynVx_LIBS += oms +#!WithAsynVx_LIBS += Mclennan +#!WithAsynVx_LIBS += Micos +#!WithAsynVx_LIBS += MicroMo +#!WithAsynVx_LIBS += PI +#!WithAsynVx_LIBS += Acs +#!WithAsynVx_LIBS += Ims +#!WithAsynVx_LIBS += Newport +#!WithAsynVx_LIBS += softMotor +#!WithAsynVx_LIBS += motorSimSupport +#!WithAsynVx_LIBS += SmartMotor +#!WithAsynVx_LIBS += KohzuMotor +WithAsynVx_LIBS += motor # Support from IPAC R2.6 and above. -WithMPFVx_LIBS += Ipac TyGSOctal +WithAsynVx_LIBS += Ipac TyGSOctal -WithMPFVx_LIBS += asyn +WithAsynVx_LIBS += asyn # Needed for Newport SNL programs -#!WithMPFVx_LIBS += seq pv -WithMPFVx_LIBS += $(EPICS_BASE_IOC_LIBS) +#!WithAsynVx_LIBS += seq pv +WithAsynVx_LIBS += $(EPICS_BASE_IOC_LIBS) include $(TOP)/configure/RULES diff --git a/motorExApp/WithAsyn/WithAsynMain.c b/motorExApp/WithAsyn/WithAsynMain.c index 1e964767..f8857bf9 100644 --- a/motorExApp/WithAsyn/WithAsynMain.c +++ b/motorExApp/WithAsyn/WithAsynMain.c @@ -1,4 +1,4 @@ -/* WithMPFMain.c */ +/* WithAsynMain.c */ /* Author: Ron Sluiter */ #include diff --git a/motorExApp/WithAsyn/WithMPFInclude.dbd b/motorExApp/WithAsyn/WithMPFInclude.dbd deleted file mode 100644 index 812d4f80..00000000 --- a/motorExApp/WithAsyn/WithMPFInclude.dbd +++ /dev/null @@ -1,15 +0,0 @@ -include "base.dbd" -include "motorSupport.dbd" -include "drvAsynSerialPort.dbd" -#include "devAcsMotor.dbd" -#include "devImsMotor.dbd" -#include "devMclennanMotor.dbd" -#include "devMicos.dbd" -#include "devMicroMo.dbd" -#include "devNewport.dbd" -#include "devPIMotor.dbd" -#include "devOms.dbd" -#include "devSoftMotor.dbd" -#include "motorSimSupport.dbd" -#include "devSmartMotorMotor.dbd" -#include "devKohzuMotor.dbd" diff --git a/motorExApp/WithAsyn/WithMPFMain.c b/motorExApp/WithAsyn/WithMPFMain.c deleted file mode 100644 index 1e964767..00000000 --- a/motorExApp/WithAsyn/WithMPFMain.c +++ /dev/null @@ -1,21 +0,0 @@ -/* WithMPFMain.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/WithAsyn/WithMPFVxInclude.dbd b/motorExApp/WithAsyn/WithMPFVxInclude.dbd deleted file mode 100644 index 937467e4..00000000 --- a/motorExApp/WithAsyn/WithMPFVxInclude.dbd +++ /dev/null @@ -1,23 +0,0 @@ -include "base.dbd" -include "motorSupport.dbd" -#include "devAcsMotor.dbd" -#include "devImsMotor.dbd" -#include "devMclennanMotor.dbd" -#include "devMicos.dbd" -#include "devMicroMo.dbd" -#include "devNewport.dbd" -#include "devPIMotor.dbd" -#include "devOms.dbd" -#include "devSoftMotor.dbd" -#include "motorSimSupport.dbd" -#include "devSmartMotorMotor.dbd" -#include "devKohzuMotor.dbd" - -#include "drvAsynSerialPort.dbd" -#include "drvGsIP488.dbd" - -# Only for IPAC R2.7 and above. -driver(drvIpac) -registrar(tvme200Registrar) -registrar(vipc616Registrar) -registrar(tyGSOctalRegistrar)