Changed arg to dbCaCallbackProcess() to make it match dbCaCallback.
Removed matching unnecessary casts in softDev support routines.
This commit is contained in:
@@ -163,8 +163,9 @@ static void addAction(caLink *pca, short link_action)
|
||||
epicsEventSignal(workListEvent);
|
||||
}
|
||||
|
||||
void dbCaCallbackProcess(struct link *plink)
|
||||
void dbCaCallbackProcess(void *usrPvt)
|
||||
{
|
||||
struct link *plink = (struct link *)usrPvt;
|
||||
dbCommon *pdbCommon = plink->value.pv_link.precord;
|
||||
|
||||
dbScanLock(pdbCommon);
|
||||
|
||||
@@ -21,7 +21,7 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
typedef void (*dbCaCallback)(void *userPvt);
|
||||
epicsShareFunc void dbCaCallbackProcess(struct link *plink);
|
||||
epicsShareFunc void dbCaCallbackProcess(void *usrPvt);
|
||||
|
||||
epicsShareFunc void dbCaLinkInit(void);
|
||||
epicsShareFunc void dbCaRun(void);
|
||||
|
||||
@@ -60,7 +60,7 @@ static long write_ao(aoRecord *prec)
|
||||
return(status);
|
||||
}
|
||||
status = dbCaPutLinkCallback(plink,DBR_DOUBLE,&prec->oval,1,
|
||||
(dbCaCallback)dbCaCallbackProcess,plink);
|
||||
dbCaCallbackProcess,plink);
|
||||
if(status) {
|
||||
recGblSetSevr(prec,LINK_ALARM,INVALID_ALARM);
|
||||
return(status);
|
||||
|
||||
@@ -60,7 +60,7 @@ static long write_bo(boRecord *prec)
|
||||
return(status);
|
||||
}
|
||||
status = dbCaPutLinkCallback(plink,DBR_USHORT,&prec->val,1,
|
||||
(dbCaCallback)dbCaCallbackProcess,plink);
|
||||
dbCaCallbackProcess,plink);
|
||||
if(status) {
|
||||
recGblSetSevr(prec,LINK_ALARM,INVALID_ALARM);
|
||||
return(status);
|
||||
|
||||
@@ -54,7 +54,7 @@ static long write_calcout(calcoutRecord *prec)
|
||||
return status;
|
||||
}
|
||||
status = dbCaPutLinkCallback(plink, DBR_DOUBLE, &prec->oval, 1,
|
||||
(dbCaCallback)dbCaCallbackProcess, plink);
|
||||
dbCaCallbackProcess, plink);
|
||||
if (status) {
|
||||
recGblSetSevr(prec, LINK_ALARM, INVALID_ALARM);
|
||||
return status;
|
||||
|
||||
@@ -57,7 +57,7 @@ static long write_longout(longoutRecord *prec)
|
||||
return(status);
|
||||
}
|
||||
status = dbCaPutLinkCallback(plink,DBR_LONG,&prec->val,1,
|
||||
(dbCaCallback)dbCaCallbackProcess,plink);
|
||||
dbCaCallbackProcess,plink);
|
||||
if(status) {
|
||||
recGblSetSevr(prec,LINK_ALARM,INVALID_ALARM);
|
||||
return(status);
|
||||
|
||||
@@ -56,7 +56,7 @@ static long write_mbbo(mbboDirectRecord *prec)
|
||||
return(status);
|
||||
}
|
||||
status = dbCaPutLinkCallback(plink,DBR_USHORT,&prec->val,1,
|
||||
(dbCaCallback)dbCaCallbackProcess,plink);
|
||||
dbCaCallbackProcess,plink);
|
||||
if(status) {
|
||||
recGblSetSevr(prec,LINK_ALARM,INVALID_ALARM);
|
||||
return(status);
|
||||
|
||||
@@ -56,7 +56,7 @@ static long write_mbbo(mbboRecord *prec)
|
||||
return(status);
|
||||
}
|
||||
status = dbCaPutLinkCallback(plink,DBR_USHORT,&prec->val,1,
|
||||
(dbCaCallback)dbCaCallbackProcess,plink);
|
||||
dbCaCallbackProcess,plink);
|
||||
if(status) {
|
||||
recGblSetSevr(prec,LINK_ALARM,INVALID_ALARM);
|
||||
return(status);
|
||||
|
||||
@@ -57,7 +57,7 @@ static long write_stringout(stringoutRecord *prec)
|
||||
}
|
||||
|
||||
status = dbCaPutLinkCallback(plink, DBR_STRING, &prec->val, 1,
|
||||
(dbCaCallback)dbCaCallbackProcess, plink);
|
||||
dbCaCallbackProcess, plink);
|
||||
if (status) {
|
||||
recGblSetSevr(prec, LINK_ALARM, INVALID_ALARM);
|
||||
return status;
|
||||
|
||||
Reference in New Issue
Block a user