From 4184bdd54eafd4555d5ec936581bbbeb9d48d6a9 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Fri, 17 Apr 1992 12:57:07 +0000 Subject: [PATCH] jba pact now used to test for asyn processing, not return value --- src/dev/devAiTestAsyn.c | 8 ++++---- src/dev/devAoTestAsyn.c | 4 +++- src/dev/devBiTestAsyn.c | 4 +++- src/dev/devBoTestAsyn.c | 6 ++++-- src/dev/devHistogramTestAsyn.c | 4 +++- src/dev/devMbbiTestAsyn.c | 4 +++- src/dev/devMbboTestAsyn.c | 6 ++++-- src/dev/devSiTestAsyn.c | 4 +++- src/dev/devSoTestAsyn.c | 4 +++- src/dev/devWfTestAsyn.c | 4 +++- 10 files changed, 33 insertions(+), 15 deletions(-) diff --git a/src/dev/devAiTestAsyn.c b/src/dev/devAiTestAsyn.c index 89147ac10..5537cba16 100644 --- a/src/dev/devAiTestAsyn.c +++ b/src/dev/devAiTestAsyn.c @@ -32,7 +32,8 @@ * ----------------- * .01 01-08-92 jba Added cast in call to wdStart to avoid compile warning msg * .02 02-05-92 jba Changed function arguments from paddr to precord - * .02 03-13-92 jba ANSI C changes + * .03 03-13-92 jba ANSI C changes + * .04 04-10-92 jba pact now used to test for asyn processing, not return value * ... */ @@ -92,8 +93,6 @@ static void myCallback(pcallback) (*prset->process)(precord); dbScanUnlock(precord); } - - static long init_record(pai) struct aiRecord *pai; @@ -140,7 +139,8 @@ static long read_ai(pai) callbackSetPriority(pai->prio,pcallback); printf("%s Starting asynchronous processing\n",pai->name); wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback); - return(1); + pai->pact=TRUE; + return(0); } default : if(recGblSetSevr(pai,SOFT_ALARM,VALID_ALARM)){ diff --git a/src/dev/devAoTestAsyn.c b/src/dev/devAoTestAsyn.c index b1a45423e..9d9703ed0 100644 --- a/src/dev/devAoTestAsyn.c +++ b/src/dev/devAoTestAsyn.c @@ -34,6 +34,7 @@ * .02 01-08-92 jba Added cast in call to wdStart to avoid compile warning msg * .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 * ... */ @@ -139,7 +140,8 @@ static long write_ao(pao) callbackSetPriority(pao->prio,pcallback); printf("%s Starting asynchronous processing\n",pao->name); wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback); - return(1); + pao->pact=TRUE; + return(0); } default : if(recGblSetSevr(pao,SOFT_ALARM,VALID_ALARM)){ diff --git a/src/dev/devBiTestAsyn.c b/src/dev/devBiTestAsyn.c index 4faa9ac87..1066113ed 100644 --- a/src/dev/devBiTestAsyn.c +++ b/src/dev/devBiTestAsyn.c @@ -34,6 +34,7 @@ * .02 01-08-92 jba Added cast in call to wdStart to avoid compile warning msg * .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 * ... */ @@ -140,7 +141,8 @@ static long read_bi(pbi) callbackSetPriority(pbi->prio,pcallback); printf("%s Starting asynchronous processing\n",pbi->name); wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback); - return(1); + pbi->pact=TRUE; + return(0); } default : if(recGblSetSevr(pbi,SOFT_ALARM,VALID_ALARM)){ diff --git a/src/dev/devBoTestAsyn.c b/src/dev/devBoTestAsyn.c index 05829f717..d132865fa 100644 --- a/src/dev/devBoTestAsyn.c +++ b/src/dev/devBoTestAsyn.c @@ -34,6 +34,7 @@ * .02 01-08-92 jba Added cast in call to wdStart to avoid compile warning msg * .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 * ... */ @@ -132,14 +133,15 @@ static long write_bo(pbo) case (CONSTANT) : if(pbo->pact) { printf("%s Completed\n",pbo->name); - return(0); /* don`t convert*/ + return(0); } else { wait_time = (int)(pbo->disv * vxTicksPerSecond); if(wait_time<=0) return(0); callbackSetPriority(pbo->prio,pcallback); printf("%s Starting asynchronous processing\n",pbo->name); wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback); - return(1); + pbo->pact=TRUE; + return(0); } default : if(recGblSetSevr(pbo,SOFT_ALARM,VALID_ALARM)){ diff --git a/src/dev/devHistogramTestAsyn.c b/src/dev/devHistogramTestAsyn.c index ecc598c65..153eefad8 100644 --- a/src/dev/devHistogramTestAsyn.c +++ b/src/dev/devHistogramTestAsyn.c @@ -33,6 +33,7 @@ * .02 01-08-92 jba Added cast in call to wdStart to avoid compile warning msg * .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 * ... */ @@ -136,7 +137,8 @@ static long read_histogram(phistogram) callbackSetPriority(phistogram->prio,pcallback); printf("%s Starting asynchronous processing\n",phistogram->name); wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback); - return(1); + phistogram->pact=TRUE; + return(0); } default : if(recGblSetSevr(phistogram,SOFT_ALARM,VALID_ALARM)){ diff --git a/src/dev/devMbbiTestAsyn.c b/src/dev/devMbbiTestAsyn.c index 2a063805a..ccb68ab5c 100644 --- a/src/dev/devMbbiTestAsyn.c +++ b/src/dev/devMbbiTestAsyn.c @@ -34,6 +34,7 @@ * .02 01-08-92 jba Added cast in call to wdStart to avoid compile warning msg * .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 * ... */ @@ -139,7 +140,8 @@ static long read_mbbi(pmbbi) callbackSetPriority(pmbbi->prio,pcallback); printf("%s Starting asynchronous processing\n",pmbbi->name); wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback); - return(1); + pmbbi->pact=TRUE; + return(0); } default : if(recGblSetSevr(pmbbi,SOFT_ALARM,VALID_ALARM)){ diff --git a/src/dev/devMbboTestAsyn.c b/src/dev/devMbboTestAsyn.c index 9df78820a..951cf2c6f 100644 --- a/src/dev/devMbboTestAsyn.c +++ b/src/dev/devMbboTestAsyn.c @@ -34,6 +34,7 @@ * .02 01-08-92 jba Added cast in call to wdStart to avoid compile warning msg * .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 * ... */ @@ -132,14 +133,15 @@ static long write_mbbo(pmbbo) case (CONSTANT) : if(pmbbo->pact) { printf("%s Completed\n",pmbbo->name); - return(0); /* don`t convert*/ + return(0); } else { wait_time = (int)(pmbbo->disv * vxTicksPerSecond); if(wait_time<=0) return(0); callbackSetPriority(pmbbo->prio,pcallback); printf("%s Starting asynchronous processing\n",pmbbo->name); wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback); - return(1); + pmbbo->pact=TRUE; + return(0); } default : if(recGblSetSevr(pmbbo,SOFT_ALARM,VALID_ALARM)){ diff --git a/src/dev/devSiTestAsyn.c b/src/dev/devSiTestAsyn.c index 3971036ce..8f8702f84 100644 --- a/src/dev/devSiTestAsyn.c +++ b/src/dev/devSiTestAsyn.c @@ -33,6 +33,7 @@ * .02 01-08-92 jba Added cast in call to wdStart to avoid compile warning msg * .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 * ... */ @@ -140,7 +141,8 @@ static long read_stringin(pstringin) callbackSetPriority(pstringin->prio,pcallback); printf("%s Starting asynchronous processing\n",pstringin->name); wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback); - return(1); + pstringin->pact=TRUE; + return(0); } default : if(recGblSetSevr(pstringin,SOFT_ALARM,VALID_ALARM)){ diff --git a/src/dev/devSoTestAsyn.c b/src/dev/devSoTestAsyn.c index 7c29074e3..8f269f439 100644 --- a/src/dev/devSoTestAsyn.c +++ b/src/dev/devSoTestAsyn.c @@ -33,6 +33,7 @@ * .02 01-08-92 jba Added cast in call to wdStart to avoid compile warning msg * .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 * ... */ @@ -137,7 +138,8 @@ static long write_stringout(pstringout) callbackSetPriority(pstringout->prio,pcallback); printf("%s Starting asynchronous processing\n",pstringout->name); wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback); - return(1); + pstringout->pact=TRUE; + return(0); } default : if(recGblSetSevr(pstringout,SOFT_ALARM,VALID_ALARM)){ diff --git a/src/dev/devWfTestAsyn.c b/src/dev/devWfTestAsyn.c index 91315b82d..9a2335b58 100644 --- a/src/dev/devWfTestAsyn.c +++ b/src/dev/devWfTestAsyn.c @@ -34,6 +34,7 @@ * .02 01-08-92 jba Added cast in call to wdStart to avoid compile warning msg * .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 * ... */ @@ -137,7 +138,8 @@ static long read_wf(pwf) callbackSetPriority(pwf->prio,pcallback); printf("%s Starting asynchronous processing\n",pwf->name); wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback); - return(1); + pwf->pact=TRUE; + return(0); } default : if(recGblSetSevr(pwf,SOFT_ALARM,VALID_ALARM)){