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

Export and use int64outdset, set USE_TYPED_DSET

Browse Source
This commit is contained in:
Andrew Johnson
2019-11-16 23:02:34 -06:00
parent 7e1d165092
commit b1b51cc70e
6 changed files with 29 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/database/src/std/dev/Makefile
+2
View File
@@ -30,6 +30,7 @@ dbRecStd_SRCS += devEventSoft.c
dbRecStd_SRCS += devHistogramSoft.c
devI64inSoft_CFLAGS += -DUSE_TYPED_DSET
dbRecStd_SRCS += devI64inSoft.c
devI64outSoft_CFLAGS += -DUSE_TYPED_DSET
dbRecStd_SRCS += devI64outSoft.c
dbRecStd_SRCS += devLiSoft.c
dbRecStd_SRCS += devLoSoft.c
@@ -65,6 +66,7 @@ dbRecStd_SRCS += devSiSoftCallback.c
dbRecStd_SRCS += devAoSoftCallback.c
dbRecStd_SRCS += devBoSoftCallback.c
dbRecStd_SRCS += devCalcoutSoftCallback.c
devI64outSoftCallback_CFLAGS += -DUSE_TYPED_DSET
dbRecStd_SRCS += devI64outSoftCallback.c
dbRecStd_SRCS += devLoSoftCallback.c
devLsoSoftCallback_CFLAGS += -DUSE_TYPED_DSET
modules/database/src/std/dev/devI64outSoft.c
+8 -21
View File
@@ -25,27 +25,7 @@
#include "int64outRecord.h"
#include "epicsExport.h"
/* Create the dset for devI64outSoft */
static long init_record(int64outRecord *prec);
static long write_int64out(int64outRecord *prec);
struct {
long number;
DEVSUPFUN report;
DEVSUPFUN init;
DEVSUPFUN init_record;
DEVSUPFUN get_ioint_info;
DEVSUPFUN write_int64out;
} devI64outSoft = {
5,
NULL,
NULL,
init_record,
NULL,
write_int64out
};
epicsExportAddress(dset, devI64outSoft);
static long init_record(int64outRecord *prec)
static long init_record(dbCommon *common)
{
return 0;
}
@@ -55,3 +35,10 @@ static long write_int64out(int64outRecord *prec)
dbPutLink(&prec->out, DBR_INT64, &prec->val,1);
return 0;
}
/* Create the dset for devI64outSoft */
int64outdset devI64outSoft = {
{ 5, NULL, NULL, init_record, NULL }, write_int64out
};
epicsExportAddress(dset, devI64outSoft);
modules/database/src/std/dev/devI64outSoftCallback.c
+6 -19
View File
@@ -25,25 +25,6 @@
#include "int64outRecord.h"
#include "epicsExport.h"
/* Create the dset for devI64outSoftCallback */
static long write_int64out(int64outRecord *prec);
struct {
long number;
DEVSUPFUN report;
DEVSUPFUN init;
DEVSUPFUN init_record;
DEVSUPFUN get_ioint_info;
DEVSUPFUN write_int64out;
} devI64outSoftCallback = {
5,
NULL,
NULL,
NULL,
NULL,
write_int64out
};
epicsExportAddress(dset, devI64outSoftCallback);
static long write_int64out(int64outRecord *prec)
{
struct link *plink = &prec->out;
@@ -60,3 +41,9 @@ static long write_int64out(int64outRecord *prec)
return status;
}
/* Create the dset for devI64outSoftCallback */
int64outdset devI64outSoftCallback = {
{ 5, NULL, NULL, NULL, NULL }, write_int64out
};
epicsExportAddress(dset, devI64outSoftCallback);