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

Modify lsodset, set USE_TYPED_DSET

Browse Source
This commit is contained in:
Andrew Johnson
2019-11-16 22:19:38 -06:00
parent 465ab44606
commit 7893445a2e
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ dbRecStd_SRCS += devLiSoft.c
dbRecStd_SRCS += devLoSoft.c
devLsiSoft_CFLAGS += -DUSE_TYPED_DSET
dbRecStd_SRCS += devLsiSoft.c
devLsoSoft_CFLAGS += -DUSE_TYPED_DSET
dbRecStd_SRCS += devLsoSoft.c
dbRecStd_SRCS += devMbbiDirectSoft.c
dbRecStd_SRCS += devMbbiDirectSoftRaw.c
@@ -64,6 +65,7 @@ dbRecStd_SRCS += devBoSoftCallback.c
dbRecStd_SRCS += devCalcoutSoftCallback.c
dbRecStd_SRCS += devI64outSoftCallback.c
dbRecStd_SRCS += devLoSoftCallback.c
devLsoSoftCallback_CFLAGS += -DUSE_TYPED_DSET
dbRecStd_SRCS += devLsoSoftCallback.c
dbRecStd_SRCS += devMbboSoftCallback.c
dbRecStd_SRCS += devMbboDirectSoftCallback.c

2
modules/database/src/std/dev/devLsoSoft.c
View File

@@ -21,6 +21,6 @@ static long write_string(lsoRecord *prec)
}
lsodset devLsoSoft = {
5, NULL, NULL, NULL, NULL, write_string
{ 5, NULL, NULL, NULL, NULL }, write_string
};
epicsExportAddress(dset, devLsoSoft);

2
modules/database/src/std/dev/devLsoSoftCallback.c
View File

@@ -40,7 +40,7 @@ static long write_string(lsoRecord *prec)
}
lsodset devLsoSoftCallback = {
5, NULL, NULL, NULL, NULL, write_string
{ 5, NULL, NULL, NULL, NULL }, write_string
};
epicsExportAddress(dset, devLsoSoftCallback);

2
modules/database/src/std/dev/devStdio.c
View File

@@ -103,7 +103,7 @@ static long write_lso(lsoRecord *prec)
}
lsodset devLsoStdio = {
5, NULL, init_lso, NULL, NULL, write_lso
{ 5, NULL, init_lso, NULL, NULL }, write_lso
};
epicsExportAddress(dset, devLsoStdio);

1
modules/database/src/std/rec/Makefile
View File

@@ -31,6 +31,7 @@ stdRecords += longinRecord
stdRecords += longoutRecord
lsiRecord_CFLAGS += -DUSE_TYPED_DSET
stdRecords += lsiRecord
lsoRecord_CFLAGS += -DUSE_TYPED_DSET
stdRecords += lsoRecord
stdRecords += mbbiRecord
stdRecords += mbbiDirectRecord

6
modules/database/src/std/rec/lsoRecord.c
View File

@@ -70,15 +70,15 @@ static long init_record(struct dbCommon *pcommon, int pass)
}
/* must have a write_string function defined */
if (pdset->number < 5 || !pdset->write_string) {
if (pdset->common.number < 5 || !pdset->write_string) {
recGblRecordError(S_dev_missingSup, prec, "lso: init_record");
return S_dev_missingSup;
}
dbLoadLinkLS(&prec->dol, prec->val, prec->sizv, &prec->len);
if (pdset->init_record) {
long status = pdset->init_record(prec);
if (pdset->common.init_record) {
long status = pdset->common.init_record(pcommon);
if (status)
return status;

9
modules/database/src/std/rec/lsoRecord.dbd
View File

@@ -10,13 +10,10 @@ recordtype(lso) {
%#include "devSup.h"
%
%/* Declare Device Support Entry Table */
%struct lsoRecord;
%typedef struct lsodset {
% long number;
% DEVSUPFUN report;
% DEVSUPFUN init;
% DEVSUPFUN init_record;
% DEVSUPFUN get_ioint_info;
% DEVSUPFUN write_string;
% dset common;
% long (*write_string)(struct lsoRecord *prec);
%} lsodset;
%
field(VAL,DBF_NOACCESS) {