changes for 3.14
This commit is contained in:
@@ -35,22 +35,23 @@
|
||||
* .06 04-05-94 mrk ANSI changes to callback routines
|
||||
* ...
|
||||
*/
|
||||
#include <vxWorks.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <wdLib.h>
|
||||
#include <memLib.h>
|
||||
#include <string.h>
|
||||
#include <alarm.h>
|
||||
#include <callback.h>
|
||||
#include <cvtTable.h>
|
||||
#include <dbDefs.h>
|
||||
#include <dbAccess.h>
|
||||
#include <recSup.h>
|
||||
#include <devSup.h>
|
||||
#include <link.h>
|
||||
#include <dbCommon.h>
|
||||
#include <histogramRecord.h>
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "alarm.h"
|
||||
#include "osiWatchdog.h"
|
||||
#include "osiClock.h"
|
||||
#include "callback.h"
|
||||
#include "cvtTable.h"
|
||||
#include "dbDefs.h"
|
||||
#include "dbAccess.h"
|
||||
#include "recSup.h"
|
||||
#include "devSup.h"
|
||||
#include "link.h"
|
||||
#include "dbCommon.h"
|
||||
#include "histogramRecord.h"
|
||||
|
||||
/* Create the dset for devHistogramTestAsyn */
|
||||
static long init_record();
|
||||
@@ -76,7 +77,7 @@ struct {
|
||||
struct callback {
|
||||
CALLBACK callback;
|
||||
struct dbCommon *precord;
|
||||
WDOG_ID wd_id;
|
||||
watchdogId wd_id;
|
||||
};
|
||||
|
||||
static void myCallback(pcallback)
|
||||
@@ -102,7 +103,7 @@ static long init_record(phistogram)
|
||||
phistogram->dpvt = (void *)pcallback;
|
||||
callbackSetCallback(myCallback,&pcallback->callback);
|
||||
pcallback->precord = (struct dbCommon *)phistogram;
|
||||
pcallback->wd_id = wdCreate();
|
||||
pcallback->wd_id = watchdogCreate();
|
||||
if(recGblInitConstantLink(&phistogram->svl,DBF_DOUBLE,&phistogram->sgnl))
|
||||
phistogram->udf = FALSE;
|
||||
break;
|
||||
@@ -127,11 +128,12 @@ static long read_histogram(phistogram)
|
||||
printf("%s Completed\n",phistogram->name);
|
||||
return(0); /*add count*/
|
||||
} else {
|
||||
wait_time = (int)(phistogram->disv * vxTicksPerSecond);
|
||||
wait_time = (int)(phistogram->disv * clockGetRate());
|
||||
if(wait_time<=0) return(0);
|
||||
callbackSetPriority(phistogram->prio,&pcallback->callback);
|
||||
printf("%s Starting asynchronous processing\n",phistogram->name);
|
||||
wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback);
|
||||
watchdogStart(pcallback->wd_id,wait_time,
|
||||
(WATCHDOGFUNC)callbackRequest,(void *)pcallback);
|
||||
phistogram->pact=TRUE;
|
||||
return(0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user