diff --git a/src/iocsh/dbAccessRegister.c b/src/iocsh/dbAccessRegister.c index 3320c4ac7..73173fc10 100644 --- a/src/iocsh/dbAccessRegister.c +++ b/src/iocsh/dbAccessRegister.c @@ -23,7 +23,6 @@ #include "iocsh.h" #include "registryRecordType.h" #include "dbAccessRegister.h" -#include "asSubRecordFunctions.h" #include "iocsh.h" /* dbLoadDatabase */ @@ -75,5 +74,4 @@ void epicsShareAPI dbAccessRegister(void) iocshRegister(&dbLoadRecordsFuncDef,dbLoadRecordsCallFunc); iocshRegister(&dbLoadTemplateFuncDef,dbLoadTemplateCallFunc); iocshRegister(&iocInitFuncDef,iocInitCallFunc); - asSubRecordFunctionsRegister(); } diff --git a/src/misc/Makefile b/src/misc/Makefile index 50281c849..7af28a536 100644 --- a/src/misc/Makefile +++ b/src/misc/Makefile @@ -15,7 +15,6 @@ DBD += base.dbd INC += epicsRelease.h INC += iocInit.h -INC += asSubRecordFunctions.h LIBSRCS += epicsRelease.c LIBSRCS += iocInit.c diff --git a/src/misc/asSubRecordFunctions.c b/src/misc/asSubRecordFunctions.c index cab0828ea..e2c9cde8a 100644 --- a/src/misc/asSubRecordFunctions.c +++ b/src/misc/asSubRecordFunctions.c @@ -30,7 +30,7 @@ #include "asDbLib.h" #include "subRecord.h" #define epicsExportSharedSymbols -#include "asSubRecordFunctions.h" +#include "shareLib.h" /* The following is provided for access security*/ /*It allows a CA client to force access security initialization*/ @@ -85,7 +85,7 @@ static registryFunctionRef asSubRef[] = { {"asSubProcess",(REGISTRYFUNCTION)asSubProcess} }; -void epicsShareAPI asSub(void) +epicsShareFunc void epicsShareAPI asSub(void) { registryFunctionRefAdd(asSubRef,NELEMENTS(asSubRef)); } diff --git a/src/misc/asSubRecordFunctions.h b/src/misc/asSubRecordFunctions.h deleted file mode 100644 index f8deafe5d..000000000 --- a/src/misc/asSubRecordFunctions.h +++ /dev/null @@ -1,34 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* asSubRecordFunctions.h */ - -/* Author: Marty Kraimer Date: 01MAY2000 */ - -#ifndef INCasSubRecordFunctionsh -#define INCasSubRecordFunctionsh - -#include "shareLib.h" - -#ifdef __cplusplus -extern "C" { -#endif - -struct subRecord; - -epicsShareFunc long epicsShareAPI asSubInit( - struct subRecord *precord,void *process); -epicsShareFunc long epicsShareAPI asSubProcess(struct subRecord *precord); -epicsShareFunc void epicsShareAPI asSubRecordFunctionsRegister(void); - -#ifdef __cplusplus -} -#endif - -#endif /* INCasSubRecordFunctionsh */ diff --git a/src/misc/base.dbd b/src/misc/base.dbd index 42cc92803..f95ee11f7 100644 --- a/src/misc/base.dbd +++ b/src/misc/base.dbd @@ -48,3 +48,5 @@ device(stringin,CONSTANT,devSiSoft,"Soft Channel") device(stringout,CONSTANT,devSoSoft,"Soft Channel") device(subArray,CONSTANT,devSASoft,"Soft Channel") device(waveform,CONSTANT,devWfSoft,"Soft Channel") + +registrar(asSub)