epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Clean up some minor issues with differences between RTEMS/vxWorks/POSIX.

Browse Source
This commit is contained in:
W. Eric Norum
2008-04-18 19:20:50 +00:00
parent a3cd917de2
commit fc85afd77c
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libCom/osi/os/RTEMS/osdTime.cpp
View File

@@ -11,12 +11,13 @@
*/
//
#include <rtems.h>
#include "epicsTime.h"
#include "osiNTPTime.h"
#include "osdSysTime.h"
#include "generalTimeSup.h"
extern int rtems_bsdnet_get_ntp(int, int(*)(), struct timespec *);
extern "C" int rtems_bsdnet_get_ntp(int, int(*)(), struct timespec *);
extern "C" epicsShareFunc int epicsShareAPI osdTimeInit(void)
{

8
src/libCom/osi/osiNTPTime.c
View File

@@ -78,7 +78,7 @@ static void NTPTimeSyncNTP(void)
errlogPrintf("NTPTimeSyncWithNTPserver: sntpcTimeGet %s\n",
strerror(errno));
prevStatusBad = 1;
pNTPTimePvt->synced = FALSE;
pNTPTimePvt->synced = 0;
continue;
}
nConsecutiveBad=0;
@@ -96,7 +96,7 @@ static void NTPTimeSyncNTP(void)
pNTPTimePvt->ticksToSkip = (int) ((-1)*diffTime*pNTPTimePvt->tickRate);/* fix bug here */
}
pNTPTimePvt->lastTick = tickGet();
pNTPTimePvt->synced = TRUE;
pNTPTimePvt->synced = 1;
epicsMutexUnlock(pNTPTimePvt->lock);
}
}
@@ -109,7 +109,7 @@ static long NTPTime_InitOnce(int priority)
pNTPTimePvt = callocMustSucceed(1,sizeof(NTPTimePvt),"NTPTime_Init");
pNTPTimePvt->synced = FALSE;
pNTPTimePvt->synced = 0;
pNTPTimePvt->lock = epicsMutexCreate();
pNTPTimePvt->nanosecondsPerTick = BILLION/sysClkRateGet();
pNTPTimePvt->tickRate = sysClkRateGet();
@@ -138,7 +138,7 @@ static long NTPTime_InitOnce(int priority)
epicsMutexMustLock(pNTPTimePvt->lock);
pNTPTimePvt->clock = epicsTime;
pNTPTimePvt->lastTick = tickGet();
pNTPTimePvt->synced = TRUE;
pNTPTimePvt->synced = 1;
epicsMutexUnlock(pNTPTimePvt->lock);
printf("First try to sync with NTP server succeed!\n");
}