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

UTAG uint64

Browse Source
This commit is contained in:
Michael Davidsaver
2020-12-02 13:57:40 -08:00
parent 1ceb26eeb8
commit b94afaa045
12 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/database/src/std/filters/utag.c
+1 -1
View File
@@ -47,7 +47,7 @@ static int parse_ok(void *raw)
static db_field_log* filter(void* raw, dbChannel *chan, db_field_log *pfl)
{
utagPvt *pvt = (utagPvt*)raw;
epicsInt32 utag = pfl->type==dbfl_type_rec ? dbChannelRecord(chan)->utag : pfl->utag;
epicsUTag utag = pfl->type==dbfl_type_rec ? dbChannelRecord(chan)->utag : pfl->utag;
int drop = (utag&pvt->mask)!=pvt->value;
if(pfl->ctx!=dbfl_context_event || pfl->mask&DBE_PROPERTY) {
modules/database/src/std/link/lnkCalc.c
+3 -3
View File
@@ -67,7 +67,7 @@ typedef struct calc_link {
struct link out;
double arg[CALCPERFORM_NARGS];
epicsTimeStamp time;
epicsInt32 utag;
epicsUTag utag;
double val;
} calc_link;
@@ -535,7 +535,7 @@ static long lnkCalc_getElements(const struct link *plink, long *nelements)
struct lcvt {
double *pval;
epicsTimeStamp *ptime;
epicsInt32 *ptag;
epicsUTag *ptag;
};
static long readLocked(struct link *pinp, void *vvt)
@@ -754,7 +754,7 @@ static long lnkCalc_getAlarm(const struct link *plink, epicsEnum16 *status,
return lnkCalc_getAlarmMsg(plink, status, severity, NULL, 0u);
}
static long lnkCalc_getTimestampTag(const struct link *plink, epicsTimeStamp *pstamp, epicsInt32 *ptag)
static long lnkCalc_getTimestampTag(const struct link *plink, epicsTimeStamp *pstamp, epicsUTag *ptag)
{
calc_link *clink = CONTAINER(plink->value.json.jlink,
struct calc_link, jlink);