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

Remove poptions arg from dbTryGetLink()

Browse Source
This commit is contained in:
Andrew Johnson
2017-11-30 17:02:15 -06:00
parent 2ae721c268
commit e43fb954ce
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ioc/db/dbLink.c
View File

@@ -292,15 +292,10 @@ long dbGetNelements(const struct link *plink, long *nelements)
}
long dbTryGetLink(struct link *plink, short dbrType, void *pbuffer,
long *poptions, long *pnRequest)
long *pnRequest)
{
lset *plset = plink->lset;
if (poptions && *poptions) {
printf("dbTryGetLink: Use of poptions no longer supported\n");
*poptions = 0;
}
if (!plset || !plset->getValue)
return -1;
@@ -313,7 +308,12 @@ long dbGetLink(struct link *plink, short dbrType, void *pbuffer,
struct dbCommon *precord = plink->precord;
long status;
status = dbTryGetLink(plink, dbrType, pbuffer, poptions, pnRequest);
if (poptions && *poptions) {
printf("dbGetLink: Use of poptions no longer supported\n");
*poptions = 0;
}
status = dbTryGetLink(plink, dbrType, pbuffer, pnRequest);
if (status)
recGblSetSevr(precord, LINK_ALARM, INVALID_ALARM);
return status;

2
src/ioc/db/dbLink.h
View File

@@ -101,7 +101,7 @@ epicsShareFunc long dbGetNelements(const struct link *plink, long *nelements);
epicsShareFunc int dbIsLinkConnected(const struct link *plink); /* 0 or 1 */
epicsShareFunc int dbGetLinkDBFtype(const struct link *plink);
epicsShareFunc long dbTryGetLink(struct link *, short dbrType, void *pbuffer,
long *options, long *nRequest);
long *nRequest);
epicsShareFunc long dbGetLink(struct link *, short dbrType, void *pbuffer,
long *options, long *nRequest);
epicsShareFunc long dbGetControlLimits(const struct link *plink, double *low,

2
src/ioc/db/recGbl.c
View File

@@ -403,7 +403,7 @@ long recGblGetSimm(struct dbCommon *pcommon, epicsEnum16 *psscn,
long status;
recGblSaveSimm(*psscn, poldsimm, *psimm);
status = dbTryGetLink(psiml, DBR_USHORT, psimm, 0, 0);
status = dbTryGetLink(psiml, DBR_USHORT, psimm, 0);
if (status && !pcommon->nsev) pcommon->nsta = LINK_ALARM;
recGblCheckSimm(pcommon, psscn, *poldsimm, *psimm);
return 0;