diff --git a/src/dev/devAiTestAsyn.c b/src/dev/devAiTestAsyn.c index fed99a897..e7fa1fd8d 100644 --- a/src/dev/devAiTestAsyn.c +++ b/src/dev/devAiTestAsyn.c @@ -70,14 +70,13 @@ static long init_record(pai,process) /* ai.inp must be a CONSTANT*/ switch (pai->inp.type) { case (CONSTANT) : - pcallback = (struct callback *)(calloc(1,sizeof(struct callback *))); + pcallback = (struct callback *)(calloc(1,sizeof(struct callback))); pai->dpvt = (caddr_t)pcallback; pcallback->callback = myCallback; if(dbNameToAddr(pai->name,&(pcallback->dbAddr))) { logMsg("dbNameToAddr failed in init_record for devAiTestAsyn\n"); exit(1); } - pcallback->process = process; pcallback->wd_id = wdCreate(); pcallback->process = process; pai->val = pai->inp.value.value; @@ -104,9 +103,9 @@ static long read_ai(pai) case (CONSTANT) : if(pai->pact) { printf("%s Completed\n",pai->name); - return(0); + return(0); /* don`t convert*/ } else { - wait_time = (short)(pai->val); + wait_time = (short)(pai->rval * vxTicksPerSecond); if(wait_time<=0) return(0); printf("%s Starting asynchronous processing\n",pai->name); wdStart(pcallback->wd_id,wait_time,callbackRequest,pcallback); diff --git a/src/dev/devAoSoft.c b/src/dev/devAoSoft.c index 319d4a492..12720b2c4 100644 --- a/src/dev/devAoSoft.c +++ b/src/dev/devAoSoft.c @@ -68,16 +68,15 @@ static long write_ao(pao) struct aoRecord *pao; { char message[100]; - long status,nRequest; + long status; /* ao.out must be a CONSTANT or a DB_LINK or a CA_LINK*/ switch (pao->out.type) { case (CONSTANT) : break; case (DB_LINK) : - nRequest=1; - (void)dbPutLink(&(pao->out.value.db_link),pao,DBR_FLOAT, - &(pao->val),&nRequest); + (void)dbPutLink(&pao->out.value.db_link,pao,DBR_FLOAT, + &pao->val,1L); break; case (CA_LINK) : break; diff --git a/src/dev/devBoSoft.c b/src/dev/devBoSoft.c index 5219b5f4f..3cebcd77b 100644 --- a/src/dev/devBoSoft.c +++ b/src/dev/devBoSoft.c @@ -71,7 +71,7 @@ static long write_bo(pbo) case (CONSTANT) : break; case (DB_LINK) : - (void)dbPutLink(&(pbo->out.value.db_link),pbo,DBR_SHORT,pbo->val,1L); + (void)dbPutLink(&pbo->out.value.db_link,pbo,DBR_SHORT,&pbo->val,1L); break; case (CA_LINK) : break; diff --git a/src/dev/devMbboSoft.c b/src/dev/devMbboSoft.c index 72a766317..40c5257cc 100644 --- a/src/dev/devMbboSoft.c +++ b/src/dev/devMbboSoft.c @@ -71,8 +71,8 @@ static long write_mbbo(pmbbo) case (CONSTANT) : break; case (DB_LINK) : - (void)dbPutLink(&(pmbbo->out.value.db_link),pmbbo,DBR_ENUM, - &(pmbbo->val),1L); + (void)dbPutLink(&pmbbo->out.value.db_link,pmbbo,DBR_ENUM, + &pmbbo->val,1L); break; case (CA_LINK) : break; diff --git a/src/dev/devWfJoergerVtr1.c b/src/dev/devWfJoergerVtr1.c index 7079e995d..94c09f9b7 100644 --- a/src/dev/devWfJoergerVtr1.c +++ b/src/dev/devWfJoergerVtr1.c @@ -94,7 +94,7 @@ static void myCallback(pcallback,no_read,pdata) (pcallback->process)(&pcallback->dbAddr); dbScanUnlock(pwf); } - + static long init_record(pwf,process) struct waveformRecord *pwf; void (*process)(); @@ -105,7 +105,7 @@ static long init_record(pwf,process) /* wf.inp must be an VME_IO */ switch (pwf->inp.type) { case (VME_IO) : - pcallback = (struct callback *)(calloc(1,sizeof(struct callback *))); + pcallback = (struct callback *)(calloc(1,sizeof(struct callback))); pwf->dpvt = (caddr_t)pcallback; if(dbNameToAddr(pwf->name,&(pcallback->dbAddr))) { logMsg("dbNameToAddr failed in init_record for devWfJoergerVtr1\n"); diff --git a/src/dev/devWfXy566Sc.c b/src/dev/devWfXy566Sc.c index 3fbe537ed..8d06387ca 100644 --- a/src/dev/devWfXy566Sc.c +++ b/src/dev/devWfXy566Sc.c @@ -80,7 +80,7 @@ static long init_record(pwf,process) /* wf.inp must be an VME_IO */ switch (pwf->inp.type) { case (VME_IO) : - pcallback = (struct callback *)(calloc(1,sizeof(struct callback *))); + pcallback = (struct callback *)(calloc(1,sizeof(struct callback))); pwf->dpvt = (caddr_t)pcallback; if(dbNameToAddr(pwf->name,&(pcallback->dbAddr))) { logMsg("dbNameToAddr failed in init_record for devWfXy566Sc\n");