From bcd85a8304343364e39a6279fa2cb21868ada0b2 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Wed, 21 Jul 2021 10:18:18 +0200
Subject: [PATCH] have separate PVA variable to select softIocPVA instead of
 softIoc

---
 startup.script_common | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/startup.script_common b/startup.script_common
index 44c1f9b..c4f38d2 100644
--- a/startup.script_common
+++ b/startup.script_common
@@ -81,6 +81,7 @@ R3_15    = strncmp(EPICS,"R3.15.",6)==0
 R3_16    = strncmp(EPICS,"R3.16.",6)==0
 R3       = strncmp(EPICS,"R3.",3)==0
 R7       = strncmp(EPICS,"R7.",3)==0
+PVA      = R7&&VX6
 
 # Time server (must be set before loading iocCoreLibrary.munch for 3.14.12)
 # Need EPICS_TS_FORCE_NTPTIME for 7.0
@@ -91,7 +92,7 @@ putenv "EPICS_TS_FORCE_NTPTIME=YES"
 # 3.13:  "iocCore"
 # 3.14:  "iocCoreLibrary.munch"
 # 3.15+: "softIoc.munch" (could do this from 3.14.12 on)
-EPICS_APP = R3_13 ? "iocCore" : R3_14 ? "iocCoreLibrary.munch" : R7 ? "softIocPVA.munch" : "softIoc.munch"
+EPICS_APP = R3_13 ? "iocCore" : R3_14 ? "iocCoreLibrary.munch" : PVA ? "softIocPVA.munch" : "softIoc.munch"
 sprintf STRINGBUFFER, "/epics/base-%s/bin/%s/%s", EPICS+1, EPICS_HOST_ARCH, EPICS_APP
 printf "loading %s\n",STRINGBUFFER
 ld 0, 0, STRINGBUFFER
@@ -113,10 +114,10 @@ execute STRINGBUFFER
 iocLogInit
 errlogPrintf "Starting EPICS %s\n", EPICS
 
-sprintf STRINGBUFFER, R3_13||R3_14 ? ";" : "dbLoadDatabase \"/epics/base-%s/dbd/softIoc%s.dbd\"", EPICS+1, R7 ? "PVA" : ""
+sprintf STRINGBUFFER, R3_13||R3_14 ? ";" : "dbLoadDatabase \"/epics/base-%s/dbd/softIoc%s.dbd\"", EPICS+1, PVA ? "PVA" : ""
 execute STRINGBUFFER
 
-sprintf STRINGBUFFER, R3_13||R3_14 ? ";" : "softIoc%s_registerRecordDeviceDriver pdbbase", R7 ? "PVA" : ""
+sprintf STRINGBUFFER, R3_13||R3_14 ? ";" : "softIoc%s_registerRecordDeviceDriver pdbbase", PVA ? "PVA" : ""
 execute STRINGBUFFER
 
 # load "require"