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

dev: Rename notifyInfo structure to devPvt.

Browse Source
This commit is contained in:
Andrew Johnson
2010-11-30 17:32:09 -06:00
parent 90ab284583
commit 26f6eabdf5
6 changed files with 168 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/std/dev/devBiSoftCallback.c
View File

@@ -32,7 +32,7 @@
#define GET_OPTIONS (DBR_STATUS | DBR_TIME)
typedef struct notifyInfo {
typedef struct devPvt {
processNotify *ppn;
CALLBACK *pcallback;
long options;
@@ -42,13 +42,13 @@ typedef struct notifyInfo {
DBRtime
epicsEnum16 value;
} buffer;
} notifyInfo;
} devPvt;
static void getCallback(processNotify *ppn,notifyGetType type)
{
biRecord *prec = (biRecord *)ppn->usrPvt;
notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
devPvt *pdevPvt = (devPvt *)prec->dpvt;
long no_elements = 1;
if (ppn->status == notifyCanceled) {
@@ -57,16 +57,16 @@ static void getCallback(processNotify *ppn,notifyGetType type)
}
assert(type == getFieldType);
pnotifyInfo->status = dbGetField(ppn->paddr, DBR_ENUM,
&pnotifyInfo->buffer, &pnotifyInfo->options, &no_elements, 0);
pdevPvt->status = dbGetField(ppn->paddr, DBR_ENUM,
&pdevPvt->buffer, &pdevPvt->options, &no_elements, 0);
}
static void doneCallback(processNotify *ppn)
{
biRecord *prec = (biRecord *)ppn->usrPvt;
notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
devPvt *pdevPvt = (devPvt *)prec->dpvt;
callbackRequestProcessCallback(pnotifyInfo->pcallback, prec->prio, prec);
callbackRequestProcessCallback(pdevPvt->pcallback, prec->prio, prec);
}
static long add_record(dbCommon *pcommon)
@@ -75,7 +75,7 @@ static long add_record(dbCommon *pcommon)
DBLINK *plink = &prec->inp;
DBADDR *pdbaddr;
long status;
notifyInfo *pnotifyInfo;
devPvt *pdevPvt;
processNotify *ppn;
if (plink->type == CONSTANT) return 0;
@@ -109,29 +109,29 @@ static long add_record(dbCommon *pcommon)
ppn->doneCallback = doneCallback;
ppn->requestType = processGetRequest;
pnotifyInfo = callocMustSucceed(1, sizeof(*pnotifyInfo),
pdevPvt = callocMustSucceed(1, sizeof(*pdevPvt),
"devBiSoftCallback::add_record");
pnotifyInfo->pcallback = callocMustSucceed(1, sizeof(CALLBACK),
pdevPvt->pcallback = callocMustSucceed(1, sizeof(CALLBACK),
"devBiSoftCallback::add_record");
pnotifyInfo->ppn = ppn;
pnotifyInfo->options = GET_OPTIONS;
pdevPvt->ppn = ppn;
pdevPvt->options = GET_OPTIONS;
prec->dpvt = pnotifyInfo;
prec->dpvt = pdevPvt;
return 0;
}
static long del_record(dbCommon *pcommon) {
biRecord *prec = (biRecord *)pcommon;
DBLINK *plink = &prec->inp;
notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
devPvt *pdevPvt = (devPvt *)prec->dpvt;
if (plink->type == CONSTANT) return 0;
assert(plink->type == PN_LINK);
dbNotifyCancel(pnotifyInfo->ppn);
free(pnotifyInfo->ppn);
free(pnotifyInfo->pcallback);
free(pnotifyInfo);
dbNotifyCancel(pdevPvt->ppn);
free(pdevPvt->ppn);
free(pdevPvt->pcallback);
free(pdevPvt);
free(plink->value.pv_link.pvt);
plink->type = PV_LINK;
@@ -171,44 +171,44 @@ static long init_record(biRecord *prec)
static long read_bi(biRecord *prec)
{
notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
devPvt *pdevPvt = (devPvt *)prec->dpvt;
if (!prec->dpvt)
return 2;
if (!prec->pact) {
dbProcessNotify(pnotifyInfo->ppn);
dbProcessNotify(pdevPvt->ppn);
prec->pact = TRUE;
return 0;
}
if (pnotifyInfo->status) {
if (pdevPvt->status) {
recGblSetSevr(prec, READ_ALARM, INVALID_ALARM);
return 2;
}
prec->val = pnotifyInfo->buffer.value;
prec->val = pdevPvt->buffer.value;
prec->udf = FALSE;
switch (prec->inp.value.pv_link.pvlMask & pvlOptMsMode) {
case pvlOptNMS:
break;
case pvlOptMSI:
if (pnotifyInfo->buffer.severity < INVALID_ALARM)
if (pdevPvt->buffer.severity < INVALID_ALARM)
break;
/* else fall through */
case pvlOptMS:
recGblSetSevr(prec, LINK_ALARM, pnotifyInfo->buffer.severity);
recGblSetSevr(prec, LINK_ALARM, pdevPvt->buffer.severity);
break;
case pvlOptMSS:
recGblSetSevr(prec, pnotifyInfo->buffer.status,
pnotifyInfo->buffer.severity);
recGblSetSevr(prec, pdevPvt->buffer.status,
pdevPvt->buffer.severity);
break;
}
if (prec->tsel.type == CONSTANT &&
prec->tse == epicsTimeEventDeviceTime)
prec->time = pnotifyInfo->buffer.time;
prec->time = pdevPvt->buffer.time;
return 2;
}