changes for 3.14

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