From a8eaec8d1777f282f1220017078c398324730d81 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Tue, 20 Jun 2000 19:54:40 +0000 Subject: [PATCH] drvTS is now optional for vxWorks --- src/vxWorks/db/Makefile | 4 ++-- src/vxWorks/db/drvTS.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/vxWorks/db/Makefile b/src/vxWorks/db/Makefile index 8f03d9fdc..ee9990a6b 100644 --- a/src/vxWorks/db/Makefile +++ b/src/vxWorks/db/Makefile @@ -5,10 +5,10 @@ include $(TOP)/configure/CONFIG INC += drvTS.h INC += devLib.h -vxDb_SRCS += drvTS.c vxDb_SRCS += devLib.c vxDb_SRCS += devLibVxWorks.c -vxDb_SRCS += date.c + +OBJS_vxWorks += drvTS LIBRARY_vxWorks = vxDb diff --git a/src/vxWorks/db/drvTS.c b/src/vxWorks/db/drvTS.c index f6b87da0f..381e1909a 100644 --- a/src/vxWorks/db/drvTS.c +++ b/src/vxWorks/db/drvTS.c @@ -13,6 +13,9 @@ /* * $Log$ + * Revision 1.35 2000/06/16 14:08:54 mrk + * get rid of tsSubr; more call to TSinit to os/osdThead + * * Revision 1.34 2000/02/22 19:07:16 mrk * change osiSockResource.h to osiSock.h * @@ -185,6 +188,7 @@ #include "drvSup.h" #include "drvTS.h" #include "osiSock.h" +#include "iocClock.h" #define TSprintf epicsPrintf @@ -566,6 +570,8 @@ long TSinit(void) Debug0(5,"In TSinit()\n"); if(TSinitialized) return(0); + /*register with iocClock */ + iocClockRegister(TScurrentTimeStamp,TSgetTimeStamp); TSinitialized = 1; /* 0=default, 1=none, 2=direct */