epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

- Record updates:

Browse Source 
. histogramRecord
  . eventRecord
  . aaiRecord
  . aaoRecord

- Device support updates:
  . devHistogramSoft (histogramRecord)
  . devEventSoft (eventRecord)
  . devAaiSoft (aaiRecord)
  . devAaoSoft (aaoRecord)

- Fixes in already-migrated records
  . lsiRecord: replaced 'struct lsidset' with typedef(ed) 'lsidset'
  . int64inRecord (similar as above)
  . int64outRecord (similar as above)
  . calcRecord: minor fix in init_record() prototype declaration

- Note: the comments about return values in dset structs were outright copied from .c to .pod/.dbd files without confirmation if they are indeed correct!
This commit is contained in:
gabadinho
2020-02-14 11:07:11 +01:00
parent 754eb73334
commit c54237e34a
18 changed files with 113 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/database/src/std/dev/Makefile
View File

@@ -13,7 +13,9 @@ SRC_DIRS += $(STDDIR)/dev
DBD += devSoft.dbd
devAaiSoft_CFLAGS += -DUSE_TYPED_DSET
dbRecStd_SRCS += devAaiSoft.c
devAaoSoft_CFLAGS += -DUSE_TYPED_DSET
dbRecStd_SRCS += devAaoSoft.c
devAiSoft_CFLAGS += -DUSE_TYPED_DSET
dbRecStd_SRCS += devAiSoft.c
@@ -35,7 +37,9 @@ dbRecStd_SRCS += devBoSoftRaw.c
dbRecStd_SRCS += devBoDbState.c
devCalcoutSoft_CFLAGS += -DUSE_TYPED_DSET
dbRecStd_SRCS += devCalcoutSoft.c
devEventSoft_CFLAGS += -DUSE_TYPED_DSET
dbRecStd_SRCS += devEventSoft.c
devHistogramSoft_CFLAGS += -DUSE_TYPED_DSET
dbRecStd_SRCS += devHistogramSoft.c
devI64inSoft_CFLAGS += -DUSE_TYPED_DSET
dbRecStd_SRCS += devI64inSoft.c

24
modules/database/src/std/dev/devAaiSoft.c
View File

@@ -32,28 +32,18 @@
#include "epicsExport.h"
/* Create the dset for devAaiSoft */
static long init_record();
static long read_aai();
static long init_record(dbCommon *pcommon);
static long read_aai(aaiRecord *prec);
struct {
long number;
DEVSUPFUN report;
DEVSUPFUN init;
DEVSUPFUN init_record;
DEVSUPFUN get_ioint_info;
DEVSUPFUN read_aai;
} devAaiSoft = {
5,
NULL,
NULL,
init_record,
NULL,
aaidset devAaiSoft = {
{5, NULL, NULL, init_record, NULL},
read_aai
};
epicsExportAddress(dset,devAaiSoft);
epicsExportAddress(dset, devAaiSoft);
static long init_record(aaiRecord *prec)
static long init_record(dbCommon *pcommon)
{
aaiRecord *prec = (aaiRecord *)pcommon;
DBLINK *plink = &prec->inp;
/* This is pass 0, link hasn't been initialized yet */

25
modules/database/src/std/dev/devAaoSoft.c
View File

@@ -30,28 +30,19 @@
#include "epicsExport.h"
/* Create the dset for devAaoSoft */
static long init_record();
static long write_aao();
static long init_record(dbCommon *pcommon);
static long write_aao(aaoRecord *prec);
struct {
long number;
DEVSUPFUN report;
DEVSUPFUN init;
DEVSUPFUN init_record;
DEVSUPFUN get_ioint_info;
DEVSUPFUN read_aao;
} devAaoSoft = {
5,
NULL,
NULL,
init_record,
NULL,
aaodset devAaoSoft = {
{5, NULL, NULL, init_record, NULL},
write_aao
};
epicsExportAddress(dset,devAaoSoft);
epicsExportAddress(dset, devAaoSoft);
static long init_record(aaoRecord *prec)
static long init_record(dbCommon *pcommon)
{
aaoRecord *prec = (aaoRecord *)pcommon;
if (dbLinkIsConstant(&prec->out)) {
prec->nord = 0;
}

21
modules/database/src/std/dev/devEventSoft.c
View File

@@ -25,28 +25,19 @@
#include "epicsExport.h"
/* Create the dset for devEventSoft */
static long init_record(eventRecord *prec);
static long init_record(dbCommon *pcommon);
static long read_event(eventRecord *prec);
struct {
long number;
DEVSUPFUN report;
DEVSUPFUN init;
DEVSUPFUN init_record;
DEVSUPFUN get_ioint_info;
DEVSUPFUN read_event;
} devEventSoft = {
5,
NULL,
NULL,
init_record,
NULL,
eventdset devEventSoft = {
{5, NULL, NULL, init_record, NULL},
read_event
};
epicsExportAddress(dset, devEventSoft);
static long init_record(eventRecord *prec)
static long init_record(dbCommon *pcommon)
{
eventRecord *prec = (eventRecord *)pcommon;
if (recGblInitConstantLink(&prec->inp, DBF_STRING, prec->val))
prec->udf = FALSE;

30
modules/database/src/std/dev/devHistogramSoft.c
View File

@@ -28,29 +28,19 @@
#include "epicsExport.h"
/* Create the dset for devHistogramSoft */
static long init_record(histogramRecord *prec);
static long init_record(dbCommon *pcommon);
static long read_histogram(histogramRecord *prec);
struct {
long number;
DEVSUPFUN report;
DEVSUPFUN init;
DEVSUPFUN init_record;
DEVSUPFUN get_ioint_info;
DEVSUPFUN read_histogram;
DEVSUPFUN special_linconv;
}devHistogramSoft={
6,
NULL,
NULL,
init_record,
NULL,
read_histogram,
NULL
histogramdset devHistogramSoft = {
{6, NULL, NULL, init_record, NULL},
read_histogram, NULL
};
epicsExportAddress(dset,devHistogramSoft);
static long init_record(histogramRecord *prec)
epicsExportAddress(dset, devHistogramSoft);
static long init_record(dbCommon *pcommon)
{
histogramRecord *prec = (histogramRecord *)pcommon;
if (recGblInitConstantLink(&prec->svl,DBF_DOUBLE,&prec->sgnl))
prec->udf = FALSE;