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

Merge changes from 3.16 branch into 7.0

Browse Source
This commit is contained in:
Andrew Johnson committed 2018-06-20 23:27:49 -05:00
2 parents 0248570123 7d28ae3732
commit 7e598c60cc
39 files changed
+1207 -330
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

modules/database/src/std/dev/devMbbiDirectSoft.c
+2 -2
View File
@@ -47,7 +47,7 @@ epicsExportAddress(dset, devMbbiDirectSoft);
static long init_record(mbbiDirectRecord *prec)
{
if (recGblInitConstantLink(&prec->inp, DBF_ENUM, &prec->val))
if (recGblInitConstantLink(&prec->inp, DBR_ULONG, &prec->val))
prec->udf = FALSE;
return 0;
@@ -56,7 +56,7 @@ static long init_record(mbbiDirectRecord *prec)
static long readLocked(struct link *pinp, void *dummy)
{
mbbiDirectRecord *prec = (mbbiDirectRecord *) pinp->precord;
long status = dbGetLink(pinp, DBR_USHORT, &prec->val, 0, 0);
long status = dbGetLink(pinp, DBR_ULONG, &prec->val, 0, 0);
if (status) return status;