moved as functions
This commit is contained in:
@@ -55,7 +55,7 @@
|
||||
|
||||
#include "dbDefs.h"
|
||||
#include "epicsPrint.h"
|
||||
#include "registry.h"
|
||||
#include "registryFunction.h"
|
||||
#include "alarm.h"
|
||||
#include "callback.h"
|
||||
#include "cantProceed.h"
|
||||
@@ -139,7 +139,7 @@ static long init_record(psub,pass)
|
||||
|
||||
if(strlen(psub->inam)!=0) {
|
||||
/* convert the initialization subroutine name */
|
||||
psub->sadr = registryFind(0,psub->inam);
|
||||
psub->sadr = (void *)registryFunctionFind(psub->inam);
|
||||
if(psub->sadr==0) {
|
||||
recGblRecordError(S_db_BadSub,(void *)psub,"recSub(init_record)");
|
||||
return(S_db_BadSub);
|
||||
@@ -155,7 +155,7 @@ static long init_record(psub,pass)
|
||||
psub->pact = TRUE;
|
||||
return(0);
|
||||
}
|
||||
psub->sadr = registryFind(0,psub->snam);
|
||||
psub->sadr = (void *)registryFunctionFind(psub->snam);
|
||||
if(psub->sadr==0) {
|
||||
recGblRecordError(S_db_BadSub,(void *)psub,"recSub(init_record)");
|
||||
return(S_db_BadSub);
|
||||
@@ -408,52 +408,3 @@ struct subRecord *psub; /* pointer to subroutine record */
|
||||
} else psub->udf = FALSE;
|
||||
return(status);
|
||||
}
|
||||
|
||||
/* The following is provided for access security*/
|
||||
/*It allows a CA client to force access security initialization*/
|
||||
#include "asLib.h"
|
||||
#include "asDbLib.h"
|
||||
static void myCallback(CALLBACK *pcallback)
|
||||
{
|
||||
ASDBCALLBACK *pasdbcallback = (ASDBCALLBACK *)pcallback;
|
||||
subRecord *precord;
|
||||
struct rset *prset;
|
||||
|
||||
callbackGetUser(precord,pcallback);
|
||||
prset=(struct rset *)(precord->rset);
|
||||
precord->val = 0.0;
|
||||
if(pasdbcallback->status) {
|
||||
recGblSetSevr(precord,READ_ALARM,precord->brsv);
|
||||
recGblRecordError(pasdbcallback->status,precord,"asInit Failed");
|
||||
}
|
||||
dbScanLock((dbCommon *)precord);
|
||||
(*prset->process)((dbCommon *)precord);
|
||||
dbScanUnlock((dbCommon *)precord);
|
||||
}
|
||||
|
||||
long asSubInit(subRecord *precord,int pass)
|
||||
{
|
||||
ASDBCALLBACK *pcallback;
|
||||
|
||||
pcallback = (ASDBCALLBACK *)callocMustSucceed(
|
||||
1,sizeof(ASDBCALLBACK),"asSubInit");
|
||||
precord->dpvt = (void *)pcallback;
|
||||
callbackSetCallback(myCallback,&pcallback->callback);
|
||||
callbackSetUser(precord,&pcallback->callback);
|
||||
return(0);
|
||||
}
|
||||
|
||||
long asSubProcess(subRecord *precord)
|
||||
{
|
||||
ASDBCALLBACK *pcallback = (ASDBCALLBACK *)precord->dpvt;
|
||||
|
||||
if(!precord->pact && precord->val==1.0) {
|
||||
db_post_events(precord,&precord->val,DBE_VALUE);
|
||||
callbackSetPriority(precord->prio,&pcallback->callback);
|
||||
asInitAsyn(pcallback);
|
||||
precord->pact=TRUE;
|
||||
return(1);
|
||||
}
|
||||
db_post_events(precord,&precord->val,DBE_VALUE);
|
||||
return(0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user