From e967392227c3f86faae2d1667e7822dca353062a Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 11 Aug 2003 22:22:39 +0000 Subject: [PATCH] Removed device entries from base.dbd into their own .dbd files. Devices for TestAsyn support are not included by base.dbd, but have their own devTestAsyn.dbd file if required. --- src/dev/softDev/Makefile | 2 ++ src/dev/softDev/devSoft.dbd | 26 +++++++++++++++++++ src/dev/testDev/Makefile | 2 ++ src/dev/testDev/devTestAsyn.dbd | 12 +++++++++ src/misc/base.dbd | 45 ++++++++------------------------- 5 files changed, 53 insertions(+), 34 deletions(-) create mode 100644 src/dev/softDev/devSoft.dbd create mode 100644 src/dev/testDev/devTestAsyn.dbd diff --git a/src/dev/softDev/Makefile b/src/dev/softDev/Makefile index 2a21bd44b..c19a64c92 100644 --- a/src/dev/softDev/Makefile +++ b/src/dev/softDev/Makefile @@ -11,6 +11,8 @@ TOP=../../.. include $(TOP)/configure/CONFIG +DBD += devSoft.dbd + LIBSRCS += devAiSoft.c LIBSRCS += devAiSoftRaw.c LIBSRCS += devAoSoft.c diff --git a/src/dev/softDev/devSoft.dbd b/src/dev/softDev/devSoft.dbd new file mode 100644 index 000000000..5dc2f67f8 --- /dev/null +++ b/src/dev/softDev/devSoft.dbd @@ -0,0 +1,26 @@ +# $Id$ + +device(ai,CONSTANT,devAiSoft,"Soft Channel") +device(ai,CONSTANT,devAiSoftRaw,"Raw Soft Channel") +device(ao,CONSTANT,devAoSoft,"Soft Channel") +device(ao,CONSTANT,devAoSoftRaw,"Raw Soft Channel") +device(bi,CONSTANT,devBiSoft,"Soft Channel") +device(bi,CONSTANT,devBiSoftRaw,"Raw Soft Channel") +device(bo,CONSTANT,devBoSoft,"Soft Channel") +device(bo,CONSTANT,devBoSoftRaw,"Raw Soft Channel") +device(event,CONSTANT,devEventSoft,"Soft Channel") +device(longin,CONSTANT,devLiSoft,"Soft Channel") +device(longout,CONSTANT,devLoSoft,"Soft Channel") +device(mbbi,CONSTANT,devMbbiSoft,"Soft Channel") +device(mbbi,CONSTANT,devMbbiSoftRaw,"Raw Soft Channel") +device(mbbiDirect,CONSTANT,devMbbiDirectSoft,"Soft Channel") +device(mbbiDirect,CONSTANT,devMbbiDirectSoftRaw,"Raw Soft Channel") +device(mbbo,CONSTANT,devMbboSoft,"Soft Channel") +device(mbbo,CONSTANT,devMbboSoftRaw,"Raw Soft Channel") +device(mbboDirect,CONSTANT,devMbboDirectSoft,"Soft Channel") +device(mbboDirect,CONSTANT,devMbboDirectSoftRaw,"Raw Soft Channel") +device(stringin,CONSTANT,devSiSoft,"Soft Channel") +device(stringout,CONSTANT,devSoSoft,"Soft Channel") +device(subArray,CONSTANT,devSASoft,"Soft Channel") +device(waveform,CONSTANT,devWfSoft,"Soft Channel") + diff --git a/src/dev/testDev/Makefile b/src/dev/testDev/Makefile index d7bcb5971..cc942d92e 100644 --- a/src/dev/testDev/Makefile +++ b/src/dev/testDev/Makefile @@ -11,6 +11,8 @@ TOP=../../.. include $(TOP)/configure/CONFIG +DBD += devTestAsyn.dbd + LIBSRCS += devAiTestAsyn.c LIBSRCS += devAoTestAsyn.c LIBSRCS += devBiTestAsyn.c diff --git a/src/dev/testDev/devTestAsyn.dbd b/src/dev/testDev/devTestAsyn.dbd new file mode 100644 index 000000000..cfd6610b8 --- /dev/null +++ b/src/dev/testDev/devTestAsyn.dbd @@ -0,0 +1,12 @@ +# $Id$ + +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 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") diff --git a/src/misc/base.dbd b/src/misc/base.dbd index 003a17a5d..41590581d 100644 --- a/src/misc/base.dbd +++ b/src/misc/base.dbd @@ -1,5 +1,13 @@ +# $Id$ +# +# This file defines the standard record types and device support +# provided by Base and (usually) loaded into all IOCs. + +# Menus include "menuGlobal.dbd" include "menuConvert.dbd" + +# Record types include "aiRecord.dbd" include "aoRecord.dbd" include "biRecord.dbd" @@ -25,40 +33,9 @@ include "stringoutRecord.dbd" include "subRecord.dbd" include "subArrayRecord.dbd" include "waveformRecord.dbd" -device(ai,CONSTANT,devAiSoft,"Soft Channel") -device(ai,CONSTANT,devAiSoftRaw,"Raw Soft Channel") -device(ao,CONSTANT,devAoSoft,"Soft Channel") -device(ao,CONSTANT,devAoSoftRaw,"Raw Soft Channel") -device(bi,CONSTANT,devBiSoft,"Soft Channel") -device(bi,CONSTANT,devBiSoftRaw,"Raw Soft Channel") -device(bo,CONSTANT,devBoSoft,"Soft Channel") -device(bo,CONSTANT,devBoSoftRaw,"Raw Soft Channel") -device(event,CONSTANT,devEventSoft,"Soft Channel") -device(longin,CONSTANT,devLiSoft,"Soft Channel") -device(longout,CONSTANT,devLoSoft,"Soft Channel") -device(mbbi,CONSTANT,devMbbiSoft,"Soft Channel") -device(mbbi,CONSTANT,devMbbiSoftRaw,"Raw Soft Channel") -device(mbbiDirect,CONSTANT,devMbbiDirectSoft,"Soft Channel") -device(mbbiDirect,CONSTANT,devMbbiDirectSoftRaw,"Raw Soft Channel") -device(mbbo,CONSTANT,devMbboSoft,"Soft Channel") -device(mbbo,CONSTANT,devMbboSoftRaw,"Raw Soft Channel") -device(mbboDirect,CONSTANT,devMbboDirectSoft,"Soft Channel") -device(mbboDirect,CONSTANT,devMbboDirectSoftRaw,"Raw Soft Channel") -device(stringin,CONSTANT,devSiSoft,"Soft Channel") -device(stringout,CONSTANT,devSoSoft,"Soft Channel") -device(subArray,CONSTANT,devSASoft,"Soft Channel") -device(waveform,CONSTANT,devWfSoft,"Soft Channel") - -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 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") +# Soft and SoftRaw device support +include "devSoft.dbd" +# Access security subroutines registrar(asSub)