From 0c5d42db75f10a92178c2064e35c0ee94f25d50c Mon Sep 17 00:00:00 2001 From: MarkRivers <rivers@cars.uchicago.edu> Date: Fri, 7 Sep 2001 04:21:22 +0000 Subject: [PATCH] Changes to support reorganization of ipApp and new software support such as CAMAC --- xxxApp/src/base.dbd | 22 ++-- xxxApp/src/baseLIBOBJS | 216 ++++++++++++++++++++++++++++++++++++++ xxxApp/src/xxxInclude.dbd | 15 ++- 3 files changed, 240 insertions(+), 13 deletions(-) create mode 100644 xxxApp/src/baseLIBOBJS diff --git a/xxxApp/src/base.dbd b/xxxApp/src/base.dbd index 8e6e1ca..5e228bc 100644 --- a/xxxApp/src/base.dbd +++ b/xxxApp/src/base.dbd @@ -47,7 +47,7 @@ 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,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") @@ -61,7 +61,7 @@ device(ai,CONSTANT,devAiSoftRaw,"Raw Soft Channel") #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(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") @@ -70,7 +70,7 @@ device(ao,CONSTANT,devAoSoftRaw,"Raw Soft Channel") #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(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") @@ -84,7 +84,7 @@ device(bi,CONSTANT,devBiSoftRaw,"Raw Soft Channel") #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(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") @@ -99,7 +99,7 @@ device(bo,CONSTANT,devBoSoftRaw,"Raw Soft Channel") #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(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") @@ -125,7 +125,7 @@ device(mbbi,CONSTANT,devMbbiSoftRaw,"Raw Soft Channel") #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(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") @@ -148,7 +148,7 @@ device(mbbo,CONSTANT,devMbboSoftRaw,"Raw Soft Channel") #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(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") @@ -211,16 +211,16 @@ include "symb.dbd" #driver(drvXy010) #driver(drvVxi) -#driver(drvGpib) -#driver(drvBitBus) +driver(drvGpib) +driver(drvBitBus) #driver(drvBb910) #driver(drvXy210) #driver(drvBb902) #driver(drvXy220) #driver(drvXy566) -#driver(drvDvx) +driver(drvDvx) #driver(drvVmi4100) -#driver(drvAb) +driver(drvAb) #driver(drvAt5Vxi) #driver(drvCompuSm) #driver(drvOms) diff --git a/xxxApp/src/baseLIBOBJS b/xxxApp/src/baseLIBOBJS new file mode 100644 index 0000000..cd962ba --- /dev/null +++ b/xxxApp/src/baseLIBOBJS @@ -0,0 +1,216 @@ +#LIBOBJS += $(EPICS_BASE_BIN)/aaiRecord.o +#LIBOBJS += $(EPICS_BASE_BIN)/aaoRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/aiRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/aoRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/biRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/boRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/calcRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/calcoutRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/compressRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/dfanoutRecord.o +#LIBOBJS += $(EPICS_BASE_BIN)/egRecord.o +#LIBOBJS += $(EPICS_BASE_BIN)/egeventRecord.o +#LIBOBJS += $(EPICS_BASE_BIN)/erRecord.o +#LIBOBJS += $(EPICS_BASE_BIN)/ereventRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/eventRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/fanoutRecord.o +#LIBOBJS += $(EPICS_BASE_BIN)/gsubRecord.o +#LIBOBJS += $(EPICS_BASE_BIN)/histogramRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/longinRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/longoutRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/mbbiRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/mbbiDirectRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/mbboRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/mbboDirectRecord.o +#LIBOBJS += $(EPICS_BASE_BIN)/palRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/permissiveRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/pidRecord.o +#LIBOBJS += $(EPICS_BASE_BIN)/pulseCounterRecord.o +#LIBOBJS += $(EPICS_BASE_BIN)/pulseDelayRecord.o +#LIBOBJS += $(EPICS_BASE_BIN)/pulseTrainRecord.o +#LIBOBJS += $(EPICS_BASE_BIN)/recWaitCa.o +#LIBOBJS += $(EPICS_BASE_BIN)/recDynLink.o +#LIBOBJS += $(EPICS_BASE_BIN)/recDynLinkTest.o +#LIBOBJS += $(EPICS_BASE_BIN)/scanRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/selRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/seqRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/stateRecord.o +#LIBOBJS += $(EPICS_BASE_BIN)/steppermotorRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/stringinRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/stringoutRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/subRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/subArrayRecord.o +#LIBOBJS += $(EPICS_BASE_BIN)/timerRecord.o +#LIBOBJS += $(EPICS_BASE_BIN)/waitRecord.o +LIBOBJS += $(EPICS_BASE_BIN)/waveformRecord.o +# +# Device Support +# +#LIBOBJS += $(EPICS_BASE_BIN)/devAaiCamac.o +#LIBOBJS += $(EPICS_BASE_BIN)/devAiCamac.o +LIBOBJS += $(EPICS_BASE_BIN)/devAiDvx2502.o +#LIBOBJS += $(EPICS_BASE_BIN)/devAiKscV215.o +LIBOBJS += $(EPICS_BASE_BIN)/devAiSoft.o +LIBOBJS += $(EPICS_BASE_BIN)/devAiSoftRaw.o +LIBOBJS += $(EPICS_BASE_BIN)/devVXStats.o +LIBOBJS += $(EPICS_BASE_BIN)/devAiTestAsyn.o +#LIBOBJS += $(EPICS_BASE_BIN)/devAiXy566Di.o +#LIBOBJS += $(EPICS_BASE_BIN)/devAiXy566DiL.o +#LIBOBJS += $(EPICS_BASE_BIN)/devAiXy566Se.o +#LIBOBJS += $(EPICS_BASE_BIN)/devAaoCamac.o +#LIBOBJS += $(EPICS_BASE_BIN)/devAoCamac.o +LIBOBJS += $(EPICS_BASE_BIN)/devAoSoft.o +LIBOBJS += $(EPICS_BASE_BIN)/devAoSoftRaw.o +LIBOBJS += $(EPICS_BASE_BIN)/devAoTestAsyn.o +#LIBOBJS += $(EPICS_BASE_BIN)/devAoVmiVme4100.o +#LIBOBJS += $(EPICS_BASE_BIN)/devApsEg.o +#LIBOBJS += $(EPICS_BASE_BIN)/devApsEr.o +#LIBOBJS += $(EPICS_BASE_BIN)/devAt5Vxi.o +#LIBOBJS += $(EPICS_BASE_BIN)/devAt8Fp.o +LIBOBJS += $(EPICS_BASE_BIN)/devAvme9440.o +#LIBOBJS += $(EPICS_BASE_BIN)/devBiCamac.o +#LIBOBJS += $(EPICS_BASE_BIN)/devBiMpv910.o +LIBOBJS += $(EPICS_BASE_BIN)/devBiSoft.o +LIBOBJS += $(EPICS_BASE_BIN)/devBiSoftRaw.o +LIBOBJS += $(EPICS_BASE_BIN)/devBiTestAsyn.o +#LIBOBJS += $(EPICS_BASE_BIN)/devBiXVme210.o +#LIBOBJS += $(EPICS_BASE_BIN)/devBoCamac.o +#LIBOBJS += $(EPICS_BASE_BIN)/devBoMpv902.o +LIBOBJS += $(EPICS_BASE_BIN)/devBoSoft.o +LIBOBJS += $(EPICS_BASE_BIN)/devBoSoftRaw.o +LIBOBJS += $(EPICS_BASE_BIN)/devBoTestAsyn.o +#LIBOBJS += $(EPICS_BASE_BIN)/devBoXVme220.o +LIBOBJS += $(EPICS_BASE_BIN)/devCommonGpib.o +LIBOBJS += $(EPICS_BASE_BIN)/devEventSoft.o +LIBOBJS += $(EPICS_BASE_BIN)/devEventTestIoEvent.o +LIBOBJS += $(EPICS_BASE_BIN)/devHistogramSoft.o +LIBOBJS += $(EPICS_BASE_BIN)/devHistogramTestAsyn.o +#LIBOBJS += $(EPICS_BASE_BIN)/devHpe1368a.o +#LIBOBJS += $(EPICS_BASE_BIN)/devLiCamac.o +LIBOBJS += $(EPICS_BASE_BIN)/devLiSoft.o +#LIBOBJS += $(EPICS_BASE_BIN)/devLoCamac.o +LIBOBJS += $(EPICS_BASE_BIN)/devLoSoft.o +#LIBOBJS += $(EPICS_BASE_BIN)/devMbbiCamac.o +#LIBOBJS += $(EPICS_BASE_BIN)/devMbbiDirectCamac.o +#LIBOBJS += $(EPICS_BASE_BIN)/devMbbiDirectMpv910.o +LIBOBJS += $(EPICS_BASE_BIN)/devMbbiDirectSoft.o +LIBOBJS += $(EPICS_BASE_BIN)/devMbbiDirectSoftRaw.o +#LIBOBJS += $(EPICS_BASE_BIN)/devMbbiDirectXVme210.o +#LIBOBJS += $(EPICS_BASE_BIN)/devMbbiMpv910.o +LIBOBJS += $(EPICS_BASE_BIN)/devMbbiSoft.o +LIBOBJS += $(EPICS_BASE_BIN)/devMbbiSoftRaw.o +LIBOBJS += $(EPICS_BASE_BIN)/devMbbiTestAsyn.o +#LIBOBJS += $(EPICS_BASE_BIN)/devMbbiXVme210.o +#LIBOBJS += $(EPICS_BASE_BIN)/devMbboCamac.o +#LIBOBJS += $(EPICS_BASE_BIN)/devMbboDirectCamac.o +#LIBOBJS += $(EPICS_BASE_BIN)/devMbboDirectMpv902.o +LIBOBJS += $(EPICS_BASE_BIN)/devMbboDirectSoft.o +LIBOBJS += $(EPICS_BASE_BIN)/devMbboDirectSoftRaw.o +#LIBOBJS += $(EPICS_BASE_BIN)/devMbboDirectXVme220.o +#LIBOBJS += $(EPICS_BASE_BIN)/devMbboMpv902.o +LIBOBJS += $(EPICS_BASE_BIN)/devMbboSoft.o +LIBOBJS += $(EPICS_BASE_BIN)/devMbboSoftRaw.o +LIBOBJS += $(EPICS_BASE_BIN)/devMbboTestAsyn.o +#LIBOBJS += $(EPICS_BASE_BIN)/devMbboXVme220.o +#LIBOBJS += $(EPICS_BASE_BIN)/devMz8310.o +LIBOBJS += $(EPICS_BASE_BIN)/devPtSoft.o +LIBOBJS += $(EPICS_BASE_BIN)/devSASoft.o +LIBOBJS += $(EPICS_BASE_BIN)/devSiSoft.o +LIBOBJS += $(EPICS_BASE_BIN)/devSiTestAsyn.o +#LIBOBJS += $(EPICS_BASE_BIN)/devSmCompumotor1830.o +#LIBOBJS += $(EPICS_BASE_BIN)/devSmOms6Axis.o +LIBOBJS += $(EPICS_BASE_BIN)/devSoSoft.o +LIBOBJS += $(EPICS_BASE_BIN)/devSoTestAsyn.o +#LIBOBJS += $(EPICS_BASE_BIN)/devTimerMz8310.o +#LIBOBJS += $(EPICS_BASE_BIN)/devWfCamac.o +#LIBOBJS += $(EPICS_BASE_BIN)/devWfComet.o +#LIBOBJS += $(EPICS_BASE_BIN)/devWfDvx2502.o +#LIBOBJS += $(EPICS_BASE_BIN)/devWfJoergerVtr1.o +LIBOBJS += $(EPICS_BASE_BIN)/devWfSoft.o +LIBOBJS += $(EPICS_BASE_BIN)/devWfTestAsyn.o +#LIBOBJS += $(EPICS_BASE_BIN)/devWfXy566Sc.o +#LIBOBJS += $(EPICS_BASE_BIN)/devWfPentek4261.o +#LIBOBJS += $(EPICS_BASE_BIN)/devXy240.o + +#LIBOBJS += $(EPICS_BASE_BIN)/devAB1771IFE.o +#LIBOBJS += $(EPICS_BASE_BIN)/devAB1771IL.o +#LIBOBJS += $(EPICS_BASE_BIN)/devAB1771IR.o +#LIBOBJS += $(EPICS_BASE_BIN)/devAB1771IXE.o +#LIBOBJS += $(EPICS_BASE_BIN)/devAB1771OFE.o +#LIBOBJS += $(EPICS_BASE_BIN)/devABSLCDCM.o +#LIBOBJS += $(EPICS_BASE_BIN)/devABBINARY.o +#LIBOBJS += $(EPICS_BASE_BIN)/devABStatus.o + +#LIBOBJS += $(EPICS_BASE_BIN)/devAiCan.o +#LIBOBJS += $(EPICS_BASE_BIN)/devAoCan.o +#LIBOBJS += $(EPICS_BASE_BIN)/devBiCan.o +#LIBOBJS += $(EPICS_BASE_BIN)/devBoCan.o +#LIBOBJS += $(EPICS_BASE_BIN)/devMbbiCan.o +#LIBOBJS += $(EPICS_BASE_BIN)/devMbboCan.o +#LIBOBJS += $(EPICS_BASE_BIN)/devMbbiDirectCan.o +#LIBOBJS += $(EPICS_BASE_BIN)/devMbboDirectCan.o +#LIBOBJS += $(EPICS_BASE_BIN)/devVmic2534.o + +LIBOBJS += $(EPICS_BASE_BIN)/symb + +# +# Driver support ANSI +# +#LIBOBJS += $(EPICS_BASE_BIN)/drvAb.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvAt5Vxi.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvEpvxi.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvEpvxiMsg.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvHp1404a.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvHpe1368a.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvHpe1445a.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvKscV215.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvMz8310.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvStc.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvTime.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvCaenV265.o + +#LIBOBJS += $(EPICS_BASE_BIN)/drvVipc310.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvVipc610.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvIpMv162.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvIpac.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvTip810.o +# +# Driver support NON ANSI +# +#LIBOBJS += $(EPICS_BASE_BIN)/module_types.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvBB232.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvBb902.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvBb910.o +LIBOBJS += $(EPICS_BASE_BIN)/drvBitBus.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvComet.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvCompuSm.o +LIBOBJS += $(EPICS_BASE_BIN)/drvDvx.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvFp.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvFpm.o +LIBOBJS += $(EPICS_BASE_BIN)/drvGpib.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvJgvtr1.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvMsg.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvOms.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvTranServ.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvVmi4100.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvXy010.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvXy210.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvXy220.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvXy240.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvXy566.o +#LIBOBJS += $(EPICS_BASE_BIN)/drvVmic2534.o +# +#from src/devOpt +# +#LIBOBJS += $(EPICS_BASE_BIN)/devAnalytekGpib.o +#LIBOBJS += $(EPICS_BASE_BIN)/devBBInteract.o +LIBOBJS += $(EPICS_BASE_BIN)/devGpibInteract.o +#LIBOBJS += $(EPICS_BASE_BIN)/devK486Gpib.o +#LIBOBJS += $(EPICS_BASE_BIN)/devLibOpt.o +#LIBOBJS += $(EPICS_BASE_BIN)/devXxDc5009Gpib.o +#LIBOBJS += $(EPICS_BASE_BIN)/devXxDg535Gpib.o +#LIBOBJS += $(EPICS_BASE_BIN)/devXxK196Gpib.o +#LIBOBJS += $(EPICS_BASE_BIN)/devXxK263Gpib.o +#LIBOBJS += $(EPICS_BASE_BIN)/devXxSkeletonGpib.o +#LIBOBJS += $(EPICS_BASE_BIN)/devXxSr620Gpib.o + diff --git a/xxxApp/src/xxxInclude.dbd b/xxxApp/src/xxxInclude.dbd index cc8c398..ad16da9 100644 --- a/xxxApp/src/xxxInclude.dbd +++ b/xxxApp/src/xxxInclude.dbd @@ -1,12 +1,23 @@ -###include "base.dbd" -include "shareBase.dbd" +include "base.dbd" +#include "shareBase.dbd" +include "devMpfString.dbd" include "stdShare.dbd" include "mcaShare.dbd" include "ipShare.dbd" include "devIpUnidig.dbd" +include "devAoDAC128V.dbd" +include "devEpidIp330.dbd" +include "devAiIp330.dbd" include "motorRecord.dbd" include "devSoftMotor.dbd" include "devOms.dbd" #include "devNewport.dbd" #include "devHighland.dbd" #include "devPM500.dbd" +include "camacShare.dbd" +include "devCamacShare.dbd" +include "dxpCamacShare.dbd" +#include "allenBradley.dbd" +include "devLove.dbd" + +#include "xxx.dbd" -- GitLab