diff --git a/src/dev/devAiTestAsyn.c b/src/dev/devAiTestAsyn.c index dbfa0cfd5..0165959fb 100644 --- a/src/dev/devAiTestAsyn.c +++ b/src/dev/devAiTestAsyn.c @@ -34,6 +34,7 @@ * .02 02-05-92 jba Changed function arguments from paddr to precord * .03 03-13-92 jba ANSI C changes * .04 04-10-92 jba pact now used to test for asyn processing, not return value + * .04 04-05-94 mrk ANSI changes to callback routines * ... */ @@ -104,7 +105,7 @@ static long init_record(pai) case (CONSTANT) : pcallback = (struct callback *)(calloc(1,sizeof(struct callback))); pai->dpvt = (void *)pcallback; - callbackSetCallback(myCallback,pcallback); + callbackSetCallback(myCallback,&pcallback->callback); pcallback->precord = (struct dbCommon *)pai; pcallback->wd_id = wdCreate(); pai->val = pai->inp.value.value; @@ -133,7 +134,7 @@ static long read_ai(pai) } else { wait_time = (int)(pai->disv * vxTicksPerSecond); if(wait_time<=0) return(0); - callbackSetPriority(pai->prio,pcallback); + callbackSetPriority(pai->prio,&pcallback->callback); printf("Starting asynchronous processing: %s\n",pai->name); wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback); pai->pact=TRUE; diff --git a/src/dev/devAoTestAsyn.c b/src/dev/devAoTestAsyn.c index 1714b8218..5b5dfff3f 100644 --- a/src/dev/devAoTestAsyn.c +++ b/src/dev/devAoTestAsyn.c @@ -35,6 +35,7 @@ * .03 02-05-92 jba Changed function arguments from paddr to precord * .04 03-13-92 jba ANSI C changes * .05 04-10-92 jba pact now used to test for asyn processing, not return value + * .06 04-05-94 mrk ANSI changes to callback routines * ... */ @@ -107,7 +108,7 @@ static long init_record(pao) case (CONSTANT) : pcallback = (struct callback *)(calloc(1,sizeof(struct callback))); pao->dpvt = (void *)pcallback; - callbackSetCallback(myCallback,pcallback); + callbackSetCallback(myCallback,&pcallback->callback); pcallback->precord = (struct dbCommon *)pao; pcallback->wd_id = wdCreate(); break; @@ -134,7 +135,7 @@ static long write_ao(pao) } else { wait_time = (int)(pao->disv * vxTicksPerSecond); if(wait_time<=0) return(0); - callbackSetPriority(pao->prio,pcallback); + callbackSetPriority(pao->prio,&pcallback->callback); printf("Starting asynchronous processing: %s\n",pao->name); wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback); pao->pact=TRUE; diff --git a/src/dev/devBiTestAsyn.c b/src/dev/devBiTestAsyn.c index 5d04aaee6..9957c8d61 100644 --- a/src/dev/devBiTestAsyn.c +++ b/src/dev/devBiTestAsyn.c @@ -35,6 +35,7 @@ * .03 02-05-92 jba Changed function arguments from paddr to precord * .04 03-13-92 jba ANSI C changes * .05 04-10-92 jba pact now used to test for asyn processing, not return value + * .06 04-05-94 mrk ANSI changes to callback routines * ... */ @@ -106,7 +107,7 @@ static long init_record(pbi) case (CONSTANT) : pcallback = (struct callback *)(calloc(1,sizeof(struct callback))); pbi->dpvt = (void *)pcallback; - callbackSetCallback(myCallback,pcallback); + callbackSetCallback(myCallback,&pcallback->callback); pcallback->precord = (struct dbCommon *)pbi; pcallback->wd_id = wdCreate(); pbi->val = pbi->inp.value.value; @@ -135,7 +136,7 @@ static long read_bi(pbi) } else { wait_time = (int)(pbi->disv * vxTicksPerSecond); if(wait_time<=0) return(0); - callbackSetPriority(pbi->prio,pcallback); + callbackSetPriority(pbi->prio,&pcallback->callback); printf("%s Starting asynchronous processing\n",pbi->name); wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback); pbi->pact=TRUE; diff --git a/src/dev/devBoTestAsyn.c b/src/dev/devBoTestAsyn.c index b07016e05..7d709765c 100644 --- a/src/dev/devBoTestAsyn.c +++ b/src/dev/devBoTestAsyn.c @@ -35,6 +35,7 @@ * .03 02-05-92 jba Changed function arguments from paddr to precord * .04 03-13-92 jba ANSI C changes * .05 04-10-92 jba pact now used to test for asyn processing, not return value + * .06 04-05-94 mrk ANSI changes to callback routines * ... */ @@ -107,7 +108,7 @@ static long init_record(pbo) case (CONSTANT) : pcallback = (struct callback *)(calloc(1,sizeof(struct callback))); pbo->dpvt = (void *)pcallback; - callbackSetCallback(myCallback,pcallback); + callbackSetCallback(myCallback,&pcallback->callback); pcallback->precord = (struct dbCommon *)pbo; pcallback->wd_id = wdCreate(); break; @@ -134,7 +135,7 @@ static long write_bo(pbo) } else { wait_time = (int)(pbo->disv * vxTicksPerSecond); if(wait_time<=0) return(0); - callbackSetPriority(pbo->prio,pcallback); + callbackSetPriority(pbo->prio,&pcallback->callback); printf("%s Starting asynchronous processing\n",pbo->name); wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback); pbo->pact=TRUE; diff --git a/src/dev/devHistogramTestAsyn.c b/src/dev/devHistogramTestAsyn.c index be5b4a234..c91ea6cd8 100644 --- a/src/dev/devHistogramTestAsyn.c +++ b/src/dev/devHistogramTestAsyn.c @@ -34,6 +34,7 @@ * .03 02-05-92 jba Changed function arguments from paddr to precord * .04 03-13-92 jba ANSI C changes * .05 04-10-92 jba pact now used to test for asyn processing, not return value + * .06 04-05-94 mrk ANSI changes to callback routines * ... */ @@ -103,7 +104,7 @@ static long init_record(phistogram) case (CONSTANT) : pcallback = (struct callback *)(calloc(1,sizeof(struct callback))); phistogram->dpvt = (void *)pcallback; - callbackSetCallback(myCallback,pcallback); + callbackSetCallback(myCallback,&pcallback->callback); pcallback->precord = (struct dbCommon *)phistogram; pcallback->wd_id = wdCreate(); phistogram->sgnl = phistogram->svl.value.value; @@ -131,7 +132,7 @@ static long read_histogram(phistogram) } else { wait_time = (int)(phistogram->disv * vxTicksPerSecond); if(wait_time<=0) return(0); - callbackSetPriority(phistogram->prio,pcallback); + callbackSetPriority(phistogram->prio,&pcallback->callback); printf("%s Starting asynchronous processing\n",phistogram->name); wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback); phistogram->pact=TRUE; diff --git a/src/dev/devMbbiTestAsyn.c b/src/dev/devMbbiTestAsyn.c index 8f4fa4f7b..accf5c428 100644 --- a/src/dev/devMbbiTestAsyn.c +++ b/src/dev/devMbbiTestAsyn.c @@ -35,6 +35,7 @@ * .03 02-05-92 jba Changed function arguments from paddr to precord * .04 03-13-92 jba ANSI C changes * .05 04-10-92 jba pact now used to test for asyn processing, not return value + * .06 04-05-94 mrk ANSI changes to callback routines * ... */ @@ -105,7 +106,7 @@ static long init_record(pmbbi) case (CONSTANT) : pcallback = (struct callback *)(calloc(1,sizeof(struct callback))); pmbbi->dpvt = (void *)pcallback; - callbackSetCallback(myCallback,pcallback); + callbackSetCallback(myCallback,&pcallback->callback); pcallback->precord = (struct dbCommon *)pmbbi; pcallback->wd_id = wdCreate(); pmbbi->val = pmbbi->inp.value.value; @@ -134,7 +135,7 @@ static long read_mbbi(pmbbi) } else { wait_time = (int)(pmbbi->disv * vxTicksPerSecond); if(wait_time<=0) return(0); - callbackSetPriority(pmbbi->prio,pcallback); + callbackSetPriority(pmbbi->prio,&pcallback->callback); printf("%s Starting asynchronous processing\n",pmbbi->name); wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback); pmbbi->pact=TRUE; diff --git a/src/dev/devMbboTestAsyn.c b/src/dev/devMbboTestAsyn.c index b053ae1fa..2196d63cb 100644 --- a/src/dev/devMbboTestAsyn.c +++ b/src/dev/devMbboTestAsyn.c @@ -35,6 +35,7 @@ * .03 02-05-92 jba Changed function arguments from paddr to precord * .04 03-13-92 jba ANSI C changes * .05 04-10-92 jba pact now used to test for asyn processing, not return value + * .06 04-05-94 mrk ANSI changes to callback routines * ... */ @@ -107,7 +108,7 @@ static long init_record(pmbbo) case (CONSTANT) : pcallback = (struct callback *)(calloc(1,sizeof(struct callback))); pmbbo->dpvt = (void *)pcallback; - callbackSetCallback(myCallback,pcallback); + callbackSetCallback(myCallback,&pcallback->callback); pcallback->precord = (struct dbCommon *)pmbbo; pcallback->wd_id = wdCreate(); break; @@ -134,7 +135,7 @@ static long write_mbbo(pmbbo) } else { wait_time = (int)(pmbbo->disv * vxTicksPerSecond); if(wait_time<=0) return(0); - callbackSetPriority(pmbbo->prio,pcallback); + callbackSetPriority(pmbbo->prio,&pcallback->callback); printf("%s Starting asynchronous processing\n",pmbbo->name); wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback); pmbbo->pact=TRUE; diff --git a/src/dev/devSiTestAsyn.c b/src/dev/devSiTestAsyn.c index d94cc8b76..11e8dd1da 100644 --- a/src/dev/devSiTestAsyn.c +++ b/src/dev/devSiTestAsyn.c @@ -34,6 +34,7 @@ * .03 02-05-92 jba Changed function arguments from paddr to precord * .04 03-13-92 jba ANSI C changes * .05 04-10-92 jba pact now used to test for asyn processing, not return value + * .06 04-05-94 mrk ANSI changes to callback routines * ... */ @@ -104,7 +105,7 @@ static long init_record(pstringin) case (CONSTANT) : pcallback = (struct callback *)(calloc(1,sizeof(struct callback))); pstringin->dpvt = (void *)pcallback; - callbackSetCallback(myCallback,pcallback); + callbackSetCallback(myCallback,&pcallback->callback); pcallback->precord = (struct dbCommon *)pstringin; pcallback->wd_id = wdCreate(); if (pstringin->inp.value.value!=0.0) { @@ -135,7 +136,7 @@ static long read_stringin(pstringin) } else { wait_time = (int)(pstringin->disv * vxTicksPerSecond); if(wait_time<=0) return(0); - callbackSetPriority(pstringin->prio,pcallback); + callbackSetPriority(pstringin->prio,&pcallback->callback); printf("%s Starting asynchronous processing\n",pstringin->name); wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback); pstringin->pact=TRUE; diff --git a/src/dev/devSoTestAsyn.c b/src/dev/devSoTestAsyn.c index 3c203ad7b..783d43fd5 100644 --- a/src/dev/devSoTestAsyn.c +++ b/src/dev/devSoTestAsyn.c @@ -34,6 +34,7 @@ * .03 02-05-92 jba Changed function arguments from paddr to precord * .04 03-13-92 jba ANSI C changes * .05 04-10-92 jba pact now used to test for asyn processing, not return value + * .06 04-05-94 mrk ANSI changes to callback routines * ... */ @@ -105,7 +106,7 @@ static long init_record(pstringout) case (CONSTANT) : pcallback = (struct callback *)(calloc(1,sizeof(struct callback))); pstringout->dpvt = (void *)pcallback; - callbackSetCallback(myCallback,pcallback); + callbackSetCallback(myCallback,&pcallback->callback); pcallback->precord = (struct dbCommon *)pstringout; pcallback->wd_id = wdCreate(); break; @@ -132,7 +133,7 @@ static long write_stringout(pstringout) } else { wait_time = (int)(pstringout->disv * vxTicksPerSecond); if(wait_time<=0) return(0); - callbackSetPriority(pstringout->prio,pcallback); + callbackSetPriority(pstringout->prio,&pcallback->callback); printf("%s Starting asynchronous processing\n",pstringout->name); wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback); pstringout->pact=TRUE; diff --git a/src/dev/devWfTestAsyn.c b/src/dev/devWfTestAsyn.c index 472d4c23d..ae1f41fb2 100644 --- a/src/dev/devWfTestAsyn.c +++ b/src/dev/devWfTestAsyn.c @@ -35,6 +35,7 @@ * .03 02-05-92 jba Changed function arguments from paddr to precord * .04 03-13-92 jba ANSI C changes * .05 04-10-92 jba pact now used to test for asyn processing, not return value + * .06 04-05-94 mrk ANSI changes to callback routines * ... */ @@ -104,7 +105,7 @@ static long init_record(pwf) case (CONSTANT) : pcallback = (struct callback *)(calloc(1,sizeof(struct callback))); pwf->dpvt = (void *)pcallback; - callbackSetCallback(myCallback,pcallback); + callbackSetCallback(myCallback,&pcallback->callback); pcallback->precord = (struct dbCommon *)pwf; pcallback->wd_id = wdCreate(); pwf->nord = 0; @@ -132,7 +133,7 @@ static long read_wf(pwf) } else { wait_time = (int)(pwf->disv * vxTicksPerSecond); if(wait_time<=0) return(0); - callbackSetPriority(pwf->prio,pcallback); + callbackSetPriority(pwf->prio,&pcallback->callback); printf("%s Starting asynchronous processing\n",pwf->name); wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback); pwf->pact=TRUE;