Replaced invalid LT_EPICSBASE logic with working logic from SSCAN. Si…

…nce EPICS_VERSION_INT defined in EPICSbase 3.15, added EPICS_PATCH_LEVEL argument.
EuropeanSpallationSource · Jan 4, 2018 · c1c4407 · c1c4407
1 parent 60aa414
commit c1c4407
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/motorApp/DeltaTauSrc/drvPmac.cc b/motorApp/DeltaTauSrc/drvPmac.cc
@@ -587,7 +587,7 @@ static int motorIsrEnable(int card)
 
     status = pdevLibVirtualOS->pDevConnectInterruptVME(
 	PmacInterruptVector + card,
-#if LT_EPICSBASE(3,14,8)
+#if LT_EPICSBASE(3,14,8,0)
         (void (*)()) motorIsr,
 #else
         (void (*)(void *)) motorIsr,

diff --git a/motorApp/MotorSrc/motor.h b/motorApp/MotorSrc/motor.h
@@ -63,7 +63,11 @@ USAGE...        Definitions and structures common to all levels of motorRecord
 #include <epicsEndian.h>
 
 /* Less than EPICS base version test.*/
-#define LT_EPICSBASE(v,r,l) ((EPICS_VERSION<=(v)) && (EPICS_REVISION<=(r)) && (EPICS_MODIFICATION<(l)))
+#ifndef EPICS_VERSION_INT
+#define VERSION_INT(V,R,M,P) ( ((V)<<24) | ((R)<<16) | ((M)<<8) | (P))
+#define EPICS_VERSION_INT VERSION_INT(EPICS_VERSION, EPICS_REVISION, EPICS_MODIFICATION, EPICS_PATCH_LEVEL)
+#endif
+#define LT_EPICSBASE(V,R,M,P) (EPICS_VERSION_INT < VERSION_INT((V),(R),(M),(P)))
 
 /* Maximum message size of all supported devices; see drv[device].h for maximum
 message size for each device. */

diff --git a/motorApp/MotorSrc/motorRecord.cc b/motorApp/MotorSrc/motorRecord.cc
@@ -468,7 +468,7 @@ static void callbackFunc(struct callback *pcb)
     {
         pmr->mip &= ~MIP_DELAY_REQ;     /* Turn off REQ. */
         pmr->mip |= MIP_DELAY_ACK;      /* Turn on ACK. */
-#if LT_EPICSBASE(3,14,10)
+#if LT_EPICSBASE(3,14,10,0)
 	scanOnce(pmr);
 #else
 	scanOnce((struct dbCommon *) pmr);

diff --git a/motorApp/OmsSrc/drvMAXv.cc b/motorApp/OmsSrc/drvMAXv.cc
@@ -1115,7 +1115,7 @@ static int motorIsrSetup(int card)
 
     status = pdevLibVirtualOS->pDevConnectInterruptVME(
         MAXvInterruptVector + card,
-#if LT_EPICSBASE(3,14,8)
+#if LT_EPICSBASE(3,14,8,0)
         (void (*)()) motorIsr,
 #else
         (void (*)(void *)) motorIsr,

diff --git a/motorApp/OmsSrc/drvOms.cc b/motorApp/OmsSrc/drvOms.cc
@@ -922,7 +922,7 @@ static int motorIsrEnable(int card)
         long status;
         status = pdevLibVirtualOS->pDevConnectInterruptVME(
                                                           omsInterruptVector + card,
-#if LT_EPICSBASE(3,14,8)
+#if LT_EPICSBASE(3,14,8,0)
                                                           (void (*)()) motorIsr,
 #else
                                                           (void (*)(void *)) motorIsr,

diff --git a/motorApp/OmsSrc/drvOms58.cc b/motorApp/OmsSrc/drvOms58.cc
@@ -1070,7 +1070,7 @@ static int motorIsrSetup(int card)
     pmotor = (struct vmex_motor *) (motor_state[card]->localaddr);
 
     status = pdevLibVirtualOS->pDevConnectInterruptVME(omsInterruptVector + card,
-#if LT_EPICSBASE(3,14,8)
+#if LT_EPICSBASE(3,14,8,0)
         (void (*)()) motorIsr,
 #else
         (void (*)(void *)) motorIsr,