changes for 3.14

src/dev/testDev/Makefile

@@ -1,6 +1,21 @@
 TOP=../../..
 
-include $(TOP)/config/CONFIG_BASE
+include $(TOP)/configure/CONFIG
+
+SRCS += devAiTestAsyn.c
+SRCS += devAoTestAsyn.c
+SRCS += devBiTestAsyn.c
+SRCS += devBoTestAsyn.c
+SRCS += devEventTestIoEvent.c
+SRCS += devHistogramTestAsyn.c
+SRCS += devMbbiTestAsyn.c
+SRCS += devMbboTestAsyn.c
+SRCS += devSiTestAsyn.c
+SRCS += devSoTestAsyn.c
+SRCS += devWfTestAsyn.c
+
+IOC_PROD_vxWorks = $(SRCS:%.c=%.o)
+
+include $(TOP)/configure/RULES_BUILD
 
-include $(TOP)/config/RULES_ARCHS
 

src/dev/testDev/Makefile.Vx

@@ -1,20 +0,0 @@
-TOP = ../../../..
-include $(TOP)/config/CONFIG_BASE
-
-SRCS.c += ../devAiTestAsyn.c
-SRCS.c += ../devAoTestAsyn.c
-SRCS.c += ../devBiTestAsyn.c
-SRCS.c += ../devBoTestAsyn.c
-SRCS.c += ../devEventTestIoEvent.c
-SRCS.c += ../devHistogramTestAsyn.c
-SRCS.c += ../devMbbiTestAsyn.c
-SRCS.c += ../devMbboTestAsyn.c
-SRCS.c += ../devSiTestAsyn.c
-SRCS.c += ../devSoTestAsyn.c
-SRCS.c += ../devWfTestAsyn.c
-
-PROD = $(SRCS.c:../%.c=%.o)
-
-include $(TOP)/config/RULES.Vx
-
-

src/dev/testDev/devAiTestAsyn.c

@@ -38,23 +38,23 @@
  *      ...
  */
 
-#include	<vxWorks.h>
-#include	<stdlib.h>
-#include	<stdio.h>
-#include	<string.h>
-#include	<wdLib.h>
-#include	<memLib.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.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	<aiRecord.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 "aiRecord.h"
 
 /* Create the dset for devAiTestAsyn */
 static long init_record();
@@ -80,7 +80,7 @@ struct {
 struct callback {
 	CALLBACK	callback;
 	struct dbCommon *precord;
-	WDOG_ID wd_id;
+	watchdogId wd_id;
 };
 
 
@@ -107,7 +107,7 @@ static long init_record(pai)
 	pai->dpvt = (void *)pcallback;
 	callbackSetCallback(myCallback,&pcallback->callback);
 	pcallback->precord = (struct dbCommon *)pai;
-	pcallback->wd_id = wdCreate();
+	pcallback->wd_id = watchdogCreate();
 	if(recGblInitConstantLink(&pai->inp,DBF_DOUBLE,&pai->val))
 	    pai->udf = FALSE;
 	break;
@@ -132,11 +132,12 @@ static long read_ai(pai)
 		printf("Completed asynchronous processing: %s\n",pai->name);
 		return(2); /* don`t convert*/
 	} else {
-		wait_time = (int)(pai->disv * vxTicksPerSecond);
+		wait_time = (int)(pai->disv * clockGetRate());
 		if(wait_time<=0) return(2);
 		callbackSetPriority(pai->prio,&pcallback->callback);
 		printf("Starting asynchronous processing: %s\n",pai->name);
-		wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback);
+		watchdogStart(pcallback->wd_id,wait_time,
+                    (WATCHDOGFUNC)callbackRequest,(void *)pcallback);
 		pai->pact=TRUE;
     		return(0);
 	}

src/dev/testDev/devAoTestAsyn.c

@@ -40,23 +40,23 @@
  */
 
 
-#include	<vxWorks.h>
-#include	<stdlib.h>
-#include	<string.h>
-#include	<stdio.h>
-#include	<wdLib.h>
-#include	<memLib.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.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	<aoRecord.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 "aoRecord.h"
 
 /* Create the dset for devAoTestAsyn */
 static long init_record();
@@ -82,7 +82,7 @@ struct {
 struct callback {
 	CALLBACK        callback;
 	struct dbCommon *precord;
-	WDOG_ID wd_id;
+	watchdogId wd_id;
 };
 
 static void myCallback(pcallback)
@@ -110,7 +110,7 @@ static long init_record(pao)
 	pao->dpvt = (void *)pcallback;
 	callbackSetCallback(myCallback,&pcallback->callback);
 	pcallback->precord = (struct dbCommon *)pao;
-	pcallback->wd_id = wdCreate();
+	pcallback->wd_id = watchdogCreate();
 	break;
     default :
 	recGblRecordError(S_db_badField,(void *)pao,
@@ -133,11 +133,12 @@ static long write_ao(pao)
 		printf("Completed asynchronous processing: %s\n",pao->name);
 		return(0);
 	} else {
-		wait_time = (int)(pao->disv * vxTicksPerSecond);
+		wait_time = (int)(pao->disv * clockGetRate());
 		if(wait_time<=0) return(0);
 		callbackSetPriority(pao->prio,&pcallback->callback);
 		printf("Starting asynchronous processing: %s\n",pao->name);
-		wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback);
+		watchdogStart(pcallback->wd_id,wait_time,
+                    (WATCHDOGFUNC)callbackRequest,(void *)pcallback);
 		pao->pact=TRUE;
 		return(0);
 	}

src/dev/testDev/devBiTestAsyn.c

@@ -40,22 +40,22 @@
  */
 
 
-#include	<vxWorks.h>
-#include	<stdlib.h>
-#include	<stdio.h>
-#include	<wdLib.h>
-#include	<memLib.h>
-#include	<string.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 
-#include	<alarm.h>
-#include	<callback.h>
-#include	<dbDefs.h>
-#include	<dbAccess.h>
-#include	<recSup.h>
-#include	<devSup.h>
-#include	<link.h>
-#include	<dbCommon.h>
-#include	<biRecord.h>
+#include "alarm.h"
+#include "osiWatchdog.h"
+#include "osiClock.h"
+#include "callback.h"
+#include "dbDefs.h"
+#include "dbAccess.h"
+#include "recSup.h"
+#include "devSup.h"
+#include "link.h"
+#include "dbCommon.h"
+#include "biRecord.h"
 
 /* Create the dset for devBiTestAsyn */
 static long init_record();
@@ -81,7 +81,7 @@ struct {
 struct callback {
 	CALLBACK        callback;
 	struct dbCommon *precord;
-	WDOG_ID wd_id;
+	watchdogId wd_id;
 };
 
 
@@ -109,7 +109,7 @@ static long init_record(pbi)
 	pbi->dpvt = (void *)pcallback;
 	callbackSetCallback(myCallback,&pcallback->callback);
 	pcallback->precord = (struct dbCommon *)pbi;
-	pcallback->wd_id = wdCreate();
+	pcallback->wd_id = watchdogCreate();
 	if(recGblInitConstantLink(&pbi->inp,DBF_ENUM,&pbi->val))
 	    pbi->udf = FALSE;
 	break;
@@ -134,11 +134,12 @@ static long read_bi(pbi)
 		printf("%s Completed\n",pbi->name);
 		return(2); /* don't convert */
 	} else {
-		wait_time = (int)(pbi->disv * vxTicksPerSecond);
+		wait_time = (int)(pbi->disv * clockGetRate());
 		if(wait_time<=0) return(0);
 		callbackSetPriority(pbi->prio,&pcallback->callback);
 		printf("%s Starting asynchronous processing\n",pbi->name);
-		wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback);
+		watchdogStart(pcallback->wd_id,wait_time,
+                    (WATCHDOGFUNC)callbackRequest,(void *)pcallback);
 		pbi->pact=TRUE;	
 		return(0);
 	}

src/dev/testDev/devBoTestAsyn.c

@@ -40,24 +40,23 @@
  */
 
 
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 
-#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	<boRecord.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 "boRecord.h"
 
 /* Create the dset for devBoTestAsyn */
 static long init_record();
@@ -83,7 +82,7 @@ struct {
 struct callback {
         CALLBACK        callback;
         struct dbCommon *precord;
-        WDOG_ID wd_id;
+        watchdogId wd_id;
 };
 
 static void myCallback(pcallback)
@@ -110,7 +109,7 @@ static long init_record(pbo)
 	pbo->dpvt = (void *)pcallback;
 	callbackSetCallback(myCallback,&pcallback->callback);
 	pcallback->precord = (struct dbCommon *)pbo;
-	pcallback->wd_id = wdCreate();
+	pcallback->wd_id = watchdogCreate();
 	break;
     default :
 	recGblRecordError(S_db_badField,(void *)pbo,
@@ -133,11 +132,12 @@ static long write_bo(pbo)
 		printf("%s Completed\n",pbo->name);
 		return(0);
 	} else {
-		wait_time = (int)(pbo->disv * vxTicksPerSecond);
+		wait_time = (int)(pbo->disv * clockGetRate());
 		if(wait_time<=0) return(0);
 		callbackSetPriority(pbo->prio,&pcallback->callback);
 		printf("%s Starting asynchronous processing\n",pbo->name);
-		wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback);
+                watchdogStart(pcallback->wd_id,wait_time,
+                    (WATCHDOGFUNC)callbackRequest,(void *)pcallback);
 		pbo->pact=TRUE;
 		return(0);
 	}

src/dev/testDev/devEventTestIoEvent.c

@@ -32,17 +32,18 @@
  *      ...
  */
 
-#include	<vxWorks.h>
-#include	<stdlib.h>
-#include	<stdio.h>
-#include	<wdLib.h>
-#include	<string.h>
-#include	<dbDefs.h>
-#include	<dbAccess.h>
-#include	<dbScan.h>
-#include	<recSup.h>
-#include	<devSup.h>
-#include	<eventRecord.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "dbDefs.h"
+#include "osiWatchdog.h"
+#include "dbAccess.h"
+#include "dbScan.h"
+#include "recSup.h"
+#include "devSup.h"
+#include "eventRecord.h"
 /* Create the dset for devEventTestIoEvent */
 static long init();
 static long get_ioint_info();
@@ -64,7 +65,7 @@ struct {
 };
 
 static IOSCANPVT ioscanpvt;
-WDOG_ID wd_id=NULL;
+watchdogId wd_id=NULL;
 
 static long init(after)
 int after;
@@ -90,11 +91,12 @@ static long read_event(pevent)
 {
 	int	wait_time;
 
-	wait_time = (int)(pevent->proc * vxTicksPerSecond);
+	wait_time = (int)pevent->proc;
 	if(wait_time<=0) return(0);
 	pevent->udf = FALSE;
-	if(wd_id==NULL) wd_id = wdCreate();
+	if(wd_id==NULL) wd_id = watchdogCreate();
 	printf("%s Requesting Next ioEnevt\n",pevent->name);
-	wdStart(wd_id,wait_time,(FUNCPTR)scanIoRequest,(int)ioscanpvt);
+        watchdogStart(wd_id,wait_time,
+            (WATCHDOGFUNC)scanIoRequest,(void *)ioscanpvt);
 	return(0);
 }

src/dev/testDev/devHistogramTestAsyn.c

@@ -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);
 	}

src/dev/testDev/devMbbiTestAsyn.c

@@ -40,22 +40,22 @@
  */
 
 
-#include	<vxWorks.h>
-#include	<stdlib.h>
-#include	<stdio.h>
-#include	<wdLib.h>
-#include	<memLib.h>
-#include	<string.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 
-#include	<alarm.h>
-#include	<callback.h>
-#include	<dbDefs.h>
-#include	<dbAccess.h>
-#include	<recSup.h>
-#include	<devSup.h>
-#include	<link.h>
-#include	<dbCommon.h>
-#include	<mbbiRecord.h>
+#include "alarm.h"
+#include "osiWatchdog.h"
+#include "osiClock.h"
+#include "callback.h"
+#include "dbDefs.h"
+#include "dbAccess.h"
+#include "recSup.h"
+#include "devSup.h"
+#include "link.h"
+#include "dbCommon.h"
+#include "mbbiRecord.h"
 
 /* Create the dset for devMbbiTestAsyn */
 static long init_record();
@@ -81,7 +81,7 @@ struct {
 struct callback {
         CALLBACK        callback;
         struct dbCommon *precord;
-        WDOG_ID wd_id;
+        watchdogId wd_id;
 };
 
 static void myCallback(pcallback)
@@ -108,7 +108,7 @@ static long init_record(pmbbi)
 	pmbbi->dpvt = (void *)pcallback;
 	callbackSetCallback(myCallback,&pcallback->callback);
         pcallback->precord = (struct dbCommon *)pmbbi;
-	pcallback->wd_id = wdCreate();
+	pcallback->wd_id = watchdogCreate();
 	if(recGblInitConstantLink(&pmbbi->inp,DBF_ENUM,&pmbbi->val))
 	    pmbbi->udf = FALSE;
 	break;
@@ -133,11 +133,12 @@ static long read_mbbi(pmbbi)
 		printf("%s Completed\n",pmbbi->name);
 		return(2); /* don't convert */
 	} else {
-		wait_time = (int)(pmbbi->disv * vxTicksPerSecond);
+		wait_time = (int)(pmbbi->disv * clockGetRate());
 		if(wait_time<=0) return(0);
 		callbackSetPriority(pmbbi->prio,&pcallback->callback);
 		printf("%s Starting asynchronous processing\n",pmbbi->name);
-		wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback);
+                watchdogStart(pcallback->wd_id,wait_time,
+                    (WATCHDOGFUNC)callbackRequest,(void *)pcallback);
 		pmbbi->pact=TRUE;
 		return(0);
 	}

src/dev/testDev/devMbboTestAsyn.c

@@ -40,23 +40,23 @@
  */
 
 
-#include	<vxWorks.h>
-#include	<stdlib.h>
-#include	<stdio.h>
-#include	<wdLib.h>
-#include	<memLib.h>
-#include	<string.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.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	<mbboRecord.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 "mbboRecord.h"
 
 /* Create the dset for devMbboTestAsyn */
 static long init_record();
@@ -82,7 +82,7 @@ struct {
 struct callback {
         CALLBACK        callback;
         struct dbCommon *precord;
-        WDOG_ID wd_id;
+        watchdogId wd_id;
 };
 
 static void myCallback(pcallback)
@@ -110,7 +110,7 @@ static long init_record(pmbbo)
 	pmbbo->dpvt = (void *)pcallback;
 	callbackSetCallback(myCallback,&pcallback->callback);
         pcallback->precord = (struct dbCommon *)pmbbo;
-	pcallback->wd_id = wdCreate();
+	pcallback->wd_id = watchdogCreate();
 	break;
     default :
 	recGblRecordError(S_db_badField,(void *)pmbbo,
@@ -133,11 +133,12 @@ static long write_mbbo(pmbbo)
 		printf("%s Completed\n",pmbbo->name);
 		return(0);
 	} else {
-		wait_time = (int)(pmbbo->disv * vxTicksPerSecond);
+		wait_time = (int)(pmbbo->disv * clockGetRate());
 		if(wait_time<=0) return(0);
 		callbackSetPriority(pmbbo->prio,&pcallback->callback);
 		printf("%s Starting asynchronous processing\n",pmbbo->name);
-		wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback);
+		watchdogStart(pcallback->wd_id,wait_time,
+                    (WATCHDOGFUNC)callbackRequest,(void *)pcallback);
 		pmbbo->pact=TRUE;
 		return(0);
 	}

src/dev/testDev/devSiTestAsyn.c

@@ -39,22 +39,22 @@
  */
 
 
-#include	<vxWorks.h>
-#include	<stdlib.h>
-#include	<stdio.h>
-#include	<wdLib.h>
-#include	<memLib.h>
-#include	<string.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 
-#include	<alarm.h>
-#include	<callback.h>
-#include	<dbDefs.h>
-#include	<dbAccess.h>
-#include	<recSup.h>
-#include	<devSup.h>
-#include	<link.h>
-#include	<dbCommon.h>
-#include	<stringinRecord.h>
+#include "alarm.h"
+#include "osiWatchdog.h"
+#include "osiClock.h"
+#include "callback.h"
+#include "dbDefs.h"
+#include "dbAccess.h"
+#include "recSup.h"
+#include "devSup.h"
+#include "link.h"
+#include "dbCommon.h"
+#include "stringinRecord.h"
 
 /* Create the dset for devSiTestAsyn */
 static long init_record();
@@ -80,7 +80,7 @@ struct {
 struct callback {
         CALLBACK        callback;
         struct dbCommon *precord;
-        WDOG_ID wd_id;
+        watchdogId wd_id;
 };
 
 static void myCallback(pcallback)
@@ -107,7 +107,7 @@ static long init_record(pstringin)
 	pstringin->dpvt = (void *)pcallback;
 	callbackSetCallback(myCallback,&pcallback->callback);
         pcallback->precord = (struct dbCommon *)pstringin;
-	pcallback->wd_id = wdCreate();
+	pcallback->wd_id = watchdogCreate();
 	if(recGblInitConstantLink(&pstringin->inp,DBF_STRING,pstringin->val))
 	    pstringin->udf = FALSE;
 	break;
@@ -132,11 +132,12 @@ static long read_stringin(pstringin)
 		printf("%s Completed\n",pstringin->name);
 		return(0);
 	} else {
-		wait_time = (int)(pstringin->disv * vxTicksPerSecond);
+		wait_time = (int)(pstringin->disv * clockGetRate());
 		if(wait_time<=0) return(0);
 		callbackSetPriority(pstringin->prio,&pcallback->callback);
 		printf("%s Starting asynchronous processing\n",pstringin->name);
-		wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback);
+		watchdogStart(pcallback->wd_id,wait_time,
+                    (WATCHDOGFUNC)callbackRequest,(void *)pcallback);
 		pstringin->pact=TRUE;
 		return(0);
 	}

src/dev/testDev/devSoTestAsyn.c

@@ -39,23 +39,23 @@
  */
 
 
-#include	<vxWorks.h>
-#include	<stdlib.h>
-#include	<stdio.h>
-#include	<wdLib.h>
-#include	<memLib.h>
-#include	<string.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.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	<stringoutRecord.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 "stringoutRecord.h"
 
 /* Create the dset for devSoTestAsyn */
 static long init_record();
@@ -81,7 +81,7 @@ struct {
 struct callback {
         CALLBACK        callback;
         struct dbCommon *precord;
-        WDOG_ID wd_id;
+        watchdogId wd_id;
 };
 
 static void myCallback(pcallback)
@@ -108,7 +108,7 @@ static long init_record(pstringout)
 	pstringout->dpvt = (void *)pcallback;
 	callbackSetCallback(myCallback,&pcallback->callback);
         pcallback->precord = (struct dbCommon *)pstringout;
-	pcallback->wd_id = wdCreate();
+	pcallback->wd_id = watchdogCreate();
 	break;
     default :
 	recGblRecordError(S_db_badField,(void *)pstringout,
@@ -131,11 +131,12 @@ static long write_stringout(pstringout)
 		printf("%s Completed\n",pstringout->name);
 		return(0); /* don`t convert*/
 	} else {
-		wait_time = (int)(pstringout->disv * vxTicksPerSecond);
+		wait_time = (int)(pstringout->disv * clockGetRate());
 		if(wait_time<=0) return(0);
 		callbackSetPriority(pstringout->prio,&pcallback->callback);
 		printf("%s Starting asynchronous processing\n",pstringout->name);
-		wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback);
+		watchdogStart(pcallback->wd_id,wait_time,
+                    (WATCHDOGFUNC)callbackRequest,(void *)pcallback);
 		pstringout->pact=TRUE;
 		return(0);
 	}

src/dev/testDev/devWfTestAsyn.c

@@ -40,22 +40,22 @@
  */
 
 
-#include	<vxWorks.h>
-#include	<stdlib.h>
-#include	<stdio.h>
-#include	<wdLib.h>
-#include	<memLib.h>
-#include	<string.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 
-#include	<alarm.h>
-#include	<callback.h>
-#include	<dbDefs.h>
-#include	<dbAccess.h>
-#include        <recSup.h>
-#include	<devSup.h>
-#include	<link.h>
-#include	<dbCommon.h>
-#include	<waveformRecord.h>
+#include "alarm.h"
+#include "osiWatchdog.h"
+#include "osiClock.h"
+#include "callback.h"
+#include "dbDefs.h"
+#include "dbAccess.h"
+#include "recSup.h"
+#include "devSup.h"
+#include "link.h"
+#include "dbCommon.h"
+#include "waveformRecord.h"
 
 /* Create the dset for devWfTestAsyn */
 static long init_record();
@@ -81,7 +81,7 @@ struct {
 struct callback {
         CALLBACK        callback;
         struct dbCommon *precord;
-        WDOG_ID wd_id;
+        watchdogId wd_id;
 };
 
 static void myCallback(pcallback)
@@ -107,7 +107,7 @@ static long init_record(pwf)
 	pwf->dpvt = (void *)pcallback;
 	callbackSetCallback(myCallback,&pcallback->callback);
         pcallback->precord = (struct dbCommon *)pwf;
-	pcallback->wd_id = wdCreate();
+	pcallback->wd_id = watchdogCreate();
 	pwf->nord = 0;
 	break;
     default :
@@ -131,11 +131,12 @@ static long read_wf(pwf)
 		printf("%s Completed\n",pwf->name);
 		return(0); /* don`t convert*/
 	} else {
-		wait_time = (int)(pwf->disv * vxTicksPerSecond);
+		wait_time = (int)(pwf->disv * clockGetRate());
 		if(wait_time<=0) return(0);
 		callbackSetPriority(pwf->prio,&pcallback->callback);
 		printf("%s Starting asynchronous processing\n",pwf->name);
-		wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback);
+		watchdogStart(pcallback->wd_id,wait_time,
+                    (WATCHDOGFUNC)callbackRequest,(void *)pcallback);
 		pwf->pact=TRUE;
 		return(0);
 	}