From 967330fcd6c63e0b2610b2c34e1846f22df60b79 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Fri, 9 May 2008 22:16:29 +0000
Subject: [PATCH] Cleanup, changed task names.

---
 src/libCom/osi/os/default/osdSysTime.c |  7 ++-----
 src/libCom/osi/osiNTPTime.c            | 16 +++++++---------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/libCom/osi/os/default/osdSysTime.c b/src/libCom/osi/os/default/osdSysTime.c
index ed63ff2cc..a61fed135 100644
--- a/src/libCom/osi/os/default/osdSysTime.c
+++ b/src/libCom/osi/os/default/osdSysTime.c
@@ -13,19 +13,16 @@
 #include "epicsTypes.h"
 #include "cantProceed.h"
 #include "errlog.h"
-#include "epicsExport.h"
 #include "epicsThread.h"
-#include "osdThread.h"
 #include "epicsMutex.h"
 #include "epicsTime.h"
-#include "envDefs.h"
+#include "generalTimeSup.h"
 
 #define BILLION 1000000000
 
 #define SYS_TIME_DRV_VERSION "system Time Driver Version 1.3"
 #define SYNC_PERIOD 60.0
 
-#include "generalTimeSup.h"
 
 static void SysTimeSyncTime(void *param);
 static int SysTimeGetCurrent(epicsTimeStamp *pDest);
@@ -79,7 +76,7 @@ long SysTime_InitOnce(int priority)
     generalTimeCurrentTpRegister("system Time", priority, SysTimeGetCurrent);
 
     /* Create the synchronization thread */
-    epicsThreadCreate("System Time Sync", epicsThreadPriorityLow,
+    epicsThreadCreate("SysTimeSync", epicsThreadPriorityLow,
             epicsThreadGetStackSize(epicsThreadStackSmall), SysTimeSyncTime, 
             NULL);
     return 0;
diff --git a/src/libCom/osi/osiNTPTime.c b/src/libCom/osi/osiNTPTime.c
index 0de52e29d..9b3db4ae7 100644
--- a/src/libCom/osi/osiNTPTime.c
+++ b/src/libCom/osi/osiNTPTime.c
@@ -1,10 +1,9 @@
 /*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+* Copyright (c) 2008 UChicago Argonne LLC, as Operator of Argonne
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
@@ -31,6 +30,7 @@
 #include "epicsTime.h"
 #include "envDefs.h"
 #include "errlog.h"
+#include "epicsGeneralTime.h"
 #include "generalTimeSup.h"
 #include "osdTime.h"
 
@@ -39,9 +39,8 @@
 
 #define NTPTIME_DRV_VERSION "NTPTime Driver Version 1.3"
 
-#include "epicsGeneralTime.h"
 
-static void NTPTimeSyncNTP(void);
+static void NTPTimeSyncNTP(void *dummy);
 static int  NTPTimeGetCurrent(epicsTimeStamp *pDest);
 
 long    NTPTime_Report(int level);
@@ -58,7 +57,7 @@ typedef struct NTPTimePvt {
 static NTPTimePvt *pNTPTimePvt = 0;
 static int nConsecutiveBad = 0;
 
-static void NTPTimeSyncNTP(void)
+static void NTPTimeSyncNTP(void *dummy)
 {
     struct timespec Currtime;
     epicsTimeStamp epicsTime;
@@ -143,10 +142,9 @@ static long NTPTime_InitOnce(int priority)
         printf("First try to sync with NTP server succeed!\n");
     }
 
-    epicsThreadCreate("NTPTimeSyncNTP",
-        epicsThreadPriorityHigh,
+    epicsThreadCreate("NTPTimeSync", epicsThreadPriorityHigh,
         epicsThreadGetStackSize(epicsThreadStackSmall),
-        (EPICSTHREADFUNC)NTPTimeSyncNTP,0);
+        NTPTimeSyncNTP, NULL);
     
     /* register to link list */
     generalTimeCurrentTpRegister("NTP", priority, NTPTimeGetCurrent);