use new method to register asSub functions
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
||||
@@ -15,7 +15,6 @@ DBD += base.dbd
|
||||
|
||||
INC += epicsRelease.h
|
||||
INC += iocInit.h
|
||||
INC += asSubRecordFunctions.h
|
||||
|
||||
LIBSRCS += epicsRelease.c
|
||||
LIBSRCS += iocInit.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));
|
||||
}
|
||||
|
||||
@@ -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 */
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user