From e0861cfbbed6f31139b7ee007edd0ad9a7e13c0b Mon Sep 17 00:00:00 2001 From: zimoch Date: Wed, 2 Feb 2011 10:22:38 +0000 Subject: [PATCH] moved to subdirectories because of incompatobilities in vxworks 6 --- R3.13 | 36 -------------------------------- R3.14.11 | 48 ------------------------------------------- R3.14.8 | 39 ----------------------------------- makelinks | 5 ++--- startup.script_common | 40 +++++++++++++++++++----------------- startup.script_linux | 2 +- startup.script_part2 | 10 +++++---- startup.script_part3 | 3 --- syncTS | 36 -------------------------------- 9 files changed, 30 insertions(+), 189 deletions(-) delete mode 100644 R3.13 delete mode 100644 R3.14.11 delete mode 100644 R3.14.8 delete mode 100644 syncTS diff --git a/R3.13 b/R3.13 deleted file mode 100644 index 49e4aa7..0000000 --- a/R3.13 +++ /dev/null @@ -1,36 +0,0 @@ -cd LIB - -# load EPICS system core -ld < iocCore -ld < seq - -# load EPICS tools like "require" -ld < utilitiesLib -ld < miscLib - -# disable floating point exceptions -slsFppInit - -# next line allows to continue even if mounting of /ioc failed -cd bootInfo("%H:") -cd HOME - -# insert boot infos into database -bootNotify (INSTBASE, "sls/bin/iocBootNotify.sh") - -# try for user-defined menus scan and convert -dbLoadDatabase("dbd/scan.dbd") -dbLoadDatabase("dbd/convert.dbd") -dbLoadDatabase("dbd/slsConvert.dbd") - -#load standard drivers -require "base" - -#temporary, some drivers still don't have dependency files -require "slsDev" - -# setup clock -TSconfigure(0,10,10,18323,18322,250,1) - -# $Id: R3.13,v 1.2 2011/02/02 10:04:00 zimoch Exp $ -# end of startup.script_common diff --git a/R3.14.11 b/R3.14.11 deleted file mode 100644 index 6579fd3..0000000 --- a/R3.14.11 +++ /dev/null @@ -1,48 +0,0 @@ -cd LIB -#required for ifenvsetnew: -ld < utilitiesLib.munch -# disable floating point exceptions -slsFppInit - -# load EPICS system core -ld < iocCoreLibrary.munch - -# load EPICS tools like "require" -ld < miscLib.munch -misc_registerRecordDeviceDriver - -# next line allows to continue even if mounting of /ioc failed -cd bootInfo("%H:") -cd HOME - -# insert boot infos into database -bootNotify (INSTBASE, "sls/bin/iocBootNotify.sh") - -# setup logging -putenv(bootInfo("EPICS_IOC_LOG_INET=%h")) -putenv("EPICS_IOC_LOG_PORT=6500") - -# try for user-defined menus scan and convert -dbLoadDatabase("dbd/scan.dbd") -dbLoadDatabase("dbd/convert.dbd") -dbLoadDatabase("dbd/slsConvert.dbd") - -#load standard drivers -require "base" -require "symbDev" -require "seq" - -# setup clock: -# 2010: -putenv("TIMEZONE=MET::-60:032802:103103") -# 2011: putenv("TIMEZONE=MET::-60:032702:103003") -# 2012: putenv("TIMEZONE=MET::-60:032502:102803") -ifenvsetnew(ifName(),"EPICS_TS_NTP_INET","129.129.190.1","172.19.11.101","172.20.10.10") -#require "generalTime","test" -#EvtTimeConfigure(master?, sync_rate_sec, clock_rate_hz, master_port, slave_port, time_out_msec) -#EvtTimeConfigure(0, 5, 500000, 18323, 18322, 250) - -AUTOSRHOST=bootHost() - -# $Id: R3.14.11,v 1.1 2010/01/04 12:43:59 zimoch Exp $ -# end of startup.script_common diff --git a/R3.14.8 b/R3.14.8 deleted file mode 100644 index 2443385..0000000 --- a/R3.14.8 +++ /dev/null @@ -1,39 +0,0 @@ -cd LIB -#required for ifenvsetnew: -ld < utilitiesLib.munch -# disable floating point exceptions -slsFppInit - -# load EPICS system core -ld < iocCoreLibrary.munch - -# load EPICS tools like "require" -ld < miscLib.munch -misc_registerRecordDeviceDriver - -# next line allows to continue even if mounting of /ioc failed -cd bootInfo("%H:") -cd HOME - -# insert boot infos into database -bootNotify (INSTBASE, "sls/bin/iocBootNotify.sh") - -# try for user-defined menus scan and convert -dbLoadDatabase("dbd/scan.dbd") -dbLoadDatabase("dbd/convert.dbd") -dbLoadDatabase("dbd/slsConvert.dbd") - -# load standard drivers -require "base" -require "symbDev" -require "seq" - -# setup clock -require "generalTime" -#EvtTimeConfigure(master?, sync_rate_sec, clock_rate_hz, master_port, slave_port, time_out_msec) -EvtTimeConfigure(0, 5, 500000, 18323, 18322, 250) - -AUTOSRHOST=bootHost() - -# $Id: R3.14.8,v 1.2 2010/01/04 12:43:59 zimoch Exp $ -# end of startup.script_common diff --git a/makelinks b/makelinks index d904d2f..47ca6ec 100755 --- a/makelinks +++ b/makelinks @@ -1,5 +1,4 @@ ln -s R3.13 R3.13.9 ln -s R3.13 R3.13.10 -ln -s syncTS R3.13.9.syncTS -ln -s syncTS R3.13.10.syncTS - +ln -s R3.13.syncTS R3.13.9.syncTS +ln -s R3.13.syncTS R3.13.10.syncTS diff --git a/startup.script_common b/startup.script_common index 2efc226..fbce5b5 100644 --- a/startup.script_common +++ b/startup.script_common @@ -4,7 +4,6 @@ # The following variables should be set before: # * IOC the system name of the ioc # * INSTBASE where to boot from -# * SLSBASE alias for INSTBASE # * EPICS the epics release (e.g "R3.13.9") # * ARCH the vxWorks architecture (e.g. "T1-ppc604") @@ -15,6 +14,19 @@ symFindByName(sysSymTbl,"SLSBASE",&PBASE,0) SLSBASE=*PBASE INSTBASE=*PBASE +# Router for SLS machine net (fails otherwise but that's ok) +routeAdd ("0.0.0.0","172.20.10.1") + +# setup mount points (try both possible locations for /ioc) +hostAdd ("slsfs","129.129.145.52") +nfsMount (&sysBootHost, "/home/ioc", "/home/ioc") +nfsMount (&sysBootHost, "/ioc", "/ioc") +nfsMount ("slsfs", "/export/csa/releases/ioc", "/ioc") +nfsMount ("slsfs","/export/csa/releases/work","/work") +nfsMount ("slsfs","/export/csa/releases/prod","/prod") +nfsMount ("slsfs","/export/csa/releases/devl","/devl") +nfsMount ("slsfs","/export/exchange","/exchange") + STRINGBUFFER=malloc(256) # set the prompt @@ -37,24 +49,14 @@ sprintf (LIB, "%s/iocBoot/%s/%s", INSTBASE, EPICS, ARCH) TEMPLATES=malloc(80) sprintf (TEMPLATES, ".:%s/iocBoot/templates", INSTBASE) -# Router for SLS machine net (fails otherwise but that's ok) -routeAdd ("0.0.0.0","172.20.10.1") - -# setup mount points (try both possible locations for /ioc) -hostAdd ("slsfs","129.129.145.52") -nfsMount (&sysBootHost, "/home/ioc", "/home/ioc") -nfsMount (&sysBootHost, "/ioc", "/ioc") -nfsMount ("slsfs", "/export/csa/releases/ioc", "/ioc") -nfsMount ("slsfs","/export/csa/releases/work","/work") -nfsMount ("slsfs","/export/csa/releases/prod","/prod") -nfsMount ("slsfs","/export/csa/releases/devl","/devl") -nfsMount ("slsfs","/export/exchange","/exchange") - -# All T2-code is compiled with -mlongcall. Thus enable extended memory. -memAddToPool (sysMemTop(),sysPhysMemTop()-sysMemTop()) -EXTENDED_MEMORY=0 +# Memory above 32 MB is blocked to avoid relocation problem +# Release it after libs are loaded and before iocInit +# Code loaded afer iocInit must be compiled with -mlongcall +EXTENDED_MEMORY=sysPhysMemTop()-sysMemTop() #Load EPICS version dependent script sprintf (STRINGBUFFER, "%s/iocBoot/startup/%s", INSTBASE, EPICS) -ioGlobalStdSet (0, open (STRINGBUFFER, 0, 0)) -#startup script contiues at /iocBoot/startup/ +cd STRINGBUFFER +< startup.script_epicsdependent + +# end of startup.script_common diff --git a/startup.script_linux b/startup.script_linux index c2f0ec4..58978d5 100644 --- a/startup.script_linux +++ b/startup.script_linux @@ -1,4 +1,4 @@ epicsEnvSet EPICS, R3.14.8 epicsEnvSet STREAM_PROTOCOL_PATH, .:$(PWD)/cfg epicsEnvSet EPICS_DRIVER_PATH, bin:snl:$(INSTBASE)/iocBoot/$(EPICS)/$(EPICS_HOST_ARCH) -! iocBootNotify.sh $(IOC) - $(SHELLBOX) - $(_) $(PWD)/startup.script - $(EPICS) - +! iocBootNotify.sh $(IOC) - \${SHELLBOX#*:} - $(_) $(PWD)/startup.script - $(EPICS) - diff --git a/startup.script_part2 b/startup.script_part2 index 6c2ec56..0580120 100644 --- a/startup.script_part2 +++ b/startup.script_part2 @@ -2,11 +2,10 @@ # setup clock: # must be done AFTER loading iocCore and BEFORE iocInit -#ifenvsetnew(ifName(),"EPICS_TS_NTP_INET","129.129.190.1","172.19.11.101","172.20.10.10") putenv("EPICS_TS_NTP_INET=129.129.190.1") -# 2010: -putenv("TIMEZONE=MET::-60:032802:103103") -# 2011: putenv("TIMEZONE=MET::-60:032702:103003") +# 2010: putenv("TIMEZONE=MET::-60:032802:103103") +# 2011: +putenv("TIMEZONE=MET::-60:032702:103003") # 2012: putenv("TIMEZONE=MET::-60:032502:102803") putenv("EPICS_TS_MIN_WEST=-60") @@ -21,6 +20,9 @@ putenv(bootInfo("EPICS_CAS_INTF_ADDR_LIST=%e")) putenv("EPICS_CAS_AUTO_BEACON_ADDR_LIST=NO") putenv(bootInfo("EPICS_CAS_BEACON_ADDR_LIST=%B")) +#Enable memory >32MB on IOC that have it. (Is a NOOP on all others) +memAddToPool (sysMemTop(),EXTENDED_MEMORY) + iocInit # initialize records diff --git a/startup.script_part3 b/startup.script_part3 index 77816cf..6c565a0 100644 --- a/startup.script_part3 +++ b/startup.script_part3 @@ -1,6 +1,3 @@ -#Enable memory >32MB on IOC that have it. (Is a NOOP on all others) -memAddToPool (sysMemTop(),EXTENDED_MEMORY) - # set the prompt sprintf (STRINGBUFFER, "%s > ", IOC) shellPromptSet (STRINGBUFFER) diff --git a/syncTS b/syncTS deleted file mode 100644 index 8e7b495..0000000 --- a/syncTS +++ /dev/null @@ -1,36 +0,0 @@ -cd LIB - -# load EPICS system core -ld < iocCore.syncTS -ld < seq - -# load EPICS tools like "require" -ld < utilitiesLib -ld < miscLib - -# disable floating point exceptions -slsFppInit - -# next line allows to continue even if mounting of /ioc failed -cd bootInfo("%H:") -cd HOME - -# insert boot infos into database -bootNotify (INSTBASE, "sls/bin/iocBootNotify.sh") - -# try for user-defined menus scan and convert -dbLoadDatabase("dbd/scan.dbd") -dbLoadDatabase("dbd/convert.dbd") -dbLoadDatabase("dbd/slsConvert.dbd") - -#load standard drivers -require "base" - -# setup clock -require "mrcevg" -require "mrcevr" -require "TSstat" -TSconfigure(0,20,1000,18323,18322,250,0) - -# $Id: syncTS,v 1.2 2010/01/04 12:43:59 zimoch Exp $ -# end of startup.script_common