avoid magic 50

clarify EVR time source priority
aderbenev · Aug 9, 2017 · 93bfffc · 93bfffc
1 parent 08e6b01
commit 93bfffc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/evgMrmApp/src/evgMrm.cpp b/evgMrmApp/src/evgMrm.cpp
@@ -417,7 +417,7 @@ evgMrm::sendTimestamp() {
 
     struct epicsTimeStamp ts;
     epicsTime ntpTime, storedTime;
-    if(epicsTimeOK == generalTimeGetExceptPriority(&ts, 0, 50)) {
+    if(epicsTimeOK == generalTimeGetExceptPriority(&ts, 0, ER_PROVIDER_PRIORITY)) {
         ntpTime = ts;
         storedTime = (epicsTime)getTimestamp();
 
@@ -449,7 +449,7 @@ evgMrm::incrTimestamp() {
 
 void
 evgMrm::syncTimestamp() {
-    if(epicsTimeOK != generalTimeGetExceptPriority(&m_timestamp, 0, 50))
+    if(epicsTimeOK != generalTimeGetExceptPriority(&m_timestamp, 0, ER_PROVIDER_PRIORITY))
         return;
     /*
      * Generally nano seconds should be close to zero.

diff --git a/evgMrmApp/src/evgMrm.h b/evgMrmApp/src/evgMrm.h
@@ -191,7 +191,7 @@ class wdTimer : public epicsThreadRunable {
              while(!timeout)
                  timeout = !m_evg->getTimerEvent()->wait(1 + evgAllowedTsGitter);
 
-             if(epicsTimeOK == generalTimeGetExceptPriority(&ts, 0, 50)) {
+             if(epicsTimeOK == generalTimeGetExceptPriority(&ts, 0, ER_PROVIDER_PRIORITY)) {
                  printf("Timestamping timeout\n");
                  ((epicsTime)ts).show(1);
              }

diff --git a/evrApp/src/evrGTIF.h b/evrApp/src/evrGTIF.h
@@ -25,10 +25,6 @@ extern "C" {
  * of the EVR interface for use with generalTime.
  */
 
-/** @brief Priority given to EVR's timestamp/event provider
- */
-#define ER_PROVIDER_PRIORITY 50
-
 /* Must be called before other functions.  Returns non-zero on error */
 epicsShareFunc
 int EVRInitTime();

diff --git a/evrFRIBApp/src/evr_frib.cpp b/evrFRIBApp/src/evr_frib.cpp
@@ -52,7 +52,7 @@ EVRFRIB::EVRFRIB(const std::string& s,
     case FWInfo_Flavor_EVG:
     {
         epicsTimeStamp now;
-        if(epicsTimeOK == generalTimeGetExceptPriority(&now, 0, 50)) {
+        if(epicsTimeOK == generalTimeGetExceptPriority(&now, 0, ER_PROVIDER_PRIORITY)) {
             // start simulated time from the present
             timeoffset = POSIX_TIME_AT_EPICS_EPOCH + now.secPastEpoch - LE_READ32(base, TimeSec);
         }

diff --git a/mrfCommon/src/mrfCommon.h b/mrfCommon/src/mrfCommon.h
@@ -123,6 +123,10 @@ using std::auto_ptr;
 #define MRF_EVENT_END_OF_SEQUENCE  0x7F
 
 
+/** @brief Priority given to EVR's timestamp/event provider
+ */
+#define ER_PROVIDER_PRIORITY 50
+
 /**************************************************************************************************/
 /*  MRF Supported Bus Types                                                                       */
 /**************************************************************************************************/