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

std/dev,std/rec: treat val/sval/rval as ULONG for mbbiDirect/mbboDirect

Browse Source
This commit is contained in:
Ralph Lange
2018-05-15 16:54:46 +02:00
parent c80783dfa9
commit 7e293e60a6
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/std/dev/devMbbiDirectSoft.c
View File

@@ -47,7 +47,7 @@ epicsExportAddress(dset, devMbbiDirectSoft);
static long init_record(mbbiDirectRecord *prec)
{
if (recGblInitConstantLink(&prec->inp, DBR_LONG, &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_LONG, &prec->val, 0, 0);
long status = dbGetLink(pinp, DBR_ULONG, &prec->val, 0, 0);
if (status) return status;

4
src/std/dev/devMbbiDirectSoftCallback.c
View File

@@ -58,7 +58,7 @@ static void getCallback(processNotify *ppn, notifyGetType type)
}
assert(type == getFieldType);
pdevPvt->status = dbChannelGetField(ppn->chan, DBR_LONG,
pdevPvt->status = dbChannelGetField(ppn->chan, DBR_ULONG,
&pdevPvt->buffer, &pdevPvt->options, &no_elements, 0);
}
@@ -153,7 +153,7 @@ static long init(int pass)
static long init_record(mbbiDirectRecord *prec)
{
if (recGblInitConstantLink(&prec->inp, DBR_LONG, &prec->val))
if (recGblInitConstantLink(&prec->inp, DBR_ULONG, &prec->val))
prec->udf = FALSE;
return 0;

2
src/std/dev/devMbbiDirectSoftRaw.c
View File

@@ -59,7 +59,7 @@ static long init_record(mbbiDirectRecord *prec)
static long read_mbbi(mbbiDirectRecord *prec)
{
if (!dbGetLink(&prec->inp, DBR_LONG, &prec->rval, 0, 0)) {
if (!dbGetLink(&prec->inp, DBR_ULONG, &prec->rval, 0, 0)) {
prec->rval &= prec->mask;
if (dbLinkIsConstant(&prec->tsel) &&
prec->tse == epicsTimeEventDeviceTime)

2
src/std/dev/devMbboDirectSoft.c
View File

@@ -21,7 +21,7 @@
static long write_mbbo(mbboDirectRecord *prec)
{
dbPutLink(&prec->out, DBR_LONG, &prec->val, 1);
dbPutLink(&prec->out, DBR_ULONG, &prec->val, 1);
return 0;
}

4
src/std/dev/devMbboDirectSoftCallback.c
View File

@@ -29,11 +29,11 @@ static long write_mbbo(mbboDirectRecord *prec)
if (prec->pact)
return 0;
status = dbPutLinkAsync(plink, DBR_LONG, &prec->val, 1);
status = dbPutLinkAsync(plink, DBR_ULONG, &prec->val, 1);
if (!status)
prec->pact = TRUE;
else if (status == S_db_noLSET)
status = dbPutLink(plink, DBR_LONG, &prec->val, 1);
status = dbPutLink(plink, DBR_ULONG, &prec->val, 1);
return status;
}

2
src/std/rec/mbboDirectRecord.c
View File

@@ -351,7 +351,7 @@ static long writeValue(mbboDirectRecord *prec)
case menuYesNoYES:
recGblSetSevr(prec, SIMM_ALARM, prec->sims);
return dbPutLink(&prec->siol, DBR_USHORT, &prec->val, 1);
return dbPutLink(&prec->siol, DBR_ULONG, &prec->val, 1);
default:
recGblSetSevr(prec, SOFT_ALARM, INVALID_ALARM);