Upgrade cnvdump added for Sv, DTv and ATv added

src/exp/com/src/os_linux/upgrade.sh

@@ -628,13 +628,14 @@ usage()
 {
   cat << EOF
 
-  upgrade.sh  Upgrade from V5.4 to V5.5
+  upgrade.sh  Upgrade from V5.5 to V5.6
 
 
   Pass
 
     savedirectory  Save directory volume.
     classvolumes   Create loadfiles for classvolumes.
+    cnvdump	   Convert dumpfiles.
     renamedb	   Rename old databases.
     loaddb         Load databases.
     compile        Compile all plcprograms in the database
@@ -678,7 +679,7 @@ for db in $tmp; do
   fi
 done
 
-passes="savedirectory classvolumes renamedb loaddb compile createload buildnodes createpackage"
+passes="savedirectory classvolumes cnvdump renamedb loaddb compile createload buildnodes createpackage"
 #echo "Pass: $passes"
 echo ""
 echo -n "Enter start pass [savedirectory] > "

src/lib/rt/src/rt_plc_macro_time.h

@@ -118,6 +118,18 @@
     lck_UnlockTime; \
   }
 
+/*_*
+  CSTODTP
+  Store conditionally into delta time attribute	
+  @aref cstodtp CStoDTp
+*/
+#define CStoDTp_exec(ut,in,cond) \
+  if ( cond) { \
+    lck_LockTime; \
+    ut = in; \
+    lck_UnlockTime; \
+  }
+
 /*_*
   GetATp
   Get absolute time attribute
@@ -138,18 +150,6 @@
   object->ActVal = in; \
   lck_UnlockTime;
 
-/*_*
-  CSTODTP
-  Store conditionally into delta time attribute	
-  @aref cstodtp CStoDTp
-*/
-#define CStoDTp_exec(ut,in,cond) \
-  if ( cond) { \
-    lck_LockTime; \
-    ut = in; \
-    lck_UnlockTime; \
-  }
-
 /*_*
   ATADD
   @aref atadd AtAdd