From 89570c63c2fd6a538e6eca2d72901ef137048fe6 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Fri, 1 Jul 2022 10:27:10 +0200
Subject: [PATCH] VxWorks 6 related changes

---
 startup.script_common | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/startup.script_common b/startup.script_common
index 06f746e..fbd6526 100644
--- a/startup.script_common
+++ b/startup.script_common
@@ -7,7 +7,7 @@
 EPICS_MODULES = "/ioc/modules"
 
 # Find a better way later to know current require version
-REQUIRE_VERSION="3.2.1"
+REQUIRE_VERSION="3.2.2"
 
 # Set EPICS_HOST_ARCH according to vxWorks version and cpu type
 VX6=(*runtimeVersion>>24)-'5'
@@ -70,7 +70,9 @@ putenv STRINGBUFFER
 # Release memory above 32 MB
 # Code loaded after this must be compiled with -mlongcall
 # at the moment snp24 does not work with this
-memAddToPool sysMemTop(),sysPhysMemTop()-sysMemTop()
+# Don't use with VxWorks 6 because of EDR memory region!
+EXTENDED_MEMORY=VX6?0:sysPhysMemTop()-sysMemTop()
+memAddToPool sysMemTop(),EXTENDED_MEMORY
 EXTENDED_MEMORY=0
 
 # Need to branch a few times on EPICS base release
@@ -81,7 +83,9 @@ 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
+
+# Load PVA only on vxWorks 6 with more than 32 MB RAM
+PVA      = R7 && VX6 && sysPhysMemTop()&0xfc000000
 
 # Time server (must be set before loading iocCoreLibrary.munch for 3.14.12)
 # Need EPICS_TS_FORCE_NTPTIME for 7.0
@@ -170,9 +174,12 @@ ifEnvSet IP_ADDR, R3_13?"":"~172.20.*", "EPICS_CA_AUTO_ADDR_LIST", "NO"
 ifEnvSet IP_ADDR, R3_13?"":"~172.20.*", "EPICS_CA_SERVER_PORT", "5062"
 ifEnvSet IP_ADDR, R3_13?"":"~172.20.*", "EPICS_CAS_SERVER_PORT", "5064"
 ifEnvSet IP_ADDR, R3_13?"":"~172.20.*", "EPICS_CA_ADDR_LIST", SLS_ADDR_LIST
-ifEnvSet IP_ADDR, R3_13?"":"~172.20.*", "EPICS_CAS_AUTO_BEACON_ADDR_LIST", "NO"
-ifEnvSet IP_ADDR, R3_13?"":"~172.20.*", "EPICS_CAS_BEACON_PORT", "5063"
-ifEnvSet IP_ADDR, R3_13?"":"~172.20.*", "EPICS_CAS_BEACON_ADDR_LIST", SLS_BEACON_ADDR_LIST
+
+# I am getting erros from V69 IOCs about the beacons...
+ifEnvSet  IP_ADDR, R3_13?"":"~172.20.*", "EPICS_CAS_AUTO_BEACON_ADDR_LIST","YES"
+#ifEnvSet IP_ADDR, R3_13?"":"~172.20.*", "EPICS_CAS_AUTO_BEACON_ADDR_LIST", "NO"
+#ifEnvSet IP_ADDR, R3_13?"":"~172.20.*", "EPICS_CAS_BEACON_PORT", "5063"
+#ifEnvSet IP_ADDR, R3_13?"":"~172.20.*", "EPICS_CAS_BEACON_ADDR_LIST", SLS_BEACON_ADDR_LIST
 
 # SLS beamlines
 ifEnvSet IP_ADDR, "~129.129.98.*",  "EPICS_CA_ADDR_LIST", "172.20.3.11:5800"