From dcc8c2354e255bb4d09c36af46328833afed03cb Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Thu, 20 Oct 2022 16:44:16 +0200 Subject: [PATCH] allow to select PVA in user startup script --- startup-vxWorks | 1 + startup.script_common | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/startup-vxWorks b/startup-vxWorks index cfcc8c1..ebd0bd2 100644 --- a/startup-vxWorks +++ b/startup-vxWorks @@ -73,6 +73,7 @@ sprintf CFG, "%s/cfg", HOME sprintf STRINGBUFFER, "CFG=%s", CFG putenv STRINGBUFFER +PVA=0 # load IOC startup script < startup.script diff --git a/startup.script_common b/startup.script_common index 65ea28c..b76c45f 100644 --- a/startup.script_common +++ b/startup.script_common @@ -37,7 +37,7 @@ R3 = strncmp(EPICS,"R3.",3)==0 R7 = strncmp(EPICS,"R7.",3)==0 # Load PVA only on vxWorks 6 with more than 32 MB RAM -PVA = R7 && VX6 && sysPhysMemTop()&0xfc000000&!getenv("NOPVA") +PVA = R7 && VX6 && (PVA||(sysPhysMemTop()&0xfc000000)) && !getenv("NOPVA") # Time server (must be set before loading iocCoreLibrary.munch for 3.14.12) # Need EPICS_TS_FORCE_NTPTIME for 7.0