diff --git a/src/makeBaseApp/top/exampleApp/src/base.dbd b/src/makeBaseApp/top/exampleApp/src/base.dbd
index aab430911..10409e169 100644
--- a/src/makeBaseApp/top/exampleApp/src/base.dbd
+++ b/src/makeBaseApp/top/exampleApp/src/base.dbd
@@ -1,9 +1,10 @@
 include "menuGlobal.dbd"
 include "menuConvert.dbd"
-include "aiRecord.dbd"
+
 #include "aaiRecord.dbd"
-include "aoRecord.dbd"
 #include "aaoRecord.dbd"
+include "aiRecord.dbd"
+include "aoRecord.dbd"
 include "biRecord.dbd"
 include "boRecord.dbd"
 include "calcRecord.dbd"
@@ -16,6 +17,7 @@ include "dfanoutRecord.dbd"
 #include "ereventRecord.dbd"
 include "eventRecord.dbd"
 include "fanoutRecord.dbd"
+#include "gsubRecord.dbd"
 #include "histogramRecord.dbd"
 include "longinRecord.dbd"
 include "longoutRecord.dbd"
@@ -23,6 +25,7 @@ include "mbbiRecord.dbd"
 include "mbbiDirectRecord.dbd"
 include "mbboRecord.dbd"
 include "mbboDirectRecord.dbd"
+#include "palRecord.dbd"
 include "permissiveRecord.dbd"
 #include "pidRecord.dbd"
 #include "pulseCounterRecord.dbd"
@@ -36,206 +39,189 @@ include "stateRecord.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"
+
+# Soft and Raw Soft Channel
 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(longin,INST_IO,devLiVXStats,"VX stats")
 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(wait,CONSTANT,devWaitIoEvent,"Soft Channel")
 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")
+
+# Test Asyn
+#device(ai,CONSTANT,devAiTestAsyn,"Test Asyn")
+#device(ao,CONSTANT,devAoTestAsyn,"Test Asyn")
+#device(bi,CONSTANT,devBiTestAsyn,"Test Asyn")
+#device(bo,CONSTANT,devBoTestAsyn,"Test Asyn")
+#device(event,CONSTANT,devEventTestIoEvent,"Test IoEvent")
+#device(histogram,CONSTANT,devHistogramTestAsyn,"Test Asyn")
+#device(mbbi,CONSTANT,devMbbiTestAsyn,"Test Asyn")
+#device(mbbo,CONSTANT,devMbboTestAsyn,"Test Asyn")
+#device(stringin,CONSTANT,devSiTestAsyn,"Test Asyn")
+#device(stringout,CONSTANT,devSoTestAsyn,"Test Asyn")
 #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")
+
+# Acromag AVME9440
+#device(bi,VME_IO,devBiAvme9440,"AVME9440 I")
+#device(mbbi,VME_IO,devMbbiAvme9440,"AVME9440 I")
+#device(bo,VME_IO,devBoAvme9440,"AVME9440 O")
+#device(mbbo,VME_IO,devMbboAvme9440,"AVME9440 O")
+
+# APS Event gx/rx
 #device(egevent,VME_IO,devEgEvent,"APS event generator E")
+#device(eg,VME_IO,devEg,"APS event generator G")
 #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")
+#device(event,VME_IO,devErEpicsEvent,"APS event receiver")
 
-#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)
+# AT5
 #driver(drvAt5Vxi)
-#driver(drvCompuSm)
-#driver(drvOms)
-#driver(drvMz8310)
-#driver(drvHpe1368a)
-#driver(drvXy240)
-#driver(drvKscV215)
-#driver(drvComet)
-#driver(drvJgvtr1)
+#device(ai,VME_IO,devAiAt5Vxi,"VXI-AT5-AI")
+#device(ao,VME_IO,devAoAt5Vxi,"VXI-AT5-AO")
+#device(bi,VME_IO,devBiAt5Vxi,"VXI-AT5-BI")
+#device(mbbi,VME_IO,devMbbiAt5Vxi,"VXI-AT5-BI")
+#device(mbbiDirect,VME_IO,devMbbiDirectAt5Vxi,"VXI-AT5-BI")
+#device(bo,VME_IO,devBoAt5Vxi,"VXI-AT5-BO")
+#device(mbbo,VME_IO,devMbboAt5Vxi,"VXI-AT5-BO")
+#device(mbboDirect,VME_IO,devMbboDirectAt5Vxi,"VXI-AT5-BO")
+#device(timer,VME_IO,devTmAt5Vxi,"VXI-AT5-TIME")
+
+# AT8
 #driver(drvFp)
 #driver(drvFpm)
-#driver(drvIpac)
-#driver(drvTip810)
-#driver(drvVmi2534)
+#device(bi,VME_IO,devBiAt8Fp,"AT8-FP10S")
+#device(bo,VME_IO,devBoAt8Fp,"AT8-FP10S")
+#device(mbbi,VME_IO,devMbbiAt8Fp,"AT8-FP10S")
+#device(mbbo,VME_IO,devMbboAt8Fp,"AT8-FP10S")
+
+# Comet
+#driver(drvComet)
+#device(waveform,VME_IO,devWfComet,"Comet Digitizer")
+#device(waveform,VME_IO,devWfComet,"Omnibyte-COMET")
+
+# Compumotor
+#driver(drvCompuSm)
+#device(steppermotor,VME_IO,devSmCompumotor1830,"Compumotor 1830")
+
+# DVX-2502
+#driver(drvDvx)
+#device(ai,VME_IO,devAiDvx2502,"DVX-2502")
+#device(waveform,VME_IO,devWfDvx2502,"DVX-2502")
+
+# GPIB Common
+#driver(drvGpib)
+
+# HPE1368
+#driver(drvHpe1368a)
+#device(bi,VME_IO,devBiHpe1368a,"VXI-HPE1368-VS")
+#device(bo,VME_IO,devBoHpe1368a,"VXI-HPE1368-VS")
+#device(mbbi,VME_IO,devMbbiHpe1368a,"VXI-HPE1368-VS")
+#device(mbbo,VME_IO,devMbboHpe1368a,"VXI-HPE1368-VS")
+
+# Joerger
+#driver(drvJgvtr1)
+#device(waveform,VME_IO,devWfJoergerVtr1,"Joerger Digitizer")
+#device(waveform,VME_IO,devWfJoergerVtr1,"Joerger-VTR1")
+
+# Keithley-486
+#device(ai,GPIB_IO,devAiK486Gpib,"Keithley-486")
+#device(bo,GPIB_IO,devBoK486Gpib,"Keithley-486")
+#device(mbbo,GPIB_IO,devMbboK486Gpib,"Keithley-486")
+
+# KSC-V215
+#driver(drvKscV215)
+#device(ai,VME_IO,devAiKscV215,"KSC-V215")
+
+# MPV-902
+#driver(drvBb902)
+#device(bo,VME_IO,devBoMpv902,"MPV-902")
+#device(mbbo,VME_IO,devMbboMpv902,"MPV-902")
+#device(mbboDirect,VME_IO,devMbboDirectMpv902,"MPV-902")
+
+# MPV-910
+#driver(drvBb910)
+#device(bi,VME_IO,devBiMpv910,"MPV-910")
+#device(mbbi,VME_IO,devMbbiMpv910,"MPV-910")
+#device(mbbiDirect,VME_IO,devMbbiDirectMpv910,"MPV-910")
+
+# Mizar-8310
+#driver(drvMz8310)
+#device(event,VME_IO,devEventMz8310,"Mizar-8310")
+#device(pulseCounter,VME_IO,devPcMz8310,"Mizar-8310")
+#device(pulseDelay,VME_IO,devPdMz8310,"Mizar-8310")
+#device(pulseTrain,VME_IO,devPtMz8310,"Mizar-8310")
+#device(timer,VME_IO,devTmMizar8310,"Mizar-8310")
+
+# OMS 6-Axis
+#driver(drvOms)
+#device(steppermotor,VME_IO,devSmOms6Axis,"OMS 6-Axis")
+
+# Pentek 4261
+#device(waveform,VME_IO,devWfPentek4261,"Pentek 4261")
+
+# VMIC
+#driver(drvVmi4100)
+#device(ao,VME_IO,devAoVmiVme4100,"VMIVME-4100")
+
+# VXI Common
+#driver(drvVxi)
+
+# VxWorks
+#device(ai,INST_IO,devAiVXStats,"VX stats")
+#device(ao,INST_IO,devAoVXStats,"VX stats")
+#device(longin,INST_IO,devLiVXStats,"VX stats")
+#include "symb.dbd"
+
+# XVME-210
+#driver(drvXy210)
+#device(bi,VME_IO,devBiXVme210,"XVME-210")
+#device(mbbi,VME_IO,devMbbiXVme210,"XVME-210")
+#device(mbbiDirect,VME_IO,devMbbiDirectXVme210,"XVME-210")
+
+# XVME-220
+#driver(drvXy220)
+#device(bo,VME_IO,devBoXVme220,"XVME-220")
+#device(mbbo,VME_IO,devMbboXVme220,"XVME-220")
+#device(mbboDirect,VME_IO,devMbboDirectXVme220,"XVME-220")
+
+# XYCOM-240
+#driver(drvXy240)
+#device(bi,VME_IO,devBiXy240,"XYCOM-240")
+#device(bo,VME_IO,devBoXy240,"XYCOM-240")
+#device(mbbi,VME_IO,devMbbiXy240,"XYCOM-240")
+#device(mbbo,VME_IO,devMbboXy240,"XYCOM-240")
+
+# XYCOM-566
+#driver(drvXy566)
+#device(ai,VME_IO,devAiXy566DiL,"XYCOM-566 Dif Latched")
+#device(ai,VME_IO,devAiXy566Di,"XYCOM-566 Dif Scanned")
+#device(ai,VME_IO,devAiXy566Se,"XYCOM-566 SE Scanned")
+#device(waveform,VME_IO,devWfXy566Sc,"XYCOM-566 Single Channel")
+
 #include "bptTypeJdegC.dbd"
 #include "bptTypeJdegF.dbd"
 #include "bptTypeKdegC.dbd"
diff --git a/src/makeBaseApp/top/exampleApp/src/baseLIBOBJS b/src/makeBaseApp/top/exampleApp/src/baseLIBOBJS
index 36dd9cddb..6034f2be9 100644
--- a/src/makeBaseApp/top/exampleApp/src/baseLIBOBJS
+++ b/src/makeBaseApp/top/exampleApp/src/baseLIBOBJS
@@ -29,9 +29,6 @@ LIBOBJS += $(EPICS_BASE_BIN)/permissiveRecord.o
 #LIBOBJS += $(EPICS_BASE_BIN)/pulseDelayRecord.o
 #LIBOBJS += $(EPICS_BASE_BIN)/pulseTrainRecord.o
 #LIBOBJS += $(EPICS_BASE_BIN)/scanRecord.o
-#LIBOBJS += $(EPICS_BASE_BIN)/recWaitCa.o
-#LIBOBJS += $(EPICS_BASE_BIN)/recDynLink.o
-#LIBOBJS += $(EPICS_BASE_BIN)/recDynLinkTest.o
 LIBOBJS += $(EPICS_BASE_BIN)/selRecord.o
 LIBOBJS += $(EPICS_BASE_BIN)/seqRecord.o
 LIBOBJS += $(EPICS_BASE_BIN)/stateRecord.o
@@ -42,175 +39,165 @@ 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)/recWaitCa.o
+#LIBOBJS += $(EPICS_BASE_BIN)/recDynLink.o
+#LIBOBJS += $(EPICS_BASE_BIN)/recDynLinkTest.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
+
+# Soft and Raw Soft Channel
 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)/devHistogramSoft.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)/devMbbiDirectSoft.o
+LIBOBJS += $(EPICS_BASE_BIN)/devMbbiDirectSoftRaw.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
+# Test Asyn
+#LIBOBJS += $(EPICS_BASE_BIN)/devAiTestAsyn.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devAoTestAsyn.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devBiTestAsyn.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devBoTestAsyn.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devEventTestIoEvent.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devHistogramTestAsyn.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devMbbiTestAsyn.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devMbboTestAsyn.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devSiTestAsyn.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devSoTestAsyn.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devWfTestAsyn.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
+# Acromag AVME9440
+#LIBOBJS += $(EPICS_BASE_BIN)/devAvme9440.o
 
-#LIBOBJS += $(EPICS_BASE_BIN)/symb
+# APS Event gx/rx
+#LIBOBJS += $(EPICS_BASE_BIN)/devApsEg.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devApsEr.o
 
-#
-# Driver support ANSI
-#
-#LIBOBJS += $(EPICS_BASE_BIN)/drvAb.o
+# AT5
 #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)/devAt5Vxi.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
+# AT8
 #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
+#LIBOBJS += $(EPICS_BASE_BIN)/devAt8Fp.o
 
+# Comet
+#LIBOBJS += $(EPICS_BASE_BIN)/drvComet.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devWfComet.o
+
+# Compumotor
+#LIBOBJS += $(EPICS_BASE_BIN)/drvCompuSm.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devSmCompumotor1830.o
+
+# DVX-2502
+#LIBOBJS += $(EPICS_BASE_BIN)/drvDvx.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devAiDvx2502.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devWfDvx2502.o
+
+# GPIB Common
+#LIBOBJS += $(EPICS_BASE_BIN)/drvGpib.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devCommonGpib.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devGpibInteract.o
+
+# HPE1368
+#LIBOBJS += $(EPICS_BASE_BIN)/drvHpe1368a.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devHpe1368a.o
+
+# Joerger
+#LIBOBJS += $(EPICS_BASE_BIN)/drvJgvtr1.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devWfJoergerVtr1.o
+
+# Keithley-486
+#LIBOBJS += $(EPICS_BASE_BIN)/devK486Gpib.o
+
+# KSC-V215
+#LIBOBJS += $(EPICS_BASE_BIN)/drvKscV215.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devAiKscV215.o
+
+# MPV-902
+#LIBOBJS += $(EPICS_BASE_BIN)/drvBb902.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devBoMpv902.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devMbboDirectMpv902.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devMbboMpv902.o
+
+# MPV-910
+#LIBOBJS += $(EPICS_BASE_BIN)/drvBb910.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devBiMpv910.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devMbbiDirectMpv910.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devMbbiMpv910.o
+
+# Mizar-8310
+#LIBOBJS += $(EPICS_BASE_BIN)/drvMz8310.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devMz8310.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devTimerMz8310.o
+
+# OMS 6-Axis
+#LIBOBJS += $(EPICS_BASE_BIN)/drvOms.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devSmOms6Axis.o
+
+# Pentek 4261
+#LIBOBJS += $(EPICS_BASE_BIN)/devWfPentek4261.o
+
+# VMIC
+#LIBOBJS += $(EPICS_BASE_BIN)/drvVmi4100.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devAoVmiVme4100.o
+
+# VXI Common
+#LIBOBJS += $(EPICS_BASE_BIN)/drvEpvxi.o
+#LIBOBJS += $(EPICS_BASE_BIN)/drvEpvxiMsg.o
+
+# VxWorks
+#LIBOBJS += $(EPICS_BASE_BIN)/devVXStats.o
+#LIBOBJS += $(EPICS_BASE_BIN)/symb
+
+# XVME-210
+#LIBOBJS += $(EPICS_BASE_BIN)/drvXy210.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devBiXVme210.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devMbbiXVme210.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devMbbiDirectXVme210.o
+
+# XVME-220
+#LIBOBJS += $(EPICS_BASE_BIN)/drvXy220.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devBoXVme220.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devMbboXVme220.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devMbboDirectXVme220.o
+
+# XYCOM-240
+#LIBOBJS += $(EPICS_BASE_BIN)/drvXy240.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devXy240.o
+
+# XYCOM-566
+#LIBOBJS += $(EPICS_BASE_BIN)/drvXy566.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devAiXy566Di.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devAiXy566DiL.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devAiXy566Se.o
+#LIBOBJS += $(EPICS_BASE_BIN)/devWfXy566Sc.o
+
+# Other old drivers (NB: no driver entry in base.dbd ...)
+#LIBOBJS += $(EPICS_BASE_BIN)/drvHp1404a.o
+#LIBOBJS += $(EPICS_BASE_BIN)/drvHpe1445a.o
+#LIBOBJS += $(EPICS_BASE_BIN)/drvStc.o
+#LIBOBJS += $(EPICS_BASE_BIN)/drvCaenV265.o
+
+# Module address changes
+#
+#LIBOBJS += $(EPICS_BASE_BIN)/module_types.o