From 0da18f5ce890af307e489694c495c7cf9c268962 Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Thu, 17 Oct 2002 18:50:16 +0000 Subject: [PATCH] R3.14.x compatible. --- iocBoot/Makefile | 5 +- iocBoot/iocNoAsyn/Makefile | 10 +- iocBoot/iocNoMPF/Makefile | 10 +- motorExApp/NoAsyn/Makefile | 54 ++++++++- motorExApp/NoAsyn/Makefile.Host | 12 -- motorExApp/NoAsyn/Makefile.Vx | 29 ----- motorExApp/NoAsyn/base.dbd | 191 -------------------------------- motorExApp/NoMPF/Makefile | 54 ++++++++- motorExApp/NoMPF/Makefile.Host | 12 -- motorExApp/NoMPF/Makefile.Vx | 29 ----- motorExApp/NoMPF/base.dbd | 191 -------------------------------- 11 files changed, 118 insertions(+), 479 deletions(-) delete mode 100644 motorExApp/NoAsyn/Makefile.Host delete mode 100644 motorExApp/NoAsyn/Makefile.Vx delete mode 100644 motorExApp/NoMPF/Makefile.Host delete mode 100644 motorExApp/NoMPF/Makefile.Vx diff --git a/iocBoot/Makefile b/iocBoot/Makefile index d64511f3..252a1370 100644 --- a/iocBoot/Makefile +++ b/iocBoot/Makefile @@ -1,4 +1,3 @@ TOP = .. -include $(TOP)/config/CONFIG_APP -DIRS += $(wildcard *ioc*) -include $(TOP)/config/RULES.iocBoot +include $(TOP)/configure/CONFIG +include $(TOP)/configure/RULES.iocBoot diff --git a/iocBoot/iocNoAsyn/Makefile b/iocBoot/iocNoAsyn/Makefile index c4ef70be..e0b13d8c 100644 --- a/iocBoot/iocNoAsyn/Makefile +++ b/iocBoot/iocNoAsyn/Makefile @@ -1,4 +1,8 @@ TOP = ../.. -include $(TOP)/config/CONFIG_APP -ARCH = mv167 -include $(TOP)/config/RULES.ioc +include $(TOP)/configure/CONFIG +#ARCH = solaris-sparc-gnu +#ARCH = vxWorks-68060 +#ARCH = vxWorks-ppc604 +TARGETS = cdCommands +include $(TOP)/configure/RULES.ioc + diff --git a/iocBoot/iocNoMPF/Makefile b/iocBoot/iocNoMPF/Makefile index c4ef70be..e0b13d8c 100644 --- a/iocBoot/iocNoMPF/Makefile +++ b/iocBoot/iocNoMPF/Makefile @@ -1,4 +1,8 @@ TOP = ../.. -include $(TOP)/config/CONFIG_APP -ARCH = mv167 -include $(TOP)/config/RULES.ioc +include $(TOP)/configure/CONFIG +#ARCH = solaris-sparc-gnu +#ARCH = vxWorks-68060 +#ARCH = vxWorks-ppc604 +TARGETS = cdCommands +include $(TOP)/configure/RULES.ioc + diff --git a/motorExApp/NoAsyn/Makefile b/motorExApp/NoAsyn/Makefile index 0380f4bf..b1e34203 100644 --- a/motorExApp/NoAsyn/Makefile +++ b/motorExApp/NoAsyn/Makefile @@ -1,3 +1,51 @@ -TOP=../.. -include $(TOP)/config/CONFIG_APP -include $(TOP)/config/RULES_ARCHS +# Makefile +TOP = ../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE +#============================= + +DBD += NoMPF.dbd + +# !!WARNING!! If you copy this file to your +# application, the following line +# MUST BE REMOVED and a MOTOR entry must be +# in your /config/RELEASE file. +MOTOR_LIB = $(TOP)/lib/$(T_A) + +PROD_IOC_vxWorks = NoMPF + +NoMPF_SRCS += NoMPF_registerRecordDeviceDriver.cpp +NoMPF_SRCS_DEFAULT += NoMPFMain.cpp +NoMPF_SRCS_vxWorks += -nil- + +#The following adds support from base/src/vxWorks +NoMPF_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary + +NoMPF_LIBS += recIoc +NoMPF_LIBS += softDevIoc +NoMPF_LIBS += testDevIoc +NoMPF_LIBS += iocsh +NoMPF_LIBS += miscIoc +NoMPF_LIBS += rsrvIoc +NoMPF_LIBS += dbtoolsIoc +NoMPF_LIBS += asIoc +NoMPF_LIBS += dbIoc +NoMPF_LIBS += registryIoc +NoMPF_LIBS += dbStaticIoc +NoMPF_LIBS += ca +NoMPF_LIBS += Com + +NoMPF_LIBS += motor +NoMPF_LIBS_vxWorks += oms +NoMPF_LIBS += softMotor +motor_DIR = $(MOTOR_LIB) +oms_DIR = $(MOTOR_LIB) +softMotor_DIR = $(MOTOR_LIB) + +#=========================== + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/motorExApp/NoAsyn/Makefile.Host b/motorExApp/NoAsyn/Makefile.Host deleted file mode 100644 index f87aa54a..00000000 --- a/motorExApp/NoAsyn/Makefile.Host +++ /dev/null @@ -1,12 +0,0 @@ -# Makefile.Host -TOP = ../../.. -include $(TOP)/config/CONFIG_APP -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE - -DBDEXPAND = NoMPFInclude.dbd -DBDNAME = NoMPFApp.dbd - -include $(TOP)/config/RULES.Host -#---------------------------------------- -# ADD RULES AFTER THIS LINE diff --git a/motorExApp/NoAsyn/Makefile.Vx b/motorExApp/NoAsyn/Makefile.Vx deleted file mode 100644 index a795a94f..00000000 --- a/motorExApp/NoAsyn/Makefile.Vx +++ /dev/null @@ -1,29 +0,0 @@ -# Makefile.Vx -TOP = ../../.. -include $(TOP)/config/CONFIG_APP -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE - -# !!WARNING!! If you copy this file to your -# application, the following line -# MUST BE REMOVED and a MOTOR entry must be -# in your /config/RELEASE file. -MOTOR_BIN = $(TOP)/bin/$(T_A) - -include $(TEMPLATE_TOP)/exampleApp/src/baseLIBOBJS - -LIBOBJS += $(EPICS_BASE_BIN)/iocCore -LIBOBJS += $(EPICS_BASE_BIN)/seq - -LIBOBJS += $(MOTOR_BIN)/motorLib -LIBOBJS += $(MOTOR_BIN)/omsLib -LIBOBJS += $(MOTOR_BIN)/softMotorLib - -LIBNAME = NoMPFLib - -#Note that the command line that builds the -#library $(LIBNAME) may be HUGE (>3kB) -# -include $(TOP)/config/RULES.Vx -#---------------------------------------- -# ADD RULES AFTER THIS LINE diff --git a/motorExApp/NoAsyn/base.dbd b/motorExApp/NoAsyn/base.dbd index 8e6e1caa..42cc9280 100644 --- a/motorExApp/NoAsyn/base.dbd +++ b/motorExApp/NoAsyn/base.dbd @@ -1,22 +1,15 @@ include "menuGlobal.dbd" include "menuConvert.dbd" include "aiRecord.dbd" -#include "aaiRecord.dbd" include "aoRecord.dbd" -#include "aaoRecord.dbd" include "biRecord.dbd" include "boRecord.dbd" include "calcRecord.dbd" include "calcoutRecord.dbd" include "compressRecord.dbd" include "dfanoutRecord.dbd" -#include "egRecord.dbd" -#include "egeventRecord.dbd" -#include "erRecord.dbd" -#include "ereventRecord.dbd" include "eventRecord.dbd" include "fanoutRecord.dbd" -#include "histogramRecord.dbd" include "longinRecord.dbd" include "longoutRecord.dbd" include "mbbiRecord.dbd" @@ -24,218 +17,34 @@ include "mbbiDirectRecord.dbd" include "mbboRecord.dbd" include "mbboDirectRecord.dbd" include "permissiveRecord.dbd" -include "pidRecord.dbd" -#include "pulseCounterRecord.dbd" -#include "pulseDelayRecord.dbd" -#include "pulseTrainRecord.dbd" -#include "scanRecord.dbd" include "selRecord.dbd" include "seqRecord.dbd" include "stateRecord.dbd" -#include "steppermotorRecord.dbd" include "stringinRecord.dbd" include "stringoutRecord.dbd" include "subRecord.dbd" -#include "gsubRecord.dbd" -#include "palRecord.dbd" include "subArrayRecord.dbd" -#include "timerRecord.dbd" -#include "waitRecord.dbd" include "waveformRecord.dbd" device(ai,CONSTANT,devAiSoft,"Soft Channel") device(ai,CONSTANT,devAiSoftRaw,"Raw Soft Channel") -#device(ai,VME_IO,devAiXy566Se,"XYCOM-566 SE Scanned") -#device(ai,VME_IO,devAiXy566Di,"XYCOM-566 Dif Scanned") -#device(ai,VME_IO,devAiXy566DiL,"XYCOM-566 Dif Latched") -#device(ai,VME_IO,devAiDvx2502,"DVX-2502") -#device(ai,CONSTANT,devAiTestAsyn,"Test Asyn") -#device(ai,AB_IO,devAiAb1771Il,"AB-1771IL-Analog In") -#device(ai,AB_IO,devAiAb1771Ife,"AB-1771IFE") -#device(ai,AB_IO,devAiAb1771Ixe,"AB-1771IXE-Millivolt In") -#device(ai,AB_IO,devAiAb1771IfeSe,"AB-1771IFE-SE") -#device(ai,AB_IO,devAiAb1771IfeMa,"AB-1771IFE-4to20MA") -#device(ai,AB_IO,devAiAb1771Ife0to5V,"AB-1771IFE-0to5Volt") -#device(ai,AB_IO,devAiAb1771IrPlatinum,"AB-1771RTD-Platinum") -#device(ai,AB_IO,devAiAb1771IrCopper,"AB-1771RTD-Copper") -#device(ai,CAMAC_IO,devAiCamac,"Camac") -#device(ai,VME_IO,devAiAt5Vxi,"VXI-AT5-AI") -#device(ai,GPIB_IO,devAiK486Gpib,"Keithley-486") -#device(ai,VME_IO,devAiKscV215,"KSC-V215") -#device(ai,INST_IO,devAiVXStats,"VX stats") -#device(aai,CAMAC_IO,devAaiCamac,"Camac") device(ao,CONSTANT,devAoSoft,"Soft Channel") device(ao,CONSTANT,devAoSoftRaw,"Raw Soft Channel") -#device(ao,VME_IO,devAoVmiVme4100,"VMIVME-4100") -#device(ao,CONSTANT,devAoTestAsyn,"Test Asyn") -#device(ao,AB_IO,devAoAb1771Ofe,"AB-1771OFE") -#device(ao,CAMAC_IO,devAoCamac,"Camac") -#device(ao,VME_IO,devAoAt5Vxi,"VXI-AT5-AO") -#device(ao,INST_IO,devAoVXStats,"VX stats") device(bi,CONSTANT,devBiSoft,"Soft Channel") device(bi,CONSTANT,devBiSoftRaw,"Raw Soft Channel") -#device(bi,VME_IO,devBiMpv910,"MPV-910") -#device(bi,VME_IO,devBiXVme210,"XVME-210") -#device(bi,CONSTANT,devBiTestAsyn,"Test Asyn") -#device(bi,AB_IO,devBiAb,"AB-Binary Input") -#device(bi,AB_IO,devBiAb16,"AB-16 bit BI") -#device(bi,AB_IO,devBiAb32,"AB-32 bit BI") -#device(bi,CAMAC_IO,devBiCamac,"Camac") -#device(bi,VME_IO,devBiAt5Vxi,"VXI-AT5-BI") -#device(bi,VME_IO,devBiXy240,"XYCOM-240") -#device(bi,VME_IO,devBiHpe1368a,"VXI-HPE1368-VS") -#device(bi,VME_IO,devBiAt8Fp,"AT8-FP10S") -#device(bi,VME_IO,devBiAvme9440,"AVME9440 I") device(bo,CONSTANT,devBoSoft,"Soft Channel") device(bo,CONSTANT,devBoSoftRaw,"Raw Soft Channel") -#device(bo,VME_IO,devBoMpv902,"MPV-902") -#device(bo,VME_IO,devBoXVme220,"XVME-220") -#device(bo,CONSTANT,devBoTestAsyn,"Test Asyn") -#device(bo,AB_IO,devBoAb,"AB-Binary Output") -#device(bo,AB_IO,devBoAb16,"AB-16 bit BO") -#device(bo,AB_IO,devBoAb32,"AB-32 bit BO") -#device(bo,CAMAC_IO,devBoCamac,"Camac") -#device(bo,VME_IO,devBoAt5Vxi,"VXI-AT5-BO") -#device(bo,GPIB_IO,devBoK486Gpib,"Keithley-486") -#device(bo,VME_IO,devBoXy240,"XYCOM-240") -#device(bo,VME_IO,devBoHpe1368a,"VXI-HPE1368-VS") -#device(bo,VME_IO,devBoAt8Fp,"AT8-FP10S") -#device(bo,VME_IO,devBoAvme9440,"AVME9440 O") device(event,CONSTANT,devEventSoft,"Soft Channel") -#device(event,VME_IO,devEventMz8310,"Mizar-8310") -#device(event,CONSTANT,devEventTestIoEvent,"Test IoEvent") -#device(event,VME_IO,devErEpicsEvent,"APS event receiver") -#device(histogram,CONSTANT,devHistogramSoft,"Soft Channel") -#device(histogram,CONSTANT,devHistogramTestAsyn,"Test Asyn") device(longin,CONSTANT,devLiSoft,"Soft Channel") -#device(longin,CAMAC_IO,devLiCamac,"Camac") device(longout,CONSTANT,devLoSoft,"Soft Channel") -#device(longout,CAMAC_IO,devLoCamac,"Camac") device(mbbi,CONSTANT,devMbbiSoft,"Soft Channel") device(mbbi,CONSTANT,devMbbiSoftRaw,"Raw Soft Channel") -#device(mbbi,VME_IO,devMbbiMpv910,"MPV-910") -#device(mbbi,VME_IO,devMbbiXVme210,"XVME-210") -#device(mbbi,CONSTANT,devMbbiTestAsyn,"Test Asyn") -#device(mbbi,AB_IO,devMbbiAb,"AB-Binary Input") -#device(mbbi,AB_IO,devMbbiAb16,"AB-16 bit BI") -#device(mbbi,AB_IO,devMbbiAb32,"AB-32 bit BI") -#device(mbbi,AB_IO,devMbbiAbAdapterStat,"AB-Adapter Status") -#device(mbbi,AB_IO,devMbbiAbCardStat,"AB-Card Status") -#device(mbbi,CAMAC_IO,devMbbiCamac,"Camac") -#device(mbbi,VME_IO,devMbbiAt5Vxi,"VXI-AT5-BI") -#device(mbbi,VME_IO,devMbbiXy240,"XYCOM-240") -#device(mbbi,VME_IO,devMbbiHpe1368a,"VXI-HPE1368-VS") -#device(mbbi,VME_IO,devMbbiAt8Fp,"AT8-FP10S") -#device(mbbi,VME_IO,devMbbiAvme9440,"AVME9440 I") device(mbbiDirect,CONSTANT,devMbbiDirectSoft,"Soft Channel") device(mbbiDirect,CONSTANT,devMbbiDirectSoftRaw,"Raw Soft Channel") -#device(mbbiDirect,VME_IO,devMbbiDirectMpv910,"MPV-910") -#device(mbbiDirect,VME_IO,devMbbiDirectXVme210,"XVME-210") -#device(mbbiDirect,AB_IO,devMbbiDirectAb,"AB-Binary Input") -#device(mbbiDirect,AB_IO,devMbbiDirectAb16,"AB-16 bit BI") -#device(mbbiDirect,AB_IO,devMbbiDirectAb32,"AB-32 bit BI") -#device(mbbiDirect,CAMAC_IO,devMbbiDirectCamac,"Camac") -#device(mbbiDirect,VME_IO,devMbbiDirectAt5Vxi,"VXI-AT5-BI") device(mbbo,CONSTANT,devMbboSoft,"Soft Channel") device(mbbo,CONSTANT,devMbboSoftRaw,"Raw Soft Channel") -#device(mbbo,VME_IO,devMbboMpv902,"MPV-902") -#device(mbbo,VME_IO,devMbboXVme220,"XVME-220") -#device(mbbo,CONSTANT,devMbboTestAsyn,"Test Asyn") -#device(mbbo,AB_IO,devMbboAb,"AB-Binary Output") -#device(mbbo,AB_IO,devMbboAb16,"AB-16 bit BO") -#device(mbbo,AB_IO,devMbboAb32,"AB-32 bit BO") -#device(mbbo,VME_IO,devMbboAt5Vxi,"VXI-AT5-BO") -#device(mbbo,GPIB_IO,devMbboK486Gpib,"Keithley-486") -#device(mbbo,VME_IO,devMbboXy240,"XYCOM-240") -#device(mbbo,VME_IO,devMbboHpe1368a,"VXI-HPE1368-VS") -#device(mbbo,VME_IO,devMbboAt8Fp,"AT8-FP10S") -#device(mbbo,VME_IO,devMbboAvme9440,"AVME9440 O") device(mbboDirect,CONSTANT,devMbboDirectSoft,"Soft Channel") device(mbboDirect,CONSTANT,devMbboDirectSoftRaw,"Raw Soft Channel") -#device(mbboDirect,VME_IO,devMbboDirectMpv902,"MPV-902") -#device(mbboDirect,VME_IO,devMbboDirectXVme220,"XVME-220") -#device(mbboDirect,AB_IO,devMbboDirectAb,"AB-Binary Output") -#device(mbboDirect,AB_IO,devMbboDirectAb16,"AB-16 bit BO") -#device(mbboDirect,AB_IO,devMbboDirectAb32,"AB-32 bit BO") -#device(mbboDirect,CAMAC_IO,devMbboDirectCamac,"Camac") -#device(mbboDirect,VME_IO,devMbboDirectAt5Vxi,"VXI-AT5-BO") -#device(pulseCounter,VME_IO,devPcMz8310,"Mizar-8310") -#device(pulseDelay,VME_IO,devPdMz8310,"Mizar-8310") -#device(pulseTrain,CONSTANT,devPtSoft,"Soft Channel") -#device(pulseTrain,VME_IO,devPtMz8310,"Mizar-8310") -#device(steppermotor,VME_IO,devSmCompumotor1830,"Compumotor 1830") -#device(steppermotor,VME_IO,devSmOms6Axis,"OMS 6-Axis") -#device(steppermotor,AB_IO,devSmAB1746Hstp1,"Allen Bradley 1746-HTSP1") device(stringin,CONSTANT,devSiSoft,"Soft Channel") -#device(stringin,CONSTANT,devSiTestAsyn,"Test Asyn") device(stringout,CONSTANT,devSoSoft,"Soft Channel") -#device(stringout,CONSTANT,devSoTestAsyn,"Test Asyn") device(subArray,CONSTANT,devSASoft,"Soft Channel") -#device(timer,VME_IO,devTmMizar8310,"Mizar-8310") -#device(timer,VME_IO,devTmDg535,"DG 535") -#device(timer,VME_IO,devTmAt5Vxi,"VXI-AT5-TIME") device(waveform,CONSTANT,devWfSoft,"Soft Channel") -#device(waveform,VME_IO,devWfXy566Sc,"XYCOM-566 Single Channel") -#device(waveform,VME_IO,devWfComet,"Comet Digitizer") -#device(waveform,VME_IO,devWfJoergerVtr1,"Joerger Digitizer") -#device(waveform,CONSTANT,devWfTestAsyn,"Test Asyn") -#device(waveform,VME_IO,devWfDvx2502,"DVX-2502") -#device(waveform,VME_IO,devWfPentek4261,"Pentek 4261") -#device(waveform,CAMAC_IO,devWfCamac,"Camac") -#device(waveform,VME_IO,devWfJoergerVtr1,"Joerger-VTR1") -#device(waveform,VME_IO,devWfComet,"Omnibyte-COMET") -#device(eg,VME_IO,devEg,"APS event generator G") -#device(egevent,VME_IO,devEgEvent,"APS event generator E") -#device(er,VME_IO,devEr,"APS event receiver") -#device(erevent,VME_IO,devErevent,"APS event receiver") -#device(wait,CONSTANT,devWaitIoEvent,"Soft Channel") -#device(ai,INST_IO,devAiCan,"CANbus") -#device(ao,INST_IO,devAoCan,"CANbus") -#device(bi,INST_IO,devBiCan,"CANbus") -#device(bo,INST_IO,devBoCan,"CANbus") -#device(mbbi,INST_IO,devMbbiCan,"CANbus") -#device(mbbo,INST_IO,devMbboCan,"CANbus") -#device(mbbiDirect,INST_IO,devMbbiDirectCan,"CANbus") -#device(mbboDirect,INST_IO,devMbboDirectCan,"CANbus") -#device(bi,VME_IO,devBiVmic2534,"Vmic2534") -#device(bo,VME_IO,devBoVmic2534,"Vmic2534") -#device(mbbi,VME_IO,devMbbiVmic2534,"Vmic2534") -#device(mbbo,VME_IO,devMbboVmic2534,"Vmic2534") - -include "symb.dbd" - -#device(ai,AB_IO,devAiAbSlcDcm,"AB-SLC500DCM") -#device(ai,AB_IO,devAiAbSlcDcmSigned,"AB-SLC500DCM-Signed") -#device(ao,AB_IO,devAoAbSlcDcm,"AB-SLC500DCM") -#device(longin,AB_IO,devLiAbSlcDcm,"AB-SLC500DCM") -#device(longout,AB_IO,devLoAbSlcDcm,"AB-SLC500DCM") - -#driver(drvXy010) -#driver(drvVxi) -#driver(drvGpib) -#driver(drvBitBus) -#driver(drvBb910) -#driver(drvXy210) -#driver(drvBb902) -#driver(drvXy220) -#driver(drvXy566) -#driver(drvDvx) -#driver(drvVmi4100) -#driver(drvAb) -#driver(drvAt5Vxi) -#driver(drvCompuSm) -#driver(drvOms) -#driver(drvMz8310) -#driver(drvHpe1368a) -#driver(drvXy240) -#driver(drvKscV215) -#driver(drvComet) -#driver(drvJgvtr1) -#driver(drvFp) -#driver(drvFpm) -#driver(drvIpac) -#driver(drvTip810) -#driver(drvVmi2534) -#include "bptTypeJdegC.dbd" -#include "bptTypeJdegF.dbd" -#include "bptTypeKdegC.dbd" -#include "bptTypeKdegF.dbd" diff --git a/motorExApp/NoMPF/Makefile b/motorExApp/NoMPF/Makefile index 0380f4bf..b1e34203 100644 --- a/motorExApp/NoMPF/Makefile +++ b/motorExApp/NoMPF/Makefile @@ -1,3 +1,51 @@ -TOP=../.. -include $(TOP)/config/CONFIG_APP -include $(TOP)/config/RULES_ARCHS +# Makefile +TOP = ../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE +#============================= + +DBD += NoMPF.dbd + +# !!WARNING!! If you copy this file to your +# application, the following line +# MUST BE REMOVED and a MOTOR entry must be +# in your /config/RELEASE file. +MOTOR_LIB = $(TOP)/lib/$(T_A) + +PROD_IOC_vxWorks = NoMPF + +NoMPF_SRCS += NoMPF_registerRecordDeviceDriver.cpp +NoMPF_SRCS_DEFAULT += NoMPFMain.cpp +NoMPF_SRCS_vxWorks += -nil- + +#The following adds support from base/src/vxWorks +NoMPF_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary + +NoMPF_LIBS += recIoc +NoMPF_LIBS += softDevIoc +NoMPF_LIBS += testDevIoc +NoMPF_LIBS += iocsh +NoMPF_LIBS += miscIoc +NoMPF_LIBS += rsrvIoc +NoMPF_LIBS += dbtoolsIoc +NoMPF_LIBS += asIoc +NoMPF_LIBS += dbIoc +NoMPF_LIBS += registryIoc +NoMPF_LIBS += dbStaticIoc +NoMPF_LIBS += ca +NoMPF_LIBS += Com + +NoMPF_LIBS += motor +NoMPF_LIBS_vxWorks += oms +NoMPF_LIBS += softMotor +motor_DIR = $(MOTOR_LIB) +oms_DIR = $(MOTOR_LIB) +softMotor_DIR = $(MOTOR_LIB) + +#=========================== + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/motorExApp/NoMPF/Makefile.Host b/motorExApp/NoMPF/Makefile.Host deleted file mode 100644 index f87aa54a..00000000 --- a/motorExApp/NoMPF/Makefile.Host +++ /dev/null @@ -1,12 +0,0 @@ -# Makefile.Host -TOP = ../../.. -include $(TOP)/config/CONFIG_APP -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE - -DBDEXPAND = NoMPFInclude.dbd -DBDNAME = NoMPFApp.dbd - -include $(TOP)/config/RULES.Host -#---------------------------------------- -# ADD RULES AFTER THIS LINE diff --git a/motorExApp/NoMPF/Makefile.Vx b/motorExApp/NoMPF/Makefile.Vx deleted file mode 100644 index a795a94f..00000000 --- a/motorExApp/NoMPF/Makefile.Vx +++ /dev/null @@ -1,29 +0,0 @@ -# Makefile.Vx -TOP = ../../.. -include $(TOP)/config/CONFIG_APP -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE - -# !!WARNING!! If you copy this file to your -# application, the following line -# MUST BE REMOVED and a MOTOR entry must be -# in your /config/RELEASE file. -MOTOR_BIN = $(TOP)/bin/$(T_A) - -include $(TEMPLATE_TOP)/exampleApp/src/baseLIBOBJS - -LIBOBJS += $(EPICS_BASE_BIN)/iocCore -LIBOBJS += $(EPICS_BASE_BIN)/seq - -LIBOBJS += $(MOTOR_BIN)/motorLib -LIBOBJS += $(MOTOR_BIN)/omsLib -LIBOBJS += $(MOTOR_BIN)/softMotorLib - -LIBNAME = NoMPFLib - -#Note that the command line that builds the -#library $(LIBNAME) may be HUGE (>3kB) -# -include $(TOP)/config/RULES.Vx -#---------------------------------------- -# ADD RULES AFTER THIS LINE diff --git a/motorExApp/NoMPF/base.dbd b/motorExApp/NoMPF/base.dbd index 8e6e1caa..42cc9280 100644 --- a/motorExApp/NoMPF/base.dbd +++ b/motorExApp/NoMPF/base.dbd @@ -1,22 +1,15 @@ include "menuGlobal.dbd" include "menuConvert.dbd" include "aiRecord.dbd" -#include "aaiRecord.dbd" include "aoRecord.dbd" -#include "aaoRecord.dbd" include "biRecord.dbd" include "boRecord.dbd" include "calcRecord.dbd" include "calcoutRecord.dbd" include "compressRecord.dbd" include "dfanoutRecord.dbd" -#include "egRecord.dbd" -#include "egeventRecord.dbd" -#include "erRecord.dbd" -#include "ereventRecord.dbd" include "eventRecord.dbd" include "fanoutRecord.dbd" -#include "histogramRecord.dbd" include "longinRecord.dbd" include "longoutRecord.dbd" include "mbbiRecord.dbd" @@ -24,218 +17,34 @@ include "mbbiDirectRecord.dbd" include "mbboRecord.dbd" include "mbboDirectRecord.dbd" include "permissiveRecord.dbd" -include "pidRecord.dbd" -#include "pulseCounterRecord.dbd" -#include "pulseDelayRecord.dbd" -#include "pulseTrainRecord.dbd" -#include "scanRecord.dbd" include "selRecord.dbd" include "seqRecord.dbd" include "stateRecord.dbd" -#include "steppermotorRecord.dbd" include "stringinRecord.dbd" include "stringoutRecord.dbd" include "subRecord.dbd" -#include "gsubRecord.dbd" -#include "palRecord.dbd" include "subArrayRecord.dbd" -#include "timerRecord.dbd" -#include "waitRecord.dbd" include "waveformRecord.dbd" device(ai,CONSTANT,devAiSoft,"Soft Channel") device(ai,CONSTANT,devAiSoftRaw,"Raw Soft Channel") -#device(ai,VME_IO,devAiXy566Se,"XYCOM-566 SE Scanned") -#device(ai,VME_IO,devAiXy566Di,"XYCOM-566 Dif Scanned") -#device(ai,VME_IO,devAiXy566DiL,"XYCOM-566 Dif Latched") -#device(ai,VME_IO,devAiDvx2502,"DVX-2502") -#device(ai,CONSTANT,devAiTestAsyn,"Test Asyn") -#device(ai,AB_IO,devAiAb1771Il,"AB-1771IL-Analog In") -#device(ai,AB_IO,devAiAb1771Ife,"AB-1771IFE") -#device(ai,AB_IO,devAiAb1771Ixe,"AB-1771IXE-Millivolt In") -#device(ai,AB_IO,devAiAb1771IfeSe,"AB-1771IFE-SE") -#device(ai,AB_IO,devAiAb1771IfeMa,"AB-1771IFE-4to20MA") -#device(ai,AB_IO,devAiAb1771Ife0to5V,"AB-1771IFE-0to5Volt") -#device(ai,AB_IO,devAiAb1771IrPlatinum,"AB-1771RTD-Platinum") -#device(ai,AB_IO,devAiAb1771IrCopper,"AB-1771RTD-Copper") -#device(ai,CAMAC_IO,devAiCamac,"Camac") -#device(ai,VME_IO,devAiAt5Vxi,"VXI-AT5-AI") -#device(ai,GPIB_IO,devAiK486Gpib,"Keithley-486") -#device(ai,VME_IO,devAiKscV215,"KSC-V215") -#device(ai,INST_IO,devAiVXStats,"VX stats") -#device(aai,CAMAC_IO,devAaiCamac,"Camac") device(ao,CONSTANT,devAoSoft,"Soft Channel") device(ao,CONSTANT,devAoSoftRaw,"Raw Soft Channel") -#device(ao,VME_IO,devAoVmiVme4100,"VMIVME-4100") -#device(ao,CONSTANT,devAoTestAsyn,"Test Asyn") -#device(ao,AB_IO,devAoAb1771Ofe,"AB-1771OFE") -#device(ao,CAMAC_IO,devAoCamac,"Camac") -#device(ao,VME_IO,devAoAt5Vxi,"VXI-AT5-AO") -#device(ao,INST_IO,devAoVXStats,"VX stats") device(bi,CONSTANT,devBiSoft,"Soft Channel") device(bi,CONSTANT,devBiSoftRaw,"Raw Soft Channel") -#device(bi,VME_IO,devBiMpv910,"MPV-910") -#device(bi,VME_IO,devBiXVme210,"XVME-210") -#device(bi,CONSTANT,devBiTestAsyn,"Test Asyn") -#device(bi,AB_IO,devBiAb,"AB-Binary Input") -#device(bi,AB_IO,devBiAb16,"AB-16 bit BI") -#device(bi,AB_IO,devBiAb32,"AB-32 bit BI") -#device(bi,CAMAC_IO,devBiCamac,"Camac") -#device(bi,VME_IO,devBiAt5Vxi,"VXI-AT5-BI") -#device(bi,VME_IO,devBiXy240,"XYCOM-240") -#device(bi,VME_IO,devBiHpe1368a,"VXI-HPE1368-VS") -#device(bi,VME_IO,devBiAt8Fp,"AT8-FP10S") -#device(bi,VME_IO,devBiAvme9440,"AVME9440 I") device(bo,CONSTANT,devBoSoft,"Soft Channel") device(bo,CONSTANT,devBoSoftRaw,"Raw Soft Channel") -#device(bo,VME_IO,devBoMpv902,"MPV-902") -#device(bo,VME_IO,devBoXVme220,"XVME-220") -#device(bo,CONSTANT,devBoTestAsyn,"Test Asyn") -#device(bo,AB_IO,devBoAb,"AB-Binary Output") -#device(bo,AB_IO,devBoAb16,"AB-16 bit BO") -#device(bo,AB_IO,devBoAb32,"AB-32 bit BO") -#device(bo,CAMAC_IO,devBoCamac,"Camac") -#device(bo,VME_IO,devBoAt5Vxi,"VXI-AT5-BO") -#device(bo,GPIB_IO,devBoK486Gpib,"Keithley-486") -#device(bo,VME_IO,devBoXy240,"XYCOM-240") -#device(bo,VME_IO,devBoHpe1368a,"VXI-HPE1368-VS") -#device(bo,VME_IO,devBoAt8Fp,"AT8-FP10S") -#device(bo,VME_IO,devBoAvme9440,"AVME9440 O") device(event,CONSTANT,devEventSoft,"Soft Channel") -#device(event,VME_IO,devEventMz8310,"Mizar-8310") -#device(event,CONSTANT,devEventTestIoEvent,"Test IoEvent") -#device(event,VME_IO,devErEpicsEvent,"APS event receiver") -#device(histogram,CONSTANT,devHistogramSoft,"Soft Channel") -#device(histogram,CONSTANT,devHistogramTestAsyn,"Test Asyn") device(longin,CONSTANT,devLiSoft,"Soft Channel") -#device(longin,CAMAC_IO,devLiCamac,"Camac") device(longout,CONSTANT,devLoSoft,"Soft Channel") -#device(longout,CAMAC_IO,devLoCamac,"Camac") device(mbbi,CONSTANT,devMbbiSoft,"Soft Channel") device(mbbi,CONSTANT,devMbbiSoftRaw,"Raw Soft Channel") -#device(mbbi,VME_IO,devMbbiMpv910,"MPV-910") -#device(mbbi,VME_IO,devMbbiXVme210,"XVME-210") -#device(mbbi,CONSTANT,devMbbiTestAsyn,"Test Asyn") -#device(mbbi,AB_IO,devMbbiAb,"AB-Binary Input") -#device(mbbi,AB_IO,devMbbiAb16,"AB-16 bit BI") -#device(mbbi,AB_IO,devMbbiAb32,"AB-32 bit BI") -#device(mbbi,AB_IO,devMbbiAbAdapterStat,"AB-Adapter Status") -#device(mbbi,AB_IO,devMbbiAbCardStat,"AB-Card Status") -#device(mbbi,CAMAC_IO,devMbbiCamac,"Camac") -#device(mbbi,VME_IO,devMbbiAt5Vxi,"VXI-AT5-BI") -#device(mbbi,VME_IO,devMbbiXy240,"XYCOM-240") -#device(mbbi,VME_IO,devMbbiHpe1368a,"VXI-HPE1368-VS") -#device(mbbi,VME_IO,devMbbiAt8Fp,"AT8-FP10S") -#device(mbbi,VME_IO,devMbbiAvme9440,"AVME9440 I") device(mbbiDirect,CONSTANT,devMbbiDirectSoft,"Soft Channel") device(mbbiDirect,CONSTANT,devMbbiDirectSoftRaw,"Raw Soft Channel") -#device(mbbiDirect,VME_IO,devMbbiDirectMpv910,"MPV-910") -#device(mbbiDirect,VME_IO,devMbbiDirectXVme210,"XVME-210") -#device(mbbiDirect,AB_IO,devMbbiDirectAb,"AB-Binary Input") -#device(mbbiDirect,AB_IO,devMbbiDirectAb16,"AB-16 bit BI") -#device(mbbiDirect,AB_IO,devMbbiDirectAb32,"AB-32 bit BI") -#device(mbbiDirect,CAMAC_IO,devMbbiDirectCamac,"Camac") -#device(mbbiDirect,VME_IO,devMbbiDirectAt5Vxi,"VXI-AT5-BI") device(mbbo,CONSTANT,devMbboSoft,"Soft Channel") device(mbbo,CONSTANT,devMbboSoftRaw,"Raw Soft Channel") -#device(mbbo,VME_IO,devMbboMpv902,"MPV-902") -#device(mbbo,VME_IO,devMbboXVme220,"XVME-220") -#device(mbbo,CONSTANT,devMbboTestAsyn,"Test Asyn") -#device(mbbo,AB_IO,devMbboAb,"AB-Binary Output") -#device(mbbo,AB_IO,devMbboAb16,"AB-16 bit BO") -#device(mbbo,AB_IO,devMbboAb32,"AB-32 bit BO") -#device(mbbo,VME_IO,devMbboAt5Vxi,"VXI-AT5-BO") -#device(mbbo,GPIB_IO,devMbboK486Gpib,"Keithley-486") -#device(mbbo,VME_IO,devMbboXy240,"XYCOM-240") -#device(mbbo,VME_IO,devMbboHpe1368a,"VXI-HPE1368-VS") -#device(mbbo,VME_IO,devMbboAt8Fp,"AT8-FP10S") -#device(mbbo,VME_IO,devMbboAvme9440,"AVME9440 O") device(mbboDirect,CONSTANT,devMbboDirectSoft,"Soft Channel") device(mbboDirect,CONSTANT,devMbboDirectSoftRaw,"Raw Soft Channel") -#device(mbboDirect,VME_IO,devMbboDirectMpv902,"MPV-902") -#device(mbboDirect,VME_IO,devMbboDirectXVme220,"XVME-220") -#device(mbboDirect,AB_IO,devMbboDirectAb,"AB-Binary Output") -#device(mbboDirect,AB_IO,devMbboDirectAb16,"AB-16 bit BO") -#device(mbboDirect,AB_IO,devMbboDirectAb32,"AB-32 bit BO") -#device(mbboDirect,CAMAC_IO,devMbboDirectCamac,"Camac") -#device(mbboDirect,VME_IO,devMbboDirectAt5Vxi,"VXI-AT5-BO") -#device(pulseCounter,VME_IO,devPcMz8310,"Mizar-8310") -#device(pulseDelay,VME_IO,devPdMz8310,"Mizar-8310") -#device(pulseTrain,CONSTANT,devPtSoft,"Soft Channel") -#device(pulseTrain,VME_IO,devPtMz8310,"Mizar-8310") -#device(steppermotor,VME_IO,devSmCompumotor1830,"Compumotor 1830") -#device(steppermotor,VME_IO,devSmOms6Axis,"OMS 6-Axis") -#device(steppermotor,AB_IO,devSmAB1746Hstp1,"Allen Bradley 1746-HTSP1") device(stringin,CONSTANT,devSiSoft,"Soft Channel") -#device(stringin,CONSTANT,devSiTestAsyn,"Test Asyn") device(stringout,CONSTANT,devSoSoft,"Soft Channel") -#device(stringout,CONSTANT,devSoTestAsyn,"Test Asyn") device(subArray,CONSTANT,devSASoft,"Soft Channel") -#device(timer,VME_IO,devTmMizar8310,"Mizar-8310") -#device(timer,VME_IO,devTmDg535,"DG 535") -#device(timer,VME_IO,devTmAt5Vxi,"VXI-AT5-TIME") device(waveform,CONSTANT,devWfSoft,"Soft Channel") -#device(waveform,VME_IO,devWfXy566Sc,"XYCOM-566 Single Channel") -#device(waveform,VME_IO,devWfComet,"Comet Digitizer") -#device(waveform,VME_IO,devWfJoergerVtr1,"Joerger Digitizer") -#device(waveform,CONSTANT,devWfTestAsyn,"Test Asyn") -#device(waveform,VME_IO,devWfDvx2502,"DVX-2502") -#device(waveform,VME_IO,devWfPentek4261,"Pentek 4261") -#device(waveform,CAMAC_IO,devWfCamac,"Camac") -#device(waveform,VME_IO,devWfJoergerVtr1,"Joerger-VTR1") -#device(waveform,VME_IO,devWfComet,"Omnibyte-COMET") -#device(eg,VME_IO,devEg,"APS event generator G") -#device(egevent,VME_IO,devEgEvent,"APS event generator E") -#device(er,VME_IO,devEr,"APS event receiver") -#device(erevent,VME_IO,devErevent,"APS event receiver") -#device(wait,CONSTANT,devWaitIoEvent,"Soft Channel") -#device(ai,INST_IO,devAiCan,"CANbus") -#device(ao,INST_IO,devAoCan,"CANbus") -#device(bi,INST_IO,devBiCan,"CANbus") -#device(bo,INST_IO,devBoCan,"CANbus") -#device(mbbi,INST_IO,devMbbiCan,"CANbus") -#device(mbbo,INST_IO,devMbboCan,"CANbus") -#device(mbbiDirect,INST_IO,devMbbiDirectCan,"CANbus") -#device(mbboDirect,INST_IO,devMbboDirectCan,"CANbus") -#device(bi,VME_IO,devBiVmic2534,"Vmic2534") -#device(bo,VME_IO,devBoVmic2534,"Vmic2534") -#device(mbbi,VME_IO,devMbbiVmic2534,"Vmic2534") -#device(mbbo,VME_IO,devMbboVmic2534,"Vmic2534") - -include "symb.dbd" - -#device(ai,AB_IO,devAiAbSlcDcm,"AB-SLC500DCM") -#device(ai,AB_IO,devAiAbSlcDcmSigned,"AB-SLC500DCM-Signed") -#device(ao,AB_IO,devAoAbSlcDcm,"AB-SLC500DCM") -#device(longin,AB_IO,devLiAbSlcDcm,"AB-SLC500DCM") -#device(longout,AB_IO,devLoAbSlcDcm,"AB-SLC500DCM") - -#driver(drvXy010) -#driver(drvVxi) -#driver(drvGpib) -#driver(drvBitBus) -#driver(drvBb910) -#driver(drvXy210) -#driver(drvBb902) -#driver(drvXy220) -#driver(drvXy566) -#driver(drvDvx) -#driver(drvVmi4100) -#driver(drvAb) -#driver(drvAt5Vxi) -#driver(drvCompuSm) -#driver(drvOms) -#driver(drvMz8310) -#driver(drvHpe1368a) -#driver(drvXy240) -#driver(drvKscV215) -#driver(drvComet) -#driver(drvJgvtr1) -#driver(drvFp) -#driver(drvFpm) -#driver(drvIpac) -#driver(drvTip810) -#driver(drvVmi2534) -#include "bptTypeJdegC.dbd" -#include "bptTypeJdegF.dbd" -#include "bptTypeKdegC.dbd" -#include "bptTypeKdegF.dbd"