From 6529b031069d378cc5c1fe8419a67bca8bffd4da Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Thu, 10 Jun 2021 16:08:11 +0200
Subject: [PATCH] load softIocPVA for EPICS 7

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

diff --git a/startup.script_common b/startup.script_common
index 4216dfd..5848923 100644
--- a/startup.script_common
+++ b/startup.script_common
@@ -78,6 +78,7 @@ R3_13    = strncmp(EPICS,"R3.13.",6)==0
 R3_14    = strncmp(EPICS,"R3.14.",6)==0
 R3_14_8  = strcmp(EPICS,"R3.14.8")==0
 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
 
@@ -90,7 +91,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" : "softIoc.munch"
+EPICS_APP = R3_13 ? "iocCore" : R3_14 ? "iocCoreLibrary.munch" : R7 ? "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
@@ -112,10 +113,10 @@ execute STRINGBUFFER
 iocLogInit
 errlogPrintf "Starting EPICS %s\n", EPICS
 
-sprintf STRINGBUFFER, R3_13||R3_14 ? ";" : "dbLoadDatabase \"/epics/base-%s/dbd/softIoc.dbd\"", EPICS+1
+sprintf STRINGBUFFER, R3_13||R3_14 ? ";" : "dbLoadDatabase \"/epics/base-%s/dbd/softIoc%s.dbd\"", EPICS+1, R7 ? "PVA" : ""
 execute STRINGBUFFER
 
-sprintf STRINGBUFFER, R3_13||R3_14 ? ";" : "softIoc_registerRecordDeviceDriver pdbbase"
+sprintf STRINGBUFFER, R3_13||R3_14 ? ";" : "softIoc%s_registerRecordDeviceDriver pdbbase", R7 ? "PVA" : ""
 execute STRINGBUFFER
 
 # load "require"