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

Modify lsidset, set USE_TYPED_DSET

Browse Source
This commit is contained in:
Andrew Johnson
2019-11-16 22:18:32 -06:00
parent 23450fcfc8
commit 465ab44606
6 changed files with 13 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

@@ -32,6 +32,7 @@ dbRecStd_SRCS += devI64inSoft.c
dbRecStd_SRCS += devI64outSoft.c
dbRecStd_SRCS += devLiSoft.c
dbRecStd_SRCS += devLoSoft.c
devLsiSoft_CFLAGS += -DUSE_TYPED_DSET
dbRecStd_SRCS += devLsiSoft.c
dbRecStd_SRCS += devLsoSoft.c
dbRecStd_SRCS += devMbbiDirectSoft.c
@@ -73,6 +74,7 @@ dbRecStd_SRCS += devSoSoftCallback.c
dbRecStd_SRCS += devTimestamp.c
devStdio_CFLAGS += -DUSE_TYPED_DSET
dbRecStd_SRCS += devStdio.c
devEnviron_CFLAGS += -DUSE_TYPED_DSET
dbRecStd_SRCS += devEnviron.c
dbRecStd_SRCS += asSubRecordFunctions.c

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

@@ -69,7 +69,7 @@ static long read_lsi(lsiRecord *prec)
}
lsidset devLsiEnviron = {
5, NULL, init_lsi, NULL, NULL, read_lsi
{5, NULL, init_lsi, NULL, NULL }, read_lsi
};
epicsExportAddress(dset, devLsiEnviron);

5
modules/database/src/std/dev/devLsiSoft.c
View File

@@ -17,8 +17,9 @@
#include "lsiRecord.h"
#include "epicsExport.h"
static long init_record(lsiRecord *prec)
static long init_record(dbCommon *common)
{
lsiRecord *prec = (lsiRecord *)common;
dbLoadLinkLS(&prec->inp, prec->val, prec->sizv, &prec->len);
return 0;
@@ -49,6 +50,6 @@ static long read_string(lsiRecord *prec)
}
lsidset devLsiSoft = {
5, NULL, NULL, init_record, NULL, read_string
{ 5, NULL, NULL, init_record, NULL }, read_string
};
epicsExportAddress(dset, devLsiSoft);