From 0d40dafbcb18739986303abb190ee675c0c25095 Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Wed, 28 Nov 2007 18:10:29 +0000 Subject: [PATCH] Renaming NoMPF/WithMPF NoAsyn/WithAsyn. --- motorExApp/Makefile | 4 +- motorExApp/NoMPF/Makefile | 39 -------------- motorExApp/NoMPF/NoMPFInclude.dbd | 6 --- motorExApp/NoMPF/NoMPFMain.c | 21 -------- motorExApp/NoMPF/NoMPFVxInclude.dbd | 6 --- motorExApp/WithMPF/Makefile | 69 ------------------------- motorExApp/WithMPF/WithMPFInclude.dbd | 15 ------ motorExApp/WithMPF/WithMPFMain.c | 21 -------- motorExApp/WithMPF/WithMPFVxInclude.dbd | 23 --------- 9 files changed, 2 insertions(+), 202 deletions(-) delete mode 100644 motorExApp/NoMPF/Makefile delete mode 100644 motorExApp/NoMPF/NoMPFInclude.dbd delete mode 100644 motorExApp/NoMPF/NoMPFMain.c delete mode 100644 motorExApp/NoMPF/NoMPFVxInclude.dbd delete mode 100644 motorExApp/WithMPF/Makefile delete mode 100644 motorExApp/WithMPF/WithMPFInclude.dbd delete mode 100644 motorExApp/WithMPF/WithMPFMain.c delete mode 100644 motorExApp/WithMPF/WithMPFVxInclude.dbd diff --git a/motorExApp/Makefile b/motorExApp/Makefile index 1dae8f9a..0b8a6163 100644 --- a/motorExApp/Makefile +++ b/motorExApp/Makefile @@ -1,9 +1,9 @@ TOP = .. include $(TOP)/configure/CONFIG -DIRS += NoMPF +DIRS += NoAsyn ifdef ASYN -DIRS += WithMPF +DIRS += WithAsyn endif include $(TOP)/configure/RULES_DIRS diff --git a/motorExApp/NoMPF/Makefile b/motorExApp/NoMPF/Makefile deleted file mode 100644 index 1e777bf7..00000000 --- a/motorExApp/NoMPF/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# Makefile -TOP = ../.. -include $(TOP)/configure/CONFIG -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE -#============================= - -DBD += NoMPF.dbd -DBD += NoMPFVx.dbd - -PROD_IOC_DEFAULT = NoMPF -PROD_IOC_vxWorks = NoMPFVx - -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) - -NoMPFVx_SRCS += NoMPFVx_registerRecordDeviceDriver.cpp -#!NoMPFVx_LIBS += softMotor -#!NoMPFVx_LIBS += oms -#!NoMPFVx_LIBS += DeltaTau -NoMPFVx_LIBS += motor -NoMPFVx_LIBS += asyn - - -NoMPFVx_OBJS += $(EPICS_BASE_BIN)/vxComLibrary -NoMPFVx_LIBS += $(EPICS_BASE_IOC_LIBS) - -#=========================== - -include $(TOP)/configure/RULES -#---------------------------------------- -# ADD RULES AFTER THIS LINE - diff --git a/motorExApp/NoMPF/NoMPFInclude.dbd b/motorExApp/NoMPF/NoMPFInclude.dbd deleted file mode 100644 index b30d332a..00000000 --- a/motorExApp/NoMPF/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/NoMPF/NoMPFMain.c b/motorExApp/NoMPF/NoMPFMain.c deleted file mode 100644 index 9b873cc9..00000000 --- a/motorExApp/NoMPF/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/NoMPF/NoMPFVxInclude.dbd b/motorExApp/NoMPF/NoMPFVxInclude.dbd deleted file mode 100644 index 00a33324..00000000 --- a/motorExApp/NoMPF/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" diff --git a/motorExApp/WithMPF/Makefile b/motorExApp/WithMPF/Makefile deleted file mode 100644 index 5fa5c1ac..00000000 --- a/motorExApp/WithMPF/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -# "#!" marks lines that can be uncommented. -# Choice either IPAC R2.5 and below, or, R2.6 -# and above. The default is IPAC R2.6 and above. - -# Makefile -TOP = ../.. -include $(TOP)/configure/CONFIG - -ifeq ($(OS_CLASS), vxWorks) -DBD += WithMPFVx.dbd -endif -DBD += WithMPF.dbd - -PROD_IOC_DEFAULT = WithMPF -PROD_IOC_vxWorks = WithMPFVx - -WithMPF_SRCS += WithMPF_registerRecordDeviceDriver.cpp -WithMPFVx_SRCS += WithMPFVx_registerRecordDeviceDriver.cpp -WithMPF_SRCS_DEFAULT += WithMPFMain.cpp - -# Support from EPICS base -WithMPF_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 - -#!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 -# Needed for Newport SNL programs -#!WithMPF_LIBS += seq pv -WithMPF_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 - -# Support from IPAC R2.6 and above. -WithMPFVx_LIBS += Ipac TyGSOctal - -WithMPFVx_LIBS += asyn -# Needed for Newport SNL programs -#!WithMPFVx_LIBS += seq pv -WithMPFVx_LIBS += $(EPICS_BASE_IOC_LIBS) - -include $(TOP)/configure/RULES - diff --git a/motorExApp/WithMPF/WithMPFInclude.dbd b/motorExApp/WithMPF/WithMPFInclude.dbd deleted file mode 100644 index 812d4f80..00000000 --- a/motorExApp/WithMPF/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/WithMPF/WithMPFMain.c b/motorExApp/WithMPF/WithMPFMain.c deleted file mode 100644 index 1e964767..00000000 --- a/motorExApp/WithMPF/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/WithMPF/WithMPFVxInclude.dbd b/motorExApp/WithMPF/WithMPFVxInclude.dbd deleted file mode 100644 index 937467e4..00000000 --- a/motorExApp/WithMPF/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)