epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Move db_post_events(waveform, NORD) into recordType.

Browse Source 
Dirk pointed out that existing device support authors aren't
going to add this themselves; it's much better if the record
does it all for itself.
This commit is contained in:
Andrew Johnson
2013-04-04 14:18:35 -05:00
parent f661299a81
commit fabc8d06a9
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,8 +76,6 @@ static long read_wf(waveformRecord *prec)
if (prec->tsel.type == CONSTANT &&
prec->tse == epicsTimeEventDeviceTime)
dbGetTimeStamp(&prec->inp, &prec->time);
db_post_events(prec, &prec->nord, DBE_VALUE | DBE_LOG);
}
return 0;
}

12
src/std/rec/waveformRecord.c
View File

@@ -1,5 +1,5 @@
/*************************************************************************\
* Copyright (c) 2008 UChicago Argonne LLC, as Operator of Argonne
* Copyright (c) 2013 UChicago Argonne LLC, as Operator of Argonne
* National Laboratory.
* Copyright (c) 2002 The Regents of the University of California, as
* Operator of Los Alamos National Laboratory.
@@ -318,16 +318,22 @@ static long readValue(waveformRecord *prec)
return status;
if (prec->simm == menuYesNoNO){
return (*pdset->read_wf)(prec);
epicsUInt32 nord = prec->nord;
status = (*pdset->read_wf)(prec);
if (nord != prec->nord)
db_post_events(prec, &prec->nord, DBE_VALUE | DBE_LOG);
return status;
}
if (prec->simm == menuYesNoYES){
long nRequest = prec->nelm;
status = dbGetLink(&(prec->siol), prec->ftvl, prec->bptr, 0, &nRequest);
/* nord set only for db links: needed for old db_access */
if (prec->siol.type != CONSTANT) {
prec->nord = nRequest;
db_post_events(prec, &prec->nord, DBE_VALUE | DBE_LOG);
db_post_events(prec, &prec->nord, DBE_VALUE | DBE_LOG);
if (status == 0)
prec->udf=FALSE;
}