diff --git a/Makefile b/Makefile index e733d8c99..d058e8fbe 100644 --- a/Makefile +++ b/Makefile @@ -6,9 +6,6 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -# -# $Revision-Id$ -# TOP = . include $(TOP)/configure/CONFIG diff --git a/configure/CONFIG b/configure/CONFIG index 4371d4e1a..17440a39e 100644 --- a/configure/CONFIG +++ b/configure/CONFIG @@ -6,8 +6,6 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in the file LICENSE that is included with this distribution. #************************************************************************* -# -# $Revision-Id$ # # Common build definitions diff --git a/configure/CONFIG.CrossCommon b/configure/CONFIG.CrossCommon index 167ba490f..2fa6460d7 100644 --- a/configure/CONFIG.CrossCommon +++ b/configure/CONFIG.CrossCommon @@ -3,9 +3,8 @@ # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found -# in file LICENSE that is included with this distribution. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. #************************************************************************* # Cross compiler default definitions @@ -27,6 +26,6 @@ CROSS_LDFLAGS = $(addprefix -L,$(GNU_TARGET_LIB_DIR)) CMPLR_PREFIX_CROSS=$(addsuffix -,$(GNU_TARGET)) CMPLR_PREFIX=$(CMPLR_PREFIX_$(BUILD_CLASS)) -# All cross builds use the gnu compiler +# Cross builds usually use the gnu compiler include $(CONFIG)/CONFIG.gnuCommon diff --git a/configure/CONFIG.gnuCommon b/configure/CONFIG.gnuCommon index 8e99e9c54..025391548 100644 --- a/configure/CONFIG.gnuCommon +++ b/configure/CONFIG.gnuCommon @@ -7,7 +7,7 @@ # and higher are distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -#-------------------------------------------------- + # GNU compiler defaults GNU = YES diff --git a/configure/CONFIG_ADDONS b/configure/CONFIG_ADDONS index f6b6b8481..29a33c415 100644 --- a/configure/CONFIG_ADDONS +++ b/configure/CONFIG_ADDONS @@ -6,7 +6,6 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -# $Revision-Id$ # # check for add-on CFLAGS and CXXFLAGS # diff --git a/configure/CONFIG_APP_INCLUDE b/configure/CONFIG_APP_INCLUDE index 2d00b52c4..8b4bd7d08 100644 --- a/configure/CONFIG_APP_INCLUDE +++ b/configure/CONFIG_APP_INCLUDE @@ -6,9 +6,6 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in the file LICENSE that is included with this distribution. #************************************************************************* -# -# $Revision-Id$ -# export TOP diff --git a/configure/CONFIG_BASE_VERSION b/configure/CONFIG_BASE_VERSION index d41fe95e2..dd6ae0358 100644 --- a/configure/CONFIG_BASE_VERSION +++ b/configure/CONFIG_BASE_VERSION @@ -7,8 +7,6 @@ # in the file LICENSE that is included with this distribution. #************************************************************************* # -# $Revision-Id$ -# # EPICS Version information # # Only the person making an official EPICS release should make changes in @@ -72,4 +70,5 @@ EPICS_SHORT_VERSION=$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)$(EP EPICS_VERSION_NUMBER=$(EPICS_SHORT_VERSION)$(EPICS_DEV_SNAPSHOT)$(EPICS_SITE_VSTRING) EPICS_VERSION_STRING="EPICS Version $(EPICS_VERSION_NUMBER)" -COMMIT_DATE="\$$Date$$" +# Provide this in case anyone is still using the old name +COMMIT_DATE="-no-date-" diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index 2df341581..79807c2f2 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -7,8 +7,6 @@ # in file LICENSE that is included with this distribution. #************************************************************************* # -# $Revision-Id$ -# # CONFIG_COMMON # # This file is to be maintained by the community. @@ -344,7 +342,7 @@ GENVERSIONDEFAULT = HDEPENDS_METHOD = MKMF -HDEPENDS_MKMFFLAGS = -m $*$(DEP) $(INCLUDES) $@ +HDEPENDS_MKMFFLAGS = -m $@ $(INCLUDES) $*$(OBJ) HDEPENDS_MKMF.c = $(MKMF) $(HDEPENDS_FLAGS) $(HDEPENDS_MKMFFLAGS) HDEPENDS_MKMF.cpp = $(MKMF) $(HDEPENDS_FLAGS) $(HDEPENDS_MKMFFLAGS) diff --git a/configure/CONFIG_ENV b/configure/CONFIG_ENV index 5fe70eab1..173dceaca 100644 --- a/configure/CONFIG_ENV +++ b/configure/CONFIG_ENV @@ -7,7 +7,6 @@ # and higher are distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -# $Revision-Id$ # Author: Andrew Johnson # Date: 20 April 1995 # diff --git a/configure/CONFIG_FILE_TYPE b/configure/CONFIG_FILE_TYPE index c15f4b783..b7870d7e5 100644 --- a/configure/CONFIG_FILE_TYPE +++ b/configure/CONFIG_FILE_TYPE @@ -6,7 +6,6 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in the file LICENSE that is included with this distribution. #************************************************************************* -# $Revision-Id$ # # Macros and rules to create a new installation file type # diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 6c7f08239..d4edb948a 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -6,8 +6,7 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in the file LICENSE that is included with this distribution. #************************************************************************* -# -# $Revision-Id$ + # # CONFIG_SITE - Global site configuration file # @@ -118,6 +117,13 @@ CROSS_COMPILER_TARGET_ARCHS= # configure/os/CONFIG_SITE..Common files instead. CROSS_COMPILER_HOST_ARCHS= +# The 'make runtests' and 'make tapfiles' build targets normally only run +# self-tests for the EPICS_HOST_ARCH architecture. If the host can execute +# the self-test programs for any other cross-built architectures such as +# a -debug architecture, those architectures can be named here. +# +CROSS_COMPILER_RUNTEST_ARCHS= + # Build shared libraries (DLLs on Windows). # Must be either YES or NO. Definitions in the target-specific # os/CONFIG.Common. and os/CONFIG_SITE.Common. files may diff --git a/configure/CONFIG_SITE_ENV b/configure/CONFIG_SITE_ENV index efe2560e0..3a38d68de 100644 --- a/configure/CONFIG_SITE_ENV +++ b/configure/CONFIG_SITE_ENV @@ -6,7 +6,6 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -# $Revision-Id$ # Author: Andrew Johnson # Date: 1 May 1995 # @@ -30,10 +29,8 @@ # local timezone info for vxWorks and RTEMS IOCs. The format is # :::: # where the start and end are mmddhh - that is month,day,hour -# e.g. for ANL in 2015: EPICS_TIMEZONE=CST/CDT::360:030802:110102 +# e.g. for ANL in 2016: EPICS_TIMEZONE=CST/CDT::360:031302:110602 # -# DST for 2015 US: Mar 08 - Nov 01 -# EU: Mar 29 - Oct 25 # DST for 2016 US: Mar 13 - Nov 06 # EU: Mar 27 - Oct 30 # DST for 2017 US: Mar 12 - Nov 05 @@ -42,11 +39,15 @@ # EU: Mar 25 - Oct 28 # DST for 2019 US: Mar 10 - Nov 03 # EU: Mar 31 - Oct 27 -# (see: http://www.timeanddate.com/time/map/) +# DST for 2020 US: Mar 08 - Nov 01 +# EU: Mar 29 - Oct 25 +# DST for 2021 US: Mar 14 - Nov 07 +# EU: Mar 28 - Oct 31 +# (see: http://www.timeanddate.com/time/dst/2016.html etc. ) # -# These values are for 2015: -EPICS_TIMEZONE=CST/CDT::360:030802:110102 -#EPICS_TIMEZONE=CET/CEST::-60:032902:102502 +# These values are for 2016: +EPICS_TIMEZONE=CST/CDT::360:031302:110602 +#EPICS_TIMEZONE=CET/CEST::-60:032702:103002 # EPICS_TS_NTP_INET # NTP time server ip address. Uses boot host if not set. diff --git a/configure/Makefile b/configure/Makefile index 86c59048e..377879766 100644 --- a/configure/Makefile +++ b/configure/Makefile @@ -6,9 +6,6 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -# -# $Revision-Id$ -# TOP=.. diff --git a/configure/RULES b/configure/RULES index 74b33fdd9..bdc895a4d 100644 --- a/configure/RULES +++ b/configure/RULES @@ -7,7 +7,6 @@ # and higher are distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -# $Revision-Id$ ifndef T_A diff --git a/configure/RULES.ioc b/configure/RULES.ioc index 1024fcb22..da314a406 100644 --- a/configure/RULES.ioc +++ b/configure/RULES.ioc @@ -24,11 +24,15 @@ else clean$(DIVIDER)$(ARCH) clean: endif -cdCommands envPaths dllPath.bat relPaths.sh: \ +cdCommands dllPath.bat relPaths.sh: \ $(wildcard $(TOP)/configure/RELEASE*) \ - $(wildcard $(TOP)/configure/CONFIG_SITE*) $(INSTALL_BIN) + $(wildcard $(TOP)/configure/CONFIG_SITE*) | $(INSTALL_BIN) $(CONVERTRELEASE) -a $(ARCH) -t $(IOCS_APPL_TOP) $@ +envPaths: $(wildcard $(TOP)/configure/RELEASE*) \ + $(wildcard $(TOP)/configure/CONFIG_SITE*) | $(INSTALL_BIN) + $(CONVERTRELEASE) -t $(IOCS_APPL_TOP) $@ + realclean: $(RM) cdCommands envPaths dllPath.bat relPaths.sh diff --git a/configure/RULES_ARCHS b/configure/RULES_ARCHS index b14318ed0..6d1808266 100644 --- a/configure/RULES_ARCHS +++ b/configure/RULES_ARCHS @@ -6,9 +6,6 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in the file LICENSE that is included with this distribution. #************************************************************************* -# -# $Revision-Id$ -# all: install host: install$(DIVIDER)$(EPICS_HOST_ARCH) diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index e7b8d8d27..b0f109669 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -6,7 +6,6 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in the file LICENSE that is included with this distribution. #************************************************************************* -# $Revision-Id$ # # Rules for making things specified in Makefile # @@ -170,7 +169,13 @@ endif $(DIRECTORY_TARGETS) : $(MKDIR) $@ -$(PRODNAME): $(INSTALL_LIB_INSTALLS) +# Install LIB_INSTALLS libraries before linking executables +$(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS) + +# Install built libraries too, unless Makefile says to wait +ifneq ($(DELAY_INSTALL_LIBS),YES) +$(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIBS) $(INSTALL_DLLSTUB_LIBS) +endif # RELEASE file consistency checking checkRelease: @@ -319,7 +324,9 @@ $(MODNAME): %$(MODEXT): %$(EXE) # Automated testing runtests: $(TESTSCRIPTS) +ifneq (,$(findstring $(T_A),$(EPICS_HOST_ARCH) $(CROSS_COMPILER_RUNTEST_ARCHS))) -$(PERL) -MTest::Harness -e 'runtests @ARGV if @ARGV;' $^ +endif testspec: $(TESTSCRIPTS) @$(RM) $@ @@ -333,7 +340,9 @@ tapfiles: $(TESTSCRIPTS) $(TAPFILES) # A .tap file is the output from running the associated test script %.tap: %.t +ifneq (,$(findstring $(T_A),$(EPICS_HOST_ARCH) $(CROSS_COMPILER_RUNTEST_ARCHS))) -$(PERL) $< -tap > $@ +endif # If there's a perl test script (.plt) available, use it %.t: ../%.plt diff --git a/configure/RULES_DIRS b/configure/RULES_DIRS index 69cf356b1..755c0cccf 100644 --- a/configure/RULES_DIRS +++ b/configure/RULES_DIRS @@ -6,10 +6,6 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in the file LICENSE that is included with this distribution. #************************************************************************* -# -# $Revision-Id$ -# - ARCHS += $(BUILD_ARCHS) ACTIONS += inc build install buildInstall clean realclean archclean diff --git a/configure/RULES_EXPAND b/configure/RULES_EXPAND index 0f43db347..51657ebd8 100644 --- a/configure/RULES_EXPAND +++ b/configure/RULES_EXPAND @@ -14,8 +14,6 @@ EXPANDFLAGS += $(addprefix -D ,$(EXPAND_VARS)) # The names of files to be expanded must end with '@' EXPANDED = $(EXPAND:%@=%) -buildInstall: $(EXPANDED) - $(EXPANDED): %: %@ $(ECHO) "Expanding $< to $@" @$(RM) $@ @@ -26,7 +24,8 @@ clean: expand_clean expand_clean: @$(RM) $(EXPANDED) -.PHONY : expand_clean +.PRECIOUS: $(EXPANDED) +.PHONY: expand_clean #--------------------------------------------------------------- # Assemblies (files assembled from snippets) diff --git a/configure/RULES_FILE_TYPE b/configure/RULES_FILE_TYPE index 6fc6f61a5..28cc74bd4 100644 --- a/configure/RULES_FILE_TYPE +++ b/configure/RULES_FILE_TYPE @@ -6,9 +6,6 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in the file LICENSE that is included with this distribution. #************************************************************************* -# -# $Revision-Id$ -# # Include /configure/RULES_BUILD from tops defined in RELEASE* files # diff --git a/configure/RULES_OCTAVE b/configure/RULES_OCTAVE index 6ac170984..a06fb075a 100644 --- a/configure/RULES_OCTAVE +++ b/configure/RULES_OCTAVE @@ -7,9 +7,7 @@ # and higher are distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -# $Revision-Id$ -# -#------------------------------------------------------- + # Octave definitions and rules ifeq ($(findstring Host,$(VALID_BUILDS)),Host) diff --git a/configure/RULES_TARGET b/configure/RULES_TARGET index 8e7a1db8e..f8e44db76 100644 --- a/configure/RULES_TARGET +++ b/configure/RULES_TARGET @@ -8,8 +8,6 @@ # in file LICENSE that is included with this distribution. #************************************************************************* # -# $Revision-Id$ -# # RULES_TARGET # # This file is to be maintained by the community. diff --git a/configure/RULES_TOP b/configure/RULES_TOP index 6b21a6673..2aa2e1f33 100644 --- a/configure/RULES_TOP +++ b/configure/RULES_TOP @@ -6,9 +6,6 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in the file LICENSE that is included with this distribution. #************************************************************************* -# -# $Revision-Id$ -# include $(CONFIG)/RULES_DIRS diff --git a/configure/os/CONFIG.Common.RTEMS b/configure/os/CONFIG.Common.RTEMS index 2c4f1e62c..9650ae255 100644 --- a/configure/os/CONFIG.Common.RTEMS +++ b/configure/os/CONFIG.Common.RTEMS @@ -1,7 +1,6 @@ # # This file contains definitions for RTEMS builds # -# $Revision-Id$ # Author: W. Eric Norum # University of Saskatchewan # eric.norum@usask.ca diff --git a/configure/os/CONFIG.Common.RTEMS-beatnik b/configure/os/CONFIG.Common.RTEMS-beatnik index 714bb3782..00080e7fd 100644 --- a/configure/os/CONFIG.Common.RTEMS-beatnik +++ b/configure/os/CONFIG.Common.RTEMS-beatnik @@ -1,6 +1,5 @@ # # CONFIG.Common.RTEMS-beatnik -# $Revision-Id$ # Author: Dayle Kotturi # # All RTEMS targets use the same Makefile fragment diff --git a/configure/os/CONFIG.Common.RTEMS-gen68360 b/configure/os/CONFIG.Common.RTEMS-gen68360 index 3db935e9f..a6663afc2 100644 --- a/configure/os/CONFIG.Common.RTEMS-gen68360 +++ b/configure/os/CONFIG.Common.RTEMS-gen68360 @@ -1,5 +1,4 @@ # -# $Revision-Id$ # Author: W. Eric Norum # Canadian Light Source # eric@cls.usask.ca diff --git a/configure/os/CONFIG.Common.RTEMS-mcp750 b/configure/os/CONFIG.Common.RTEMS-mcp750 index 4d662a7e3..d834ad9ec 100644 --- a/configure/os/CONFIG.Common.RTEMS-mcp750 +++ b/configure/os/CONFIG.Common.RTEMS-mcp750 @@ -1,5 +1,4 @@ # -# $Revision-Id$ # Author: W. Eric Norum # Canadian Light Source # eric@cls.usask.ca diff --git a/configure/os/CONFIG.Common.RTEMS-mvme167 b/configure/os/CONFIG.Common.RTEMS-mvme167 index 3db935e9f..a6663afc2 100644 --- a/configure/os/CONFIG.Common.RTEMS-mvme167 +++ b/configure/os/CONFIG.Common.RTEMS-mvme167 @@ -1,5 +1,4 @@ # -# $Revision-Id$ # Author: W. Eric Norum # Canadian Light Source # eric@cls.usask.ca diff --git a/configure/os/CONFIG.Common.RTEMS-mvme2100 b/configure/os/CONFIG.Common.RTEMS-mvme2100 index aac3650fd..687af2374 100644 --- a/configure/os/CONFIG.Common.RTEMS-mvme2100 +++ b/configure/os/CONFIG.Common.RTEMS-mvme2100 @@ -1,6 +1,5 @@ # # CONFIG.Common.RTEMS-mvme2100 -# $Revision-Id$ # Author: W. Eric Norum # # All RTEMS targets use the same Makefile fragment diff --git a/configure/os/CONFIG.Common.RTEMS-mvme3100 b/configure/os/CONFIG.Common.RTEMS-mvme3100 index 5ee0757e5..cd9416ce7 100644 --- a/configure/os/CONFIG.Common.RTEMS-mvme3100 +++ b/configure/os/CONFIG.Common.RTEMS-mvme3100 @@ -1,6 +1,5 @@ # # CONFIG.Common.RTEMS-mvme3100 -# $Revision-Id$ # Author: W. Eric Norum # # All RTEMS targets use the same Makefile fragment diff --git a/configure/os/CONFIG.Common.RTEMS-mvme5500 b/configure/os/CONFIG.Common.RTEMS-mvme5500 index 39be35635..0c05b76a8 100644 --- a/configure/os/CONFIG.Common.RTEMS-mvme5500 +++ b/configure/os/CONFIG.Common.RTEMS-mvme5500 @@ -1,6 +1,5 @@ # # CONFIG.Common.RTEMS-mvme5500 -# $Revision-Id$ # Author: W. Eric Norum # # All RTEMS targets use the same Makefile fragment diff --git a/configure/os/CONFIG.Common.RTEMS-pc386 b/configure/os/CONFIG.Common.RTEMS-pc386 index 2b20b974a..b3150cc66 100644 --- a/configure/os/CONFIG.Common.RTEMS-pc386 +++ b/configure/os/CONFIG.Common.RTEMS-pc386 @@ -1,5 +1,4 @@ # -# $Revision-Id$ # Author: W. Eric Norum # Canadian Light Source # eric@cls.usask.ca diff --git a/configure/os/CONFIG.Common.RTEMS-psim b/configure/os/CONFIG.Common.RTEMS-psim index df0cb3687..230d72e1f 100644 --- a/configure/os/CONFIG.Common.RTEMS-psim +++ b/configure/os/CONFIG.Common.RTEMS-psim @@ -1,5 +1,4 @@ # -# $Revision-Id$ # Author: W. Eric Norum # University of Saskatchewan # eric.norum@usask.ca diff --git a/configure/os/CONFIG.Common.RTEMS-uC5282 b/configure/os/CONFIG.Common.RTEMS-uC5282 index 7dbc9d8fd..9c6a58d33 100644 --- a/configure/os/CONFIG.Common.RTEMS-uC5282 +++ b/configure/os/CONFIG.Common.RTEMS-uC5282 @@ -1,5 +1,4 @@ # -# $Revision-Id$ # Author: W. Eric Norum # Canadian Light Source # eric@cls.usask.ca diff --git a/configure/os/CONFIG.Common.UnixCommon b/configure/os/CONFIG.Common.UnixCommon index 816744fd8..add84873e 100644 --- a/configure/os/CONFIG.Common.UnixCommon +++ b/configure/os/CONFIG.Common.UnixCommon @@ -1,7 +1,5 @@ # CONFIG.Common.UnixCommon # -# $Revision-Id$ -# # Contains definitions common to all Unix target archs # # This file is maintained by the build community. @@ -57,7 +55,7 @@ SHRLIB_LDLIBS = $(addprefix -l, $($*_LDLIBS) $(LIB_LIBS) $(USR_LIBS)) \ $(LDLIBS) SHRLIB_DEPLIB_DIRS = $(foreach word, \ - $(sort $(dir $($*_DEPLIBS) $(SHRLIB_DEPLIBS))), \ + $(sort $(INSTALL_LIB)/ $(dir $($*_DEPLIBS) $(SHRLIB_DEPLIBS))), \ $(shell $(FULLPATHNAME) $(word))) SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-L%) @@ -86,7 +84,7 @@ PROD_LDLIBS += $($(firstword $(LDLIBS_STATIC_$(STATIC_BUILD)) \ $(LDLIBS_SHARED_$(SHARED_LIBRARIES)))) PROD_DEPLIB_DIRS = $(foreach word, \ - $(sort $(dir $($*_DEPLIBS) $(PROD_DEPLIBS))), \ + $(sort $(INSTALL_LIB)/ $(dir $($*_DEPLIBS) $(PROD_DEPLIBS))), \ $(shell $(FULLPATHNAME) $(word))) PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-L%) diff --git a/configure/os/CONFIG.Common.cygwin-x86 b/configure/os/CONFIG.Common.cygwin-x86 index 4bd4e63a3..02dab10db 100644 --- a/configure/os/CONFIG.Common.cygwin-x86 +++ b/configure/os/CONFIG.Common.cygwin-x86 @@ -1,6 +1,5 @@ # CONFIG.Common.cygwin-x86 # -# $Revision-Id$ # This file is maintained by the build community. # # Definitions for cygwin-x86 target builds diff --git a/configure/os/CONFIG.Common.cygwin-x86_64 b/configure/os/CONFIG.Common.cygwin-x86_64 index 380e686be..b2b18dbfa 100644 --- a/configure/os/CONFIG.Common.cygwin-x86_64 +++ b/configure/os/CONFIG.Common.cygwin-x86_64 @@ -1,14 +1,13 @@ -# CONFIG.Common.cygwin-x86_64 -# -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for cygwin-x86_64 target builds -# Sites may override these definitions in CONFIG_SITE.Common.cygwin-x86_64 -#------------------------------------------------------- - -include $(CONFIG)/os/CONFIG.Common.cygwin-x86 - -ARCH_DEP_CFLAGS = -m64 -ARCH_DEP_LDFLAGS = -m64 - +# CONFIG.Common.cygwin-x86_64 +# +# This file is maintained by the build community. +# +# Definitions for cygwin-x86_64 target builds +# Sites may override these definitions in CONFIG_SITE.Common.cygwin-x86_64 +#------------------------------------------------------- + +include $(CONFIG)/os/CONFIG.Common.cygwin-x86 + +ARCH_DEP_CFLAGS = -m64 +ARCH_DEP_LDFLAGS = -m64 + diff --git a/configure/os/CONFIG.Common.darwin-ppc b/configure/os/CONFIG.Common.darwin-ppc index 18a8ee4f4..7ac704314 100644 --- a/configure/os/CONFIG.Common.darwin-ppc +++ b/configure/os/CONFIG.Common.darwin-ppc @@ -1,6 +1,5 @@ # CONFIG.Common.darwin-ppc # -# $Revision-Id$ # This file is maintained by the build community. # # Definitions for darwin-ppc target builds diff --git a/configure/os/CONFIG.Common.darwin-ppcx86 b/configure/os/CONFIG.Common.darwin-ppcx86 index 94236e2ef..12107944f 100644 --- a/configure/os/CONFIG.Common.darwin-ppcx86 +++ b/configure/os/CONFIG.Common.darwin-ppcx86 @@ -1,6 +1,5 @@ # CONFIG.Common.darwin-ppcx86 # -# $Revision-Id$ # This file is maintained by the build community. # # Definitions for Darwin universal PowerPC + x86 target builds diff --git a/configure/os/CONFIG.Common.darwin-x86 b/configure/os/CONFIG.Common.darwin-x86 index f20de7607..89650ea7d 100644 --- a/configure/os/CONFIG.Common.darwin-x86 +++ b/configure/os/CONFIG.Common.darwin-x86 @@ -1,6 +1,5 @@ # CONFIG.Common.darwin-x86 # -# $Revision-Id$ # This file is maintained by the build community. # # Definitions for darwin-x86 target builds diff --git a/configure/os/CONFIG.Common.freebsd-x86 b/configure/os/CONFIG.Common.freebsd-x86 index bf4945390..f0f18851f 100644 --- a/configure/os/CONFIG.Common.freebsd-x86 +++ b/configure/os/CONFIG.Common.freebsd-x86 @@ -1,4 +1,3 @@ -# $Revision-Id$ # # This file is maintained by the build community. # diff --git a/configure/os/CONFIG.Common.freebsd-x86_64 b/configure/os/CONFIG.Common.freebsd-x86_64 index 92b99bd8e..f10be1058 100644 --- a/configure/os/CONFIG.Common.freebsd-x86_64 +++ b/configure/os/CONFIG.Common.freebsd-x86_64 @@ -1,4 +1,3 @@ -# $Revision-Id$ # # This file is maintained by the build community. # diff --git a/configure/os/CONFIG.Common.freebsdCommon b/configure/os/CONFIG.Common.freebsdCommon index 0eafd7511..36796b758 100644 --- a/configure/os/CONFIG.Common.freebsdCommon +++ b/configure/os/CONFIG.Common.freebsdCommon @@ -1,4 +1,3 @@ -# $Revision-Id$ # # This file is maintained by the build community. # diff --git a/configure/os/CONFIG.Common.ios-arm b/configure/os/CONFIG.Common.ios-arm index cc297b627..acca27d8c 100644 --- a/configure/os/CONFIG.Common.ios-arm +++ b/configure/os/CONFIG.Common.ios-arm @@ -1,6 +1,5 @@ # CONFIG.Common.ios-arm # -# $Revision-Id$ # This file is maintained by the build community. # # Definitions for ios-arm target builds diff --git a/configure/os/CONFIG.Common.ios-x86 b/configure/os/CONFIG.Common.ios-x86 index a8175a34e..6031629c5 100644 --- a/configure/os/CONFIG.Common.ios-x86 +++ b/configure/os/CONFIG.Common.ios-x86 @@ -1,6 +1,5 @@ # CONFIG.Common.ios-x86 # -# $Revision-Id$ # This file is maintained by the build community. # # Definitions for ios-x86 target builds diff --git a/configure/os/CONFIG.Common.iosCommon b/configure/os/CONFIG.Common.iosCommon index 0b22ec89a..f9e5750e3 100644 --- a/configure/os/CONFIG.Common.iosCommon +++ b/configure/os/CONFIG.Common.iosCommon @@ -1,6 +1,5 @@ # CONFIG.Common.iosCommon # -# $Revision-Id$ # This file is maintained by the build community. # # Definitions for all Apple iOS builds diff --git a/configure/os/CONFIG.Common.linux-386 b/configure/os/CONFIG.Common.linux-386 index 3fa40381a..8549a8ab6 100644 --- a/configure/os/CONFIG.Common.linux-386 +++ b/configure/os/CONFIG.Common.linux-386 @@ -1,6 +1,5 @@ # CONFIG.Common.linux-386 # -# $Revision-Id$ # This file is maintained by the build community. # # Definitions for linux-386 target builds diff --git a/configure/os/CONFIG.Common.linux-486 b/configure/os/CONFIG.Common.linux-486 index a5af47992..cf39b92d2 100644 --- a/configure/os/CONFIG.Common.linux-486 +++ b/configure/os/CONFIG.Common.linux-486 @@ -1,8 +1,5 @@ # CONFIG.Common.linux-486 # -# $Id -# This file is maintained by the build community. -# # Definitions for linux-486 target builds # Sites may override these definitions in CONFIG_SITE.Common.linux-486 #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.linux-586 b/configure/os/CONFIG.Common.linux-586 index 048d3aa8e..9b2fa466b 100644 --- a/configure/os/CONFIG.Common.linux-586 +++ b/configure/os/CONFIG.Common.linux-586 @@ -1,8 +1,5 @@ # CONFIG.Common.linux-586 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-586 target builds # Sites may override these definitions in CONFIG_SITE.Common.linux-586 #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.linux-686 b/configure/os/CONFIG.Common.linux-686 index f19bcb6c7..5a2e0ef5f 100644 --- a/configure/os/CONFIG.Common.linux-686 +++ b/configure/os/CONFIG.Common.linux-686 @@ -1,8 +1,5 @@ # CONFIG.Common.linux-686 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-686 target builds # Sites may override these definitions in CONFIG_SITE.Common.linux-686 #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.linux-arm-debug b/configure/os/CONFIG.Common.linux-arm-debug index 3f4b40102..c2a0e99eb 100644 --- a/configure/os/CONFIG.Common.linux-arm-debug +++ b/configure/os/CONFIG.Common.linux-arm-debug @@ -1,8 +1,5 @@ # CONFIG.Common.linux-arm-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-arm with debug compiler flags # Override these settings in CONFIG_SITE.Common.linux-arm-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.linux-arm_eb b/configure/os/CONFIG.Common.linux-arm_eb index c02f6392e..69a255020 100644 --- a/configure/os/CONFIG.Common.linux-arm_eb +++ b/configure/os/CONFIG.Common.linux-arm_eb @@ -1,7 +1,5 @@ # CONFIG.Common.linux-arm_eb # -# This file is maintained by the build community. -# # Definitions for linux-arm_eb (big endian) target builds # Sites may override these definitions in CONFIG_SITE.Common.linux-arm_eb #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.linux-arm_el b/configure/os/CONFIG.Common.linux-arm_el index e076f92ad..40701b616 100644 --- a/configure/os/CONFIG.Common.linux-arm_el +++ b/configure/os/CONFIG.Common.linux-arm_el @@ -1,7 +1,5 @@ # CONFIG.Common.linux-arm_el # -# This file is maintained by the build community. -# # Definitions for linux-arm_el (little endian) target builds # Sites may override these definitions in CONFIG_SITE.Common.linux-arm_el #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.linux-athlon b/configure/os/CONFIG.Common.linux-athlon index e392d27cc..69f20a81d 100644 --- a/configure/os/CONFIG.Common.linux-athlon +++ b/configure/os/CONFIG.Common.linux-athlon @@ -1,8 +1,5 @@ # CONFIG.Common.linux-athlon # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-athlon target builds # Sites may override these definitions in CONFIG_SITE.Common.linux-athlon #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.linux-ppc b/configure/os/CONFIG.Common.linux-ppc index 5fb9d9fb3..8eddca06e 100644 --- a/configure/os/CONFIG.Common.linux-ppc +++ b/configure/os/CONFIG.Common.linux-ppc @@ -1,7 +1,5 @@ # CONFIG.Common.linux-ppc # -# This file is maintained by the build community. -# # Definitions for linux-ppc target builds # Sites may override these definitions in CONFIG_SITE.Common.linux-ppc #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.linux-ppc64 b/configure/os/CONFIG.Common.linux-ppc64 index b2a1c8280..b2c754bad 100644 --- a/configure/os/CONFIG.Common.linux-ppc64 +++ b/configure/os/CONFIG.Common.linux-ppc64 @@ -1,8 +1,5 @@ # CONFIG.Common.linux-ppc64 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-ppc64 target builds # Sites may override these definitions in CONFIG_SITE.Common.linux-ppc64 #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.linux-x86 b/configure/os/CONFIG.Common.linux-x86 index 22b9048e3..f2b94efae 100644 --- a/configure/os/CONFIG.Common.linux-x86 +++ b/configure/os/CONFIG.Common.linux-x86 @@ -1,8 +1,5 @@ # CONFIG.Common.linux-x86 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-x86 target builds # Sites may override these definitions in CONFIG_SITE.Common.linux-x86 #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.linux-x86-debug b/configure/os/CONFIG.Common.linux-x86-debug index 9435e2f65..1a7eb09d6 100644 --- a/configure/os/CONFIG.Common.linux-x86-debug +++ b/configure/os/CONFIG.Common.linux-x86-debug @@ -1,8 +1,5 @@ # CONFIG.Common.linux-x86-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-x86 with debug compiler flags # Sites may override these definitions in CONFIG_SITE.Common.linux-x86-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.linux-x86_64 b/configure/os/CONFIG.Common.linux-x86_64 index 8bc88efb3..46b6231d4 100644 --- a/configure/os/CONFIG.Common.linux-x86_64 +++ b/configure/os/CONFIG.Common.linux-x86_64 @@ -1,8 +1,5 @@ # CONFIG.Common.linux-x86_64 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-x86_64 target builds # Sites may override these definitions in CONFIG_SITE.Common.linux-x86_64 #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.linux-x86_64-debug b/configure/os/CONFIG.Common.linux-x86_64-debug index e3145e0f3..b0a382b52 100644 --- a/configure/os/CONFIG.Common.linux-x86_64-debug +++ b/configure/os/CONFIG.Common.linux-x86_64-debug @@ -1,8 +1,5 @@ # CONFIG.Common.linux-x86_64-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-x86_64 with debug compiler flags # Sites may override these definitions in CONFIG_SITE.Common.linux-x86_64-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.linux-xscale_be b/configure/os/CONFIG.Common.linux-xscale_be index f5c9ea8ee..8597aa208 100644 --- a/configure/os/CONFIG.Common.linux-xscale_be +++ b/configure/os/CONFIG.Common.linux-xscale_be @@ -1,7 +1,5 @@ # CONFIG.Common.linux-xscale_be # -# This file is maintained by the build community. -# # Definitions for linux-xscale_be (big-endian) target builds. # This target has been tested with the MOXA UC-7408-LX Plus. diff --git a/configure/os/CONFIG.Common.linuxCommon b/configure/os/CONFIG.Common.linuxCommon index 38ed453cb..d50ce60d9 100644 --- a/configure/os/CONFIG.Common.linuxCommon +++ b/configure/os/CONFIG.Common.linuxCommon @@ -1,8 +1,5 @@ # CONFIG.Common.linuxCommon # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux target builds # Sites may override these definitions in CONFIG_SITE.Common.linuxCommon #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.solaris-sparc b/configure/os/CONFIG.Common.solaris-sparc index eff24fca5..af26b8680 100644 --- a/configure/os/CONFIG.Common.solaris-sparc +++ b/configure/os/CONFIG.Common.solaris-sparc @@ -1,8 +1,5 @@ # CONFIG.Common.solaris-sparc # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc target archs # Sites may override these definitions in CONFIG_SITE.Common.solaris-sparc #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.solaris-sparc-debug b/configure/os/CONFIG.Common.solaris-sparc-debug index 5d6a554ae..d2d58f33e 100644 --- a/configure/os/CONFIG.Common.solaris-sparc-debug +++ b/configure/os/CONFIG.Common.solaris-sparc-debug @@ -1,8 +1,5 @@ # CONFIG.Common.solaris-sparc-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc with debug compiler flags # Sites may override these definitions in CONFIG_SITE.Common.solaris-sparc-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.solaris-sparc-gnu b/configure/os/CONFIG.Common.solaris-sparc-gnu index 83427e995..d600ff391 100644 --- a/configure/os/CONFIG.Common.solaris-sparc-gnu +++ b/configure/os/CONFIG.Common.solaris-sparc-gnu @@ -1,8 +1,5 @@ # CONFIG.Common.solaris-sparc-gnu # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc gnu compiler target archs # Sites may override these definitions in CONFIG_SITE.Common.solaris-sparc-gnu #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.solaris-sparc64 b/configure/os/CONFIG.Common.solaris-sparc64 index 399e9e29a..f6da3be3f 100644 --- a/configure/os/CONFIG.Common.solaris-sparc64 +++ b/configure/os/CONFIG.Common.solaris-sparc64 @@ -1,8 +1,5 @@ # CONFIG.Common.solaris-sparc64 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc64 compiler target archs # Sites may override these definitions in CONFIG_SITE.Common.solaris-sparc64 #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.solaris-sparc64-gnu b/configure/os/CONFIG.Common.solaris-sparc64-gnu index 9e65f7c33..d82f91273 100644 --- a/configure/os/CONFIG.Common.solaris-sparc64-gnu +++ b/configure/os/CONFIG.Common.solaris-sparc64-gnu @@ -1,8 +1,5 @@ # CONFIG.Common.solaris-sparc64-gnu # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc64 gnu compiler target archs # Sites may override these definitions in CONFIG_SITE.Common.solaris-sparc64-gnu #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.solaris-x86 b/configure/os/CONFIG.Common.solaris-x86 index 3c78b0631..087cd40b2 100644 --- a/configure/os/CONFIG.Common.solaris-x86 +++ b/configure/os/CONFIG.Common.solaris-x86 @@ -1,8 +1,5 @@ # CONFIG.Common.solaris-x86 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-x86 target archs # Sites may override these definitions in CONFIG_SITE.Common.solaris-x86 #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.solaris-x86-gnu b/configure/os/CONFIG.Common.solaris-x86-gnu index 6f024289c..ea5df2b5e 100644 --- a/configure/os/CONFIG.Common.solaris-x86-gnu +++ b/configure/os/CONFIG.Common.solaris-x86-gnu @@ -1,8 +1,5 @@ # CONFIG.Common.solaris-x86-gnu # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-x86 gnu compiler target archs # Sites may override these definitions in CONFIG_SITE.Common.solaris-x86-gnu #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.solaris-x86_64 b/configure/os/CONFIG.Common.solaris-x86_64 index c6c6fa996..509fc8e7c 100644 --- a/configure/os/CONFIG.Common.solaris-x86_64 +++ b/configure/os/CONFIG.Common.solaris-x86_64 @@ -1,8 +1,5 @@ # CONFIG.Common.solaris-x86_64 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-x86_64 compiler target archs # Sites may override these definitions in CONFIG_SITE.Common.solaris-x86_64 #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.solaris-x86_64-gnu b/configure/os/CONFIG.Common.solaris-x86_64-gnu index 39b2f27ad..5bae0cee9 100644 --- a/configure/os/CONFIG.Common.solaris-x86_64-gnu +++ b/configure/os/CONFIG.Common.solaris-x86_64-gnu @@ -1,8 +1,5 @@ # CONFIG.Common.solaris-x86_64-gnu # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-x86_64 gnu compiler target archs # Sites may override these definitions in CONFIG_SITE.Common.solaris-x86_64-gnu #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-486 b/configure/os/CONFIG.Common.vxWorks-486 index b048a2be4..eaf66581a 100644 --- a/configure/os/CONFIG.Common.vxWorks-486 +++ b/configure/os/CONFIG.Common.vxWorks-486 @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-486 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-486 target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-486 #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-486-debug b/configure/os/CONFIG.Common.vxWorks-486-debug index ad0fc1b6f..3caefe1e5 100644 --- a/configure/os/CONFIG.Common.vxWorks-486-debug +++ b/configure/os/CONFIG.Common.vxWorks-486-debug @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-486-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-486-debug target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-486-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-68040 b/configure/os/CONFIG.Common.vxWorks-68040 index 025b3d87d..a41c74647 100644 --- a/configure/os/CONFIG.Common.vxWorks-68040 +++ b/configure/os/CONFIG.Common.vxWorks-68040 @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-68040 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-68040 target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68040 #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-68040-debug b/configure/os/CONFIG.Common.vxWorks-68040-debug index dc864deef..c30a49730 100644 --- a/configure/os/CONFIG.Common.vxWorks-68040-debug +++ b/configure/os/CONFIG.Common.vxWorks-68040-debug @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-68040-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-68040-debug target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68040-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-68040lc b/configure/os/CONFIG.Common.vxWorks-68040lc index ce26bca4d..9df4abd51 100644 --- a/configure/os/CONFIG.Common.vxWorks-68040lc +++ b/configure/os/CONFIG.Common.vxWorks-68040lc @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-68040lc # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-68040lc target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68040lc #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-68040lc-debug b/configure/os/CONFIG.Common.vxWorks-68040lc-debug index a3478b714..149b01dcd 100644 --- a/configure/os/CONFIG.Common.vxWorks-68040lc-debug +++ b/configure/os/CONFIG.Common.vxWorks-68040lc-debug @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-68040lc-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-68040lc-debug target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68040lc-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-68060 b/configure/os/CONFIG.Common.vxWorks-68060 index 25cd88cd2..312ab61bd 100644 --- a/configure/os/CONFIG.Common.vxWorks-68060 +++ b/configure/os/CONFIG.Common.vxWorks-68060 @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-68060 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-68060 target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68060 #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-68060-debug b/configure/os/CONFIG.Common.vxWorks-68060-debug index 8c9b79728..282538457 100644 --- a/configure/os/CONFIG.Common.vxWorks-68060-debug +++ b/configure/os/CONFIG.Common.vxWorks-68060-debug @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-68060-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-68060-debug target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68060-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-mpc8540 b/configure/os/CONFIG.Common.vxWorks-mpc8540 index 2b684417b..451145bde 100644 --- a/configure/os/CONFIG.Common.vxWorks-mpc8540 +++ b/configure/os/CONFIG.Common.vxWorks-mpc8540 @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-mpc8540 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-mpc8540 target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-mpc8540 #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-mpc8540-debug b/configure/os/CONFIG.Common.vxWorks-mpc8540-debug index 2f87b5365..800478729 100644 --- a/configure/os/CONFIG.Common.vxWorks-mpc8540-debug +++ b/configure/os/CONFIG.Common.vxWorks-mpc8540-debug @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-mpc8540-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-mpc8540-debug target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-mpc8540-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-mpc8548 b/configure/os/CONFIG.Common.vxWorks-mpc8548 index 1dd6a1c3b..d7a759136 100644 --- a/configure/os/CONFIG.Common.vxWorks-mpc8548 +++ b/configure/os/CONFIG.Common.vxWorks-mpc8548 @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-mpc8548 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-mpc8548 target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-mpc8548 #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-mpc8548-debug b/configure/os/CONFIG.Common.vxWorks-mpc8548-debug index d258a16e8..37ae1fa35 100644 --- a/configure/os/CONFIG.Common.vxWorks-mpc8548-debug +++ b/configure/os/CONFIG.Common.vxWorks-mpc8548-debug @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-mpc8548-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-mpc8548-debug targets. # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-mpc8548-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-pentium b/configure/os/CONFIG.Common.vxWorks-pentium index abec33c6a..9aee09ca8 100644 --- a/configure/os/CONFIG.Common.vxWorks-pentium +++ b/configure/os/CONFIG.Common.vxWorks-pentium @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-pentium # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-pentium target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-pentium #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-pentium-debug b/configure/os/CONFIG.Common.vxWorks-pentium-debug index c1e40efb9..f01fe4ce2 100644 --- a/configure/os/CONFIG.Common.vxWorks-pentium-debug +++ b/configure/os/CONFIG.Common.vxWorks-pentium-debug @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-pentium-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-pentium-debug target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-pentium-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-ppc32 b/configure/os/CONFIG.Common.vxWorks-ppc32 index a8508758b..4e208b59b 100644 --- a/configure/os/CONFIG.Common.vxWorks-ppc32 +++ b/configure/os/CONFIG.Common.vxWorks-ppc32 @@ -1,9 +1,7 @@ -# $Revision-Id$ # # Definitions for vxWorks-ppc603 targets with >32MB of RAM # Site-specific overrides go in CONFIG_SITE.Common.vxWorks-ppc603_long # -# This file is maintained by the EPICS build community. #------------------------------------------------------- # Include definitions common to all vxWorks target archs diff --git a/configure/os/CONFIG.Common.vxWorks-ppc32-debug b/configure/os/CONFIG.Common.vxWorks-ppc32-debug index bb46c7aba..5c7907f25 100644 --- a/configure/os/CONFIG.Common.vxWorks-ppc32-debug +++ b/configure/os/CONFIG.Common.vxWorks-ppc32-debug @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-ppc32-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-ppc32-debug target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc32-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-ppc32sf b/configure/os/CONFIG.Common.vxWorks-ppc32sf index 0c1dccd84..26e0cc218 100644 --- a/configure/os/CONFIG.Common.vxWorks-ppc32sf +++ b/configure/os/CONFIG.Common.vxWorks-ppc32sf @@ -1,9 +1,7 @@ -# $Revision-Id$ # # Definitions for vxWorks-ppc32sf targets # Site-specific overrides go in CONFIG_SITE.Common.vxWorks-ppc32sf # -# This file is maintained by the EPICS build community. #------------------------------------------------------- # Inherit the settings from vxWorks-ppc32 diff --git a/configure/os/CONFIG.Common.vxWorks-ppc32sf-debug b/configure/os/CONFIG.Common.vxWorks-ppc32sf-debug index dd2a350bb..e8d5aea3f 100644 --- a/configure/os/CONFIG.Common.vxWorks-ppc32sf-debug +++ b/configure/os/CONFIG.Common.vxWorks-ppc32sf-debug @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-ppc32sf-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-ppc32sf-debug target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc32sf-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-ppc603 b/configure/os/CONFIG.Common.vxWorks-ppc603 index 020c3ec24..3b0e73b3d 100644 --- a/configure/os/CONFIG.Common.vxWorks-ppc603 +++ b/configure/os/CONFIG.Common.vxWorks-ppc603 @@ -1,9 +1,7 @@ -# $Revision-Id$ # # Definitions for vxWorks-ppc603 targets: PPC603 and PMC8240 CPUs # Site-specific overrides go in CONFIG_SITE.Common.vxWorks-ppc603 # -# This file is maintained by the EPICS build community. #------------------------------------------------------- # Include definitions common to all vxWorks target archs diff --git a/configure/os/CONFIG.Common.vxWorks-ppc603-debug b/configure/os/CONFIG.Common.vxWorks-ppc603-debug index 6a11c5489..0e4157955 100644 --- a/configure/os/CONFIG.Common.vxWorks-ppc603-debug +++ b/configure/os/CONFIG.Common.vxWorks-ppc603-debug @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-ppc603-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-ppc603-debug target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc603-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-ppc603_long b/configure/os/CONFIG.Common.vxWorks-ppc603_long index 71a9374dd..4a61eef14 100644 --- a/configure/os/CONFIG.Common.vxWorks-ppc603_long +++ b/configure/os/CONFIG.Common.vxWorks-ppc603_long @@ -1,9 +1,7 @@ -# $Revision-Id$ # # Definitions for vxWorks-ppc603 targets with >32MB of RAM # Site-specific overrides go in CONFIG_SITE.Common.vxWorks-ppc603_long # -# This file is maintained by the EPICS build community. #------------------------------------------------------- # Inherit the settings from vxWorks-ppc603 diff --git a/configure/os/CONFIG.Common.vxWorks-ppc603_long-debug b/configure/os/CONFIG.Common.vxWorks-ppc603_long-debug index 20d60a43a..7eab4376f 100644 --- a/configure/os/CONFIG.Common.vxWorks-ppc603_long-debug +++ b/configure/os/CONFIG.Common.vxWorks-ppc603_long-debug @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-ppc603_long-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-ppc603_long-debug target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc603_long-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-ppc604 b/configure/os/CONFIG.Common.vxWorks-ppc604 index 7bb94300f..45115a876 100644 --- a/configure/os/CONFIG.Common.vxWorks-ppc604 +++ b/configure/os/CONFIG.Common.vxWorks-ppc604 @@ -1,9 +1,7 @@ -# $Revision-Id$ # # Definitions for vxWorks-ppc604 targets: PPC604, MPC7xx and MPC74xx CPUs # Site-specific overrides go in CONFIG_SITE.Common.vxWorks-ppc604 # -# This file is maintained by the EPICS build community. #------------------------------------------------------- # Include definitions common to all vxWorks target archs diff --git a/configure/os/CONFIG.Common.vxWorks-ppc604-debug b/configure/os/CONFIG.Common.vxWorks-ppc604-debug index b476071c4..ac66b68aa 100644 --- a/configure/os/CONFIG.Common.vxWorks-ppc604-debug +++ b/configure/os/CONFIG.Common.vxWorks-ppc604-debug @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-ppc604-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-ppc604-debug target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc604-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-ppc604_altivec b/configure/os/CONFIG.Common.vxWorks-ppc604_altivec index 540b4528a..d0becf2f7 100644 --- a/configure/os/CONFIG.Common.vxWorks-ppc604_altivec +++ b/configure/os/CONFIG.Common.vxWorks-ppc604_altivec @@ -1,9 +1,7 @@ -# $Revision-Id$ # # Definitions for vxWorks-ppc604 targets with an Altivec and >32MB of RAM. # Site-specific overrides go in CONFIG_SITE.Common.vxWorks-ppc604_altivec # -# This file is maintained by the EPICS build community. #------------------------------------------------------- # Inherit the settings from vxWorks-ppc604_long diff --git a/configure/os/CONFIG.Common.vxWorks-ppc604_altivec-debug b/configure/os/CONFIG.Common.vxWorks-ppc604_altivec-debug index 0a74858fd..b7e1307a5 100644 --- a/configure/os/CONFIG.Common.vxWorks-ppc604_altivec-debug +++ b/configure/os/CONFIG.Common.vxWorks-ppc604_altivec-debug @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-ppc604_altivec-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-ppc604_altivec-debug target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc604_altivec-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorks-ppc604_long b/configure/os/CONFIG.Common.vxWorks-ppc604_long index 41261381f..a90cc897b 100644 --- a/configure/os/CONFIG.Common.vxWorks-ppc604_long +++ b/configure/os/CONFIG.Common.vxWorks-ppc604_long @@ -1,9 +1,7 @@ -# $Revision-Id$ # # Definitions for vxWorks-ppc604 targets with >32MB of RAM # Site-specific overrides go in CONFIG_SITE.Common.vxWorks-ppc604_long # -# This file is maintained by the EPICS build community. #------------------------------------------------------- # Inherit the settings from vxWorks-ppc604 diff --git a/configure/os/CONFIG.Common.vxWorks-ppc604_long-debug b/configure/os/CONFIG.Common.vxWorks-ppc604_long-debug index 7831bb8b5..fa6bfe8f8 100644 --- a/configure/os/CONFIG.Common.vxWorks-ppc604_long-debug +++ b/configure/os/CONFIG.Common.vxWorks-ppc604_long-debug @@ -1,8 +1,5 @@ # CONFIG.Common.vxWorks-ppc604_long-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for vxWorks-ppc604_long-debug target archs # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc604_long-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon index b5cea700c..1ad5b5808 100644 --- a/configure/os/CONFIG.Common.vxWorksCommon +++ b/configure/os/CONFIG.Common.vxWorksCommon @@ -1,7 +1,5 @@ # CONFIG.Common.vxWorksCommon # -# $Revision-Id$ -# # Definitions for vxWorks target archs # Override these definitions in CONFIG_SITE.Common.vxWorksCommon # or CONFIG_SITE..vxWorksCommon diff --git a/configure/os/CONFIG.Common.win32-x86-mingw b/configure/os/CONFIG.Common.win32-x86-mingw index 2ed409c23..936b1d954 100644 --- a/configure/os/CONFIG.Common.win32-x86-mingw +++ b/configure/os/CONFIG.Common.win32-x86-mingw @@ -1,8 +1,5 @@ # CONFIG.Common.win32-x86-mingw # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for win32-x86-mingw target builds # Sites may override these definitions in CONFIG_SITE.Common.win32-x86-mingw #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.windows-x64-mingw b/configure/os/CONFIG.Common.windows-x64-mingw index b2943af16..c2623bd39 100644 --- a/configure/os/CONFIG.Common.windows-x64-mingw +++ b/configure/os/CONFIG.Common.windows-x64-mingw @@ -1,8 +1,5 @@ # CONFIG.Common.windows-x64-mingw # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for windows-x64-mingw target builds # Sites may override these definitions in CONFIG_SITE.Common.windows-x64-mingw #------------------------------------------------------- diff --git a/configure/os/CONFIG.UnixCommon.Common b/configure/os/CONFIG.UnixCommon.Common index 4f02604ee..026a5234d 100644 --- a/configure/os/CONFIG.UnixCommon.Common +++ b/configure/os/CONFIG.UnixCommon.Common @@ -1,8 +1,5 @@ # CONFIG.UnixCommon.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions common to unix hosts # Sites may override these definitions in CONFIG_SITE.UnixCommon.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.cygwin-x86.Common b/configure/os/CONFIG.cygwin-x86.Common index d0e59a618..1fffc7b4c 100644 --- a/configure/os/CONFIG.cygwin-x86.Common +++ b/configure/os/CONFIG.cygwin-x86.Common @@ -1,8 +1,5 @@ # CONFIG.cygwin-x86.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for cygwin-x86 host archs # Sites may override these definitions in CONFIG_SITE.cygwin-x86.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.cygwin-x86.cygwin-x86 b/configure/os/CONFIG.cygwin-x86.cygwin-x86 index 37f365249..965a524aa 100644 --- a/configure/os/CONFIG.cygwin-x86.cygwin-x86 +++ b/configure/os/CONFIG.cygwin-x86.cygwin-x86 @@ -1,7 +1,5 @@ # CONFIG.cygwin-x86.cygwin-x86 # -# $Revision-Id$ -# # Definitions for cygwin-x86 host - cygwin-x86 target builds # Sites may override these definitions in CONFIG_SITE.cygwin-x86.cygwin-x86 #------------------------------------------------------- diff --git a/configure/os/CONFIG.cygwin-x86.cygwin-x86-debug b/configure/os/CONFIG.cygwin-x86.cygwin-x86-debug index 67f380a9d..d51734542 100644 --- a/configure/os/CONFIG.cygwin-x86.cygwin-x86-debug +++ b/configure/os/CONFIG.cygwin-x86.cygwin-x86-debug @@ -1,8 +1,5 @@ # CONFIG.cygwin-x86.cygwin-x86-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for cygwin-x86 host - cygwin-x86-debug target build # Sites may override these definitions in CONFIG_SITE.cygwin-x86.cygwin-x86-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.cygwin-x86_64.Common b/configure/os/CONFIG.cygwin-x86_64.Common index ff6c3e2c8..de43b592e 100644 --- a/configure/os/CONFIG.cygwin-x86_64.Common +++ b/configure/os/CONFIG.cygwin-x86_64.Common @@ -1,10 +1,7 @@ -# CONFIG.cygwin-x86_64.Common -# -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for cygwin-x86_64 host archs -# Sites may override these definitions in CONFIG_SITE.cygwin-x86_64.Common -#------------------------------------------------------- - -include $(CONFIG)/os/CONFIG.cygwin-x86.Common +# CONFIG.cygwin-x86_64.Common +# +# Definitions for cygwin-x86_64 host archs +# Sites may override these definitions in CONFIG_SITE.cygwin-x86_64.Common +#------------------------------------------------------- + +include $(CONFIG)/os/CONFIG.cygwin-x86.Common diff --git a/configure/os/CONFIG.cygwin-x86_64.cygwin-x86_64 b/configure/os/CONFIG.cygwin-x86_64.cygwin-x86_64 index 20a52a6d8..0e9a96f01 100644 --- a/configure/os/CONFIG.cygwin-x86_64.cygwin-x86_64 +++ b/configure/os/CONFIG.cygwin-x86_64.cygwin-x86_64 @@ -1,11 +1,9 @@ -# CONFIG.cygwin-x86_64.cygwin-x86_64 -# -# $Revision-Id$ -# -# Definitions for cygwin-x86_64 host - cygwin-x86_64 target builds -# Sites may override these definitions in CONFIG_SITE.cygwin-x86_64.cygwin-x86_64 -#------------------------------------------------------- - -# Include common gnu compiler definitions -include $(CONFIG)/os/CONFIG.cygwin-x86.cygwin-x86 - +# CONFIG.cygwin-x86_64.cygwin-x86_64 +# +# Definitions for cygwin-x86_64 host - cygwin-x86_64 target builds +# Sites may override these definitions in CONFIG_SITE.cygwin-x86_64.cygwin-x86_64 +#------------------------------------------------------- + +# Include common gnu compiler definitions +include $(CONFIG)/os/CONFIG.cygwin-x86.cygwin-x86 + diff --git a/configure/os/CONFIG.darwin-ppc.Common b/configure/os/CONFIG.darwin-ppc.Common index 925d381f2..ac176878f 100644 --- a/configure/os/CONFIG.darwin-ppc.Common +++ b/configure/os/CONFIG.darwin-ppc.Common @@ -1,8 +1,5 @@ # CONFIG.darwin-ppc.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for darwin-ppc host builds # Sites may override these definitions in CONFIG_SITE.darwin-ppc.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.darwin-ppc.darwin-ppc-debug b/configure/os/CONFIG.darwin-ppc.darwin-ppc-debug index 47ad7f818..985052031 100644 --- a/configure/os/CONFIG.darwin-ppc.darwin-ppc-debug +++ b/configure/os/CONFIG.darwin-ppc.darwin-ppc-debug @@ -1,8 +1,5 @@ # CONFIG.darwin-ppc.darwin-ppc-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for darwin-ppc host - darwin-ppc-debug target build with debug compiler flags # Sites may override these definitions in CONFIG_SITE.darwin-ppc.darwin-ppc-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.darwin-ppcx86.Common b/configure/os/CONFIG.darwin-ppcx86.Common index f4155c76d..749835ced 100644 --- a/configure/os/CONFIG.darwin-ppcx86.Common +++ b/configure/os/CONFIG.darwin-ppcx86.Common @@ -1,8 +1,5 @@ # CONFIG.darwin-ppcx86.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for Darwin universal PowerPC + x86 host builds # Sites may override these definitions in CONFIG_SITE.darwin-ppcx86.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.darwin-x86.Common b/configure/os/CONFIG.darwin-x86.Common index 1e02a0b2b..e779f7dc1 100644 --- a/configure/os/CONFIG.darwin-x86.Common +++ b/configure/os/CONFIG.darwin-x86.Common @@ -1,8 +1,5 @@ # CONFIG.darwin-x86.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for darwin-x86 host builds # Sites may override these definitions in CONFIG_SITE.darwin-x86.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.darwin-x86.darwin-x86-debug b/configure/os/CONFIG.darwin-x86.darwin-x86-debug index 9a551540a..3bf4db63f 100644 --- a/configure/os/CONFIG.darwin-x86.darwin-x86-debug +++ b/configure/os/CONFIG.darwin-x86.darwin-x86-debug @@ -1,8 +1,5 @@ # CONFIG.darwin-x86.darwin-x86-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for darwin-x86 host - darwin-x86-debug target build with debug compiler flags # Sites may override these definitions in CONFIG_SITE.darwin-x86.darwin-x86-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.darwinCommon.darwinCommon b/configure/os/CONFIG.darwinCommon.darwinCommon index fc760c0f2..56b539545 100644 --- a/configure/os/CONFIG.darwinCommon.darwinCommon +++ b/configure/os/CONFIG.darwinCommon.darwinCommon @@ -1,8 +1,5 @@ # CONFIG.darwinCommon.darwinCommon # -# $Revision-Id$ -# This file is maintained by the build community. -# # Common definitions for darwin builds # Sites may override these definitions in CONFIG_SITE.darwinCommon.darwinCommon #------------------------------------------------------- diff --git a/configure/os/CONFIG.freebsd-x86.Common b/configure/os/CONFIG.freebsd-x86.Common index d9b2ff892..1bd10de2d 100644 --- a/configure/os/CONFIG.freebsd-x86.Common +++ b/configure/os/CONFIG.freebsd-x86.Common @@ -1,6 +1,3 @@ -# $Revision-Id$ -# -# This file is maintained by the build community. # # Definitions for freebsd host builds # Sites may override these definitions in CONFIG_SITE.freebsd-x86.Common diff --git a/configure/os/CONFIG.freebsd-x86.freebsd-x86 b/configure/os/CONFIG.freebsd-x86.freebsd-x86 index b70c48388..b5e2bcff4 100644 --- a/configure/os/CONFIG.freebsd-x86.freebsd-x86 +++ b/configure/os/CONFIG.freebsd-x86.freebsd-x86 @@ -1,4 +1,3 @@ -# $Revision-Id$ # # Definitions for freebsd-x86 host - freebsd-x86 target builds # Sites may override these definitions in CONFIG_SITE.freebsd-x86.freebsd-x86 diff --git a/configure/os/CONFIG.freebsd-x86_64.Common b/configure/os/CONFIG.freebsd-x86_64.Common index 9e3ecac5c..397bf12f6 100644 --- a/configure/os/CONFIG.freebsd-x86_64.Common +++ b/configure/os/CONFIG.freebsd-x86_64.Common @@ -1,6 +1,3 @@ -# $Revision-Id$ -# -# This file is maintained by the build community. # # Definitions for freebsd host builds # Sites may override these definitions in CONFIG_SITE.freebsd-x86_64.Common diff --git a/configure/os/CONFIG.freebsd-x86_64.freebsd-x86_64 b/configure/os/CONFIG.freebsd-x86_64.freebsd-x86_64 index dde69899a..dcc8888ce 100644 --- a/configure/os/CONFIG.freebsd-x86_64.freebsd-x86_64 +++ b/configure/os/CONFIG.freebsd-x86_64.freebsd-x86_64 @@ -1,4 +1,3 @@ -# $Revision-Id$ # # Definitions for freebsd-x86_64 host - freebsd-x86_64 target builds # Sites may override these definitions in CONFIG_SITE.freebsd-x86_64.freebsd-x86_64 diff --git a/configure/os/CONFIG.linux-386.Common b/configure/os/CONFIG.linux-386.Common index e37483163..9a3633bdf 100644 --- a/configure/os/CONFIG.linux-386.Common +++ b/configure/os/CONFIG.linux-386.Common @@ -1,8 +1,5 @@ # CONFIG.linux-386.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-386 host builds # Sites may override these definitions in CONFIG_SITE.linux-386.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-386.linux-386 b/configure/os/CONFIG.linux-386.linux-386 index c71e4c136..f65ac46b7 100644 --- a/configure/os/CONFIG.linux-386.linux-386 +++ b/configure/os/CONFIG.linux-386.linux-386 @@ -1,7 +1,5 @@ # CONFIG.linux-386.linux-386 # -# $Revision-Id$ -# # Definitions for linux-386 host - linux-386 target builds # Sites may override these definitions in CONFIG_SITE.linux-386.linux-386 #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-486.Common b/configure/os/CONFIG.linux-486.Common index f2aa5bd0f..c151b3218 100644 --- a/configure/os/CONFIG.linux-486.Common +++ b/configure/os/CONFIG.linux-486.Common @@ -1,8 +1,5 @@ # CONFIG.linux-486.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-486 host builds # Sites may override these definitions in CONFIG_SITE.linux-486.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-486.linux-486 b/configure/os/CONFIG.linux-486.linux-486 index 84f28d1fc..551cacc29 100644 --- a/configure/os/CONFIG.linux-486.linux-486 +++ b/configure/os/CONFIG.linux-486.linux-486 @@ -1,7 +1,5 @@ # CONFIG.linux-486.linux-486 # -# $Revision-Id$ -# # Definitions for linux-486 host - linux-486 target builds # Sites may override these definitions in CONFIG_SITE.linux-486.linux-486 #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-586.Common b/configure/os/CONFIG.linux-586.Common index 3c0e5e1a6..43463e8a0 100644 --- a/configure/os/CONFIG.linux-586.Common +++ b/configure/os/CONFIG.linux-586.Common @@ -1,8 +1,5 @@ # CONFIG.linux-586.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-586 host builds # Sites may override these definitions in CONFIG_SITE.linux-586.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-586.linux-586 b/configure/os/CONFIG.linux-586.linux-586 index 882ef580f..990bfad74 100644 --- a/configure/os/CONFIG.linux-586.linux-586 +++ b/configure/os/CONFIG.linux-586.linux-586 @@ -1,7 +1,5 @@ # CONFIG.linux-586.linux-586 # -# $Revision-Id$ -# # Definitions for linux-586 host - linux-586 target builds # Sites may override these definitions in CONFIG_SITE.linux-586.linux-586 #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-686.Common b/configure/os/CONFIG.linux-686.Common index b17268457..f36cddeac 100644 --- a/configure/os/CONFIG.linux-686.Common +++ b/configure/os/CONFIG.linux-686.Common @@ -1,8 +1,5 @@ # CONFIG.linux-686.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-686 host builds # Sites may override these definitions in CONFIG_SITE.linux-686.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-686.linux-686 b/configure/os/CONFIG.linux-686.linux-686 index 602db2522..e4195a40a 100644 --- a/configure/os/CONFIG.linux-686.linux-686 +++ b/configure/os/CONFIG.linux-686.linux-686 @@ -1,7 +1,5 @@ # CONFIG.linux-686.linux-686 # -# $Revision-Id$ -# # Definitions for linux-686 host - linux-686 target builds # Sites may override these definitions in CONFIG_SITE.linux-686.linux-686 #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-arm-debug.Common b/configure/os/CONFIG.linux-arm-debug.Common index 16ea60420..66dd0c89e 100644 --- a/configure/os/CONFIG.linux-arm-debug.Common +++ b/configure/os/CONFIG.linux-arm-debug.Common @@ -1,8 +1,5 @@ # CONFIG.linux-arm-debug.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-arm-debug host builds # Override these settings in CONFIG_SITE.linux-arm-debug.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-arm-debug.linux-arm-debug b/configure/os/CONFIG.linux-arm-debug.linux-arm-debug index 2567008aa..6e38378ee 100644 --- a/configure/os/CONFIG.linux-arm-debug.linux-arm-debug +++ b/configure/os/CONFIG.linux-arm-debug.linux-arm-debug @@ -1,8 +1,5 @@ # CONFIG.linux-arm-debug.linux-arm-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-arm-debug host and target build # Override these settings in CONFIG_SITE.linux-arm-debug.linux-arm-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-arm.Common b/configure/os/CONFIG.linux-arm.Common index 788f594d7..9ad637827 100644 --- a/configure/os/CONFIG.linux-arm.Common +++ b/configure/os/CONFIG.linux-arm.Common @@ -1,7 +1,5 @@ # CONFIG.linux-arm.Common # -# $Revision-Id$ -# # Definitions for linux-arm host builds # Sites may override these definitions in CONFIG_SITE.linux-arm.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-arm.linux-arm b/configure/os/CONFIG.linux-arm.linux-arm index e52660f14..2e7687d0a 100644 --- a/configure/os/CONFIG.linux-arm.linux-arm +++ b/configure/os/CONFIG.linux-arm.linux-arm @@ -1,7 +1,5 @@ # CONFIG.linux-arm.linux-arm # -# $Revision-Id$ -# # Definitions for native linux-arm builds # Sites may override these definitions in CONFIG_SITE.linux-arm.linux-arm #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-arm.linux-arm-debug b/configure/os/CONFIG.linux-arm.linux-arm-debug index d6e86be18..0fb2fca27 100644 --- a/configure/os/CONFIG.linux-arm.linux-arm-debug +++ b/configure/os/CONFIG.linux-arm.linux-arm-debug @@ -1,8 +1,5 @@ # CONFIG.linux-arm.linux-arm-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-arm host - linux-arm-debug target build # Override these settings in CONFIG_SITE.linux-arm.linux-arm-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-ppc.Common b/configure/os/CONFIG.linux-ppc.Common index f93334210..377a25f08 100644 --- a/configure/os/CONFIG.linux-ppc.Common +++ b/configure/os/CONFIG.linux-ppc.Common @@ -1,7 +1,5 @@ # CONFIG.linux-ppc.Common # -# This file is maintained by the build community. -# # Definitions for linux-ppc host builds # Sites may override these definitions in CONFIG_SITE.linux-ppc.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-ppc.linux-ppc b/configure/os/CONFIG.linux-ppc.linux-ppc index 3c437df59..5010d1bc3 100644 --- a/configure/os/CONFIG.linux-ppc.linux-ppc +++ b/configure/os/CONFIG.linux-ppc.linux-ppc @@ -1,6 +1,5 @@ # CONFIG.linux-ppc.linux-ppc # -# # Definitions for linux-ppc host - linux-ppc target builds # Sites may override these definitions in CONFIG_SITE.linux-ppc.linux-ppc #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-ppc64.Common b/configure/os/CONFIG.linux-ppc64.Common index 6d1977184..516cc4ffe 100644 --- a/configure/os/CONFIG.linux-ppc64.Common +++ b/configure/os/CONFIG.linux-ppc64.Common @@ -1,8 +1,5 @@ # CONFIG.linux-ppc64.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-ppc64 host builds # Sites may override these definitions in CONFIG_SITE.linux-ppc64.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-ppc64.linux-ppc64 b/configure/os/CONFIG.linux-ppc64.linux-ppc64 index a866f5a74..cfd00a88f 100644 --- a/configure/os/CONFIG.linux-ppc64.linux-ppc64 +++ b/configure/os/CONFIG.linux-ppc64.linux-ppc64 @@ -1,7 +1,5 @@ # CONFIG.linux-ppc64.linux-ppc64 # -# $Revision-Id$ -# # Definitions for linux-ppc64 host - linux-ppc64 target builds # Sites may override these definitions in CONFIG_SITE.linux-ppc64.linux-ppc64 #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-x86-debug.Common b/configure/os/CONFIG.linux-x86-debug.Common index b16b70287..800edb394 100644 --- a/configure/os/CONFIG.linux-x86-debug.Common +++ b/configure/os/CONFIG.linux-x86-debug.Common @@ -1,8 +1,5 @@ # CONFIG.linux-x86-debug.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-x86 debug with debug compiler flags # Sites may override these definitions in CONFIG_SITE.linux-x86-debug.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-x86-debug.linux-x86-debug b/configure/os/CONFIG.linux-x86-debug.linux-x86-debug index 0b0e0f4e8..737a116f3 100644 --- a/configure/os/CONFIG.linux-x86-debug.linux-x86-debug +++ b/configure/os/CONFIG.linux-x86-debug.linux-x86-debug @@ -1,8 +1,5 @@ # CONFIG.linux-x86-debug.linux-x86-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-x86 host - linux-x86 target build with debug compiler flags # Sites may override these definitions in CONFIG_SITE.linux-x86-debug.linux-x86-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-x86.Common b/configure/os/CONFIG.linux-x86.Common index 16aa54986..4a525551e 100644 --- a/configure/os/CONFIG.linux-x86.Common +++ b/configure/os/CONFIG.linux-x86.Common @@ -1,8 +1,5 @@ # CONFIG.linux-x86.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-x86 host builds # Sites may override these definitions in CONFIG_SITE.linux-x86.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-x86.linux-x86 b/configure/os/CONFIG.linux-x86.linux-x86 index 6414b5ab0..f6a79241a 100644 --- a/configure/os/CONFIG.linux-x86.linux-x86 +++ b/configure/os/CONFIG.linux-x86.linux-x86 @@ -1,7 +1,5 @@ # CONFIG.linux-x86.linux-x86 # -# $Revision-Id$ -# # Definitions for linux-x86 host - linux-x86 target builds # Sites may override these definitions in CONFIG_SITE.linux-x86.linux-x86 #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-x86.linux-x86-debug b/configure/os/CONFIG.linux-x86.linux-x86-debug index 17b4f176e..dc71572d3 100644 --- a/configure/os/CONFIG.linux-x86.linux-x86-debug +++ b/configure/os/CONFIG.linux-x86.linux-x86-debug @@ -1,8 +1,5 @@ # CONFIG.linux-x86.linux-x86-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-x86 host - linux-x86-debug target build with debug compiler flags # Sites may override these definitions in CONFIG_SITE.linux-x86.linux-x86-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-x86.win32-x86-mingw b/configure/os/CONFIG.linux-x86.win32-x86-mingw index 297030765..150f13864 100644 --- a/configure/os/CONFIG.linux-x86.win32-x86-mingw +++ b/configure/os/CONFIG.linux-x86.win32-x86-mingw @@ -20,5 +20,5 @@ LOADABLE_SHRLIB_LDFLAGS = -shared \ # Don't link with gcc library GNU_LDLIBS_YES = -# Link with winsock2 -OP_SYS_LDLIBS = -lws2_32 +# Link with system libraries +OP_SYS_LDLIBS = -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm diff --git a/configure/os/CONFIG.linux-x86_64-debug.Common b/configure/os/CONFIG.linux-x86_64-debug.Common index da7348ad1..70bdf4e4b 100644 --- a/configure/os/CONFIG.linux-x86_64-debug.Common +++ b/configure/os/CONFIG.linux-x86_64-debug.Common @@ -1,8 +1,5 @@ # CONFIG.linux-x86_64-debug.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-x86_64 debug with debug compiler flags # Sites may override these definitions in CONFIG_SITE.linux-x86_64-debug.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-x86_64-debug.linux-x86_64-debug b/configure/os/CONFIG.linux-x86_64-debug.linux-x86_64-debug index 8a935237d..6f7980235 100644 --- a/configure/os/CONFIG.linux-x86_64-debug.linux-x86_64-debug +++ b/configure/os/CONFIG.linux-x86_64-debug.linux-x86_64-debug @@ -1,8 +1,5 @@ # CONFIG.linux-x86_64-debug.linux-x86_64-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-x86_64 host - linux-x86_64 target build with debug compiler flags # Sites may override these definitions in CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-x86_64.Common b/configure/os/CONFIG.linux-x86_64.Common index 6973d95bb..22cab92ef 100644 --- a/configure/os/CONFIG.linux-x86_64.Common +++ b/configure/os/CONFIG.linux-x86_64.Common @@ -1,8 +1,5 @@ # CONFIG.linux-x86_64.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-x86_64 host builds # Sites may override these definitions in CONFIG_SITE.linux-x86_64.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-x86_64.linux-x86_64 b/configure/os/CONFIG.linux-x86_64.linux-x86_64 index 34e4a2eef..4466a7edb 100644 --- a/configure/os/CONFIG.linux-x86_64.linux-x86_64 +++ b/configure/os/CONFIG.linux-x86_64.linux-x86_64 @@ -1,7 +1,5 @@ # CONFIG.linux-x86_64.linux-x86_64 # -# $Revision-Id$ -# # Definitions for linux-x86_64 host - linux-x86_64 target builds # Sites may override these definitions in CONFIG_SITE.linux-x86_64.linux-x86_64 #------------------------------------------------------- diff --git a/configure/os/CONFIG.linux-x86_64.linux-x86_64-debug b/configure/os/CONFIG.linux-x86_64.linux-x86_64-debug index 220b1d2de..8c804ee08 100644 --- a/configure/os/CONFIG.linux-x86_64.linux-x86_64-debug +++ b/configure/os/CONFIG.linux-x86_64.linux-x86_64-debug @@ -1,8 +1,5 @@ # CONFIG.linux-x86_64.linux-x86_64-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for linux-x86_64 host - linux-x86_64-debug target build with debug compiler flags # Sites may override these definitions in CONFIG_SITE.linux-x86_64.linux-x86_64-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-sparc-debug.Common b/configure/os/CONFIG.solaris-sparc-debug.Common index d148a238f..256a72118 100644 --- a/configure/os/CONFIG.solaris-sparc-debug.Common +++ b/configure/os/CONFIG.solaris-sparc-debug.Common @@ -1,8 +1,5 @@ # CONFIG.solaris-sparc-debug.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc debug with debug compiler flags # Sites may override these definitions in CONFIG_SITE.solaris-sparc-debug.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-sparc-debug.solaris-sparc-debug b/configure/os/CONFIG.solaris-sparc-debug.solaris-sparc-debug index c2c309174..9510bc6fa 100644 --- a/configure/os/CONFIG.solaris-sparc-debug.solaris-sparc-debug +++ b/configure/os/CONFIG.solaris-sparc-debug.solaris-sparc-debug @@ -1,8 +1,5 @@ # CONFIG.solaris-sparc-debug.solaris-sparc-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc host - solaris-sparc target build with debug compiler flags # Sites may override these definitions in CONFIG_SITE.solaris-sparc-debug.solaris-sparc-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-sparc-gnu.Common b/configure/os/CONFIG.solaris-sparc-gnu.Common index d8dd3d0d5..1ec37610f 100644 --- a/configure/os/CONFIG.solaris-sparc-gnu.Common +++ b/configure/os/CONFIG.solaris-sparc-gnu.Common @@ -1,8 +1,5 @@ # CONFIG.solaris-sparc-gnu.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc gnu compiler host builds # Sites may override these definitions in CONFIG_SITE.solaris-sparc-gnu.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu b/configure/os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu index ebdc042a8..03476b833 100644 --- a/configure/os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu +++ b/configure/os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu @@ -1,8 +1,5 @@ # CONFIG.solaris-sparc-gnu.solaris-sparc-gnu # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc gnu compiler host - solaris-sparc gnu compiler target builds # Sites may override these definitions in CONFIG_SITE.solaris-sparc-gnu.solaris-sparc-gnu #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-sparc.Common b/configure/os/CONFIG.solaris-sparc.Common index 73208c3b8..3c5fb044d 100644 --- a/configure/os/CONFIG.solaris-sparc.Common +++ b/configure/os/CONFIG.solaris-sparc.Common @@ -1,8 +1,5 @@ # CONFIG.solaris-sparc.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc host archs # Sites may override these definitions in CONFIG_SITE.solaris-sparc.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-sparc.solaris-sparc b/configure/os/CONFIG.solaris-sparc.solaris-sparc index 99b08ef3c..de625aed1 100644 --- a/configure/os/CONFIG.solaris-sparc.solaris-sparc +++ b/configure/os/CONFIG.solaris-sparc.solaris-sparc @@ -1,8 +1,5 @@ # CONFIG.solaris-sparc.solaris-sparc # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc host - solaris-sparc target build # Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-sparc.solaris-sparc-debug b/configure/os/CONFIG.solaris-sparc.solaris-sparc-debug index 433b4aea4..5578bcd66 100644 --- a/configure/os/CONFIG.solaris-sparc.solaris-sparc-debug +++ b/configure/os/CONFIG.solaris-sparc.solaris-sparc-debug @@ -1,8 +1,5 @@ # CONFIG.solaris-sparc.solaris-sparc-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc host - solaris-sparc-debug target build with debug compiler flags # Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-sparc.solaris-sparc-gnu b/configure/os/CONFIG.solaris-sparc.solaris-sparc-gnu index 0b886af65..423d3dc4b 100644 --- a/configure/os/CONFIG.solaris-sparc.solaris-sparc-gnu +++ b/configure/os/CONFIG.solaris-sparc.solaris-sparc-gnu @@ -1,8 +1,5 @@ # CONFIG.solaris-sparc.solaris-sparc-gnu # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc host - solaris-sparc-gnu target build with gnu compiler # Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc-gnu #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-sparc.solaris-sparc64 b/configure/os/CONFIG.solaris-sparc.solaris-sparc64 index 7c0929786..06c9ffa17 100644 --- a/configure/os/CONFIG.solaris-sparc.solaris-sparc64 +++ b/configure/os/CONFIG.solaris-sparc.solaris-sparc64 @@ -1,8 +1,5 @@ # CONFIG.solaris-sparc.solaris-sparc64 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc host - solaris-sparc64 target build with Sun compiler # Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc64 #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-sparc.solaris-sparc64-gnu b/configure/os/CONFIG.solaris-sparc.solaris-sparc64-gnu index 4a4b1352c..12c33de2b 100644 --- a/configure/os/CONFIG.solaris-sparc.solaris-sparc64-gnu +++ b/configure/os/CONFIG.solaris-sparc.solaris-sparc64-gnu @@ -1,8 +1,5 @@ # CONFIG.solaris-sparc.solaris-sparc64-gnu # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc host - solaris-sparc64-gnu target build with gnu compiler # Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc64-gnu #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-sparc64-gnu.Common b/configure/os/CONFIG.solaris-sparc64-gnu.Common index 7e004f5c0..a8e281af2 100644 --- a/configure/os/CONFIG.solaris-sparc64-gnu.Common +++ b/configure/os/CONFIG.solaris-sparc64-gnu.Common @@ -1,8 +1,5 @@ # CONFIG.solaris-sparc64-gnu.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc64 gnu compiler host builds # Sites may override these definitions in CONFIG_SITE.solaris-sparc64-gnu.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-sparc64-gnu.solaris-sparc64-gnu b/configure/os/CONFIG.solaris-sparc64-gnu.solaris-sparc64-gnu index 26a30d1a2..cbc921cd1 100644 --- a/configure/os/CONFIG.solaris-sparc64-gnu.solaris-sparc64-gnu +++ b/configure/os/CONFIG.solaris-sparc64-gnu.solaris-sparc64-gnu @@ -1,8 +1,5 @@ # CONFIG.solaris-sparc64-gnu.solaris-sparc64-gnu # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc64 gnu compiler host - solaris-sparc64 gnu compiler target builds # Sites may override these definitions in CONFIG_SITE.solaris-sparc64-gnu.solaris-sparc64-gnu #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-sparc64.Common b/configure/os/CONFIG.solaris-sparc64.Common index e62d51750..f87e58156 100644 --- a/configure/os/CONFIG.solaris-sparc64.Common +++ b/configure/os/CONFIG.solaris-sparc64.Common @@ -1,8 +1,5 @@ # CONFIG.solaris-sparc64.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc64 Sun compiler host builds # Sites may override these definitions in CONFIG_SITE.solaris-sparc64.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-sparc64.solaris-sparc64 b/configure/os/CONFIG.solaris-sparc64.solaris-sparc64 index 451ecde08..b862a3153 100644 --- a/configure/os/CONFIG.solaris-sparc64.solaris-sparc64 +++ b/configure/os/CONFIG.solaris-sparc64.solaris-sparc64 @@ -1,8 +1,5 @@ # CONFIG.solaris-sparc64.solaris-sparc64 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc64 compiler host - solaris-sparc64 compiler target builds # Sites may override these definitions in CONFIG_SITE.solaris-sparc64.solaris-sparc64 #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-sparc64.solaris-sparc64-debug b/configure/os/CONFIG.solaris-sparc64.solaris-sparc64-debug index ca32026e1..edbb733fc 100644 --- a/configure/os/CONFIG.solaris-sparc64.solaris-sparc64-debug +++ b/configure/os/CONFIG.solaris-sparc64.solaris-sparc64-debug @@ -1,8 +1,5 @@ # CONFIG.solaris-sparc64.solaris-sparc64-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-sparc64 host - solaris-sparc64-debug target build with debug compiler flags # Sites may override these definitions in CONFIG_SITE.solaris-sparc64.solaris-sparc64-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-x86-gnu.Common b/configure/os/CONFIG.solaris-x86-gnu.Common index d6c0749dc..e8111548f 100644 --- a/configure/os/CONFIG.solaris-x86-gnu.Common +++ b/configure/os/CONFIG.solaris-x86-gnu.Common @@ -1,8 +1,5 @@ # CONFIG.solaris-x86-gnu.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-x86 gnu compiler host builds # Sites may override these definitions in CONFIG_SITE.solaris-x86-gnu.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-x86-gnu.solaris-x86-gnu b/configure/os/CONFIG.solaris-x86-gnu.solaris-x86-gnu index 208c596a0..1c2c43826 100644 --- a/configure/os/CONFIG.solaris-x86-gnu.solaris-x86-gnu +++ b/configure/os/CONFIG.solaris-x86-gnu.solaris-x86-gnu @@ -1,8 +1,5 @@ # CONFIG.solaris-x86-gnu.solaris-x86-gnu # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-x86 gnu compiler host - solaris-x86 gnu compiler target builds # Sites may override these definitions in CONFIG_SITE.solaris-x86-gnu.solaris-x86-gnu #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-x86.Common b/configure/os/CONFIG.solaris-x86.Common index faea62005..9ae62e5ef 100644 --- a/configure/os/CONFIG.solaris-x86.Common +++ b/configure/os/CONFIG.solaris-x86.Common @@ -1,8 +1,5 @@ # CONFIG.solaris-x86.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-x86 host builds # Sites may override these definitions in CONFIG_SITE.solaris-x86.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-x86.solaris-x86 b/configure/os/CONFIG.solaris-x86.solaris-x86 index 7a815235e..2e4bb23e2 100644 --- a/configure/os/CONFIG.solaris-x86.solaris-x86 +++ b/configure/os/CONFIG.solaris-x86.solaris-x86 @@ -1,8 +1,5 @@ # CONFIG.solaris-x86.solaris-x86 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-x86 host - solaris-x86 target builds # Sites may override these definitions in CONFIG_SITE.solaris-x86.solaris-x86 #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-x86.solaris-x86-debug b/configure/os/CONFIG.solaris-x86.solaris-x86-debug index 5840ce2c7..505080310 100644 --- a/configure/os/CONFIG.solaris-x86.solaris-x86-debug +++ b/configure/os/CONFIG.solaris-x86.solaris-x86-debug @@ -1,8 +1,5 @@ # CONFIG.solaris-x86.solaris-x86-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-x86 host - solaris-x86-debug target build with debug compiler flags # Sites may override these definitions in CONFIG_SITE.solaris-x86.solaris-x86-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-x86.solaris-x86_64 b/configure/os/CONFIG.solaris-x86.solaris-x86_64 index 8fb45c39b..e1ef93afe 100644 --- a/configure/os/CONFIG.solaris-x86.solaris-x86_64 +++ b/configure/os/CONFIG.solaris-x86.solaris-x86_64 @@ -1,8 +1,5 @@ # CONFIG.solaris-x86.solaris-x86_64 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-x86 host - solaris-x86_64 target build with Sun compiler # Sites may override these definitions in CONFIG_SITE.solaris-x86.solaris-x86_64 #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-x86_64-gnu.Common b/configure/os/CONFIG.solaris-x86_64-gnu.Common index 180f9d03e..9c0296d3d 100644 --- a/configure/os/CONFIG.solaris-x86_64-gnu.Common +++ b/configure/os/CONFIG.solaris-x86_64-gnu.Common @@ -1,8 +1,5 @@ # CONFIG.solaris-x86_64-gnu.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-x86_64 gnu compiler host builds # Sites may override these definitions in CONFIG_SITE.solaris-sparc64-gnu.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-x86_64-gnu.solaris-x86_64-gnu b/configure/os/CONFIG.solaris-x86_64-gnu.solaris-x86_64-gnu index 8e1f4789f..8ff61b8a8 100644 --- a/configure/os/CONFIG.solaris-x86_64-gnu.solaris-x86_64-gnu +++ b/configure/os/CONFIG.solaris-x86_64-gnu.solaris-x86_64-gnu @@ -1,8 +1,5 @@ # CONFIG.solaris-x86_64-gnu.solaris-x86_64-gnu # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-x86_64 gnu compiler host - solaris-sx86_64 gnu compiler target builds # Sites may override these definitions in CONFIG_SITE.solaris-x86_64-gnu.solaris-x86_64-gnu #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-x86_64.Common b/configure/os/CONFIG.solaris-x86_64.Common index 6d650f660..a8b6c17ec 100644 --- a/configure/os/CONFIG.solaris-x86_64.Common +++ b/configure/os/CONFIG.solaris-x86_64.Common @@ -1,8 +1,5 @@ # CONFIG.solaris-x86_64.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-x86_64 Sun compiler host builds # Sites may override these definitions in CONFIG_SITE.solaris-x86_64.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-x86_64.solaris-x86_64 b/configure/os/CONFIG.solaris-x86_64.solaris-x86_64 index 21deb353d..7e2111e76 100644 --- a/configure/os/CONFIG.solaris-x86_64.solaris-x86_64 +++ b/configure/os/CONFIG.solaris-x86_64.solaris-x86_64 @@ -1,8 +1,5 @@ # CONFIG.solaris-x86_64.solaris-x86_64 # -# $Id -# This file is maintained by the build community. -# # Definitions for solaris-x86_64 Sun compiler host - solaris-x86_64 Sun compiler target builds # Sites may override these definitions in CONFIG_SITE.solaris-x86_64.solaris-x86_64 #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-x86_64.solaris-x86_64-debug b/configure/os/CONFIG.solaris-x86_64.solaris-x86_64-debug index c3e5dbd5f..fb375157d 100644 --- a/configure/os/CONFIG.solaris-x86_64.solaris-x86_64-debug +++ b/configure/os/CONFIG.solaris-x86_64.solaris-x86_64-debug @@ -1,8 +1,5 @@ # CONFIG.solaris-x86_64.solaris-x86_64-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris-x86_64 host - solaris-x86_64-debug target build with debug compiler flags # Sites may override these definitions in CONFIG_SITE.solaris-x86_64.solaris-x86_64-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.solarisCommon.solarisCommon b/configure/os/CONFIG.solarisCommon.solarisCommon index aa5e035d0..2b04f53bd 100644 --- a/configure/os/CONFIG.solarisCommon.solarisCommon +++ b/configure/os/CONFIG.solarisCommon.solarisCommon @@ -1,8 +1,5 @@ # CONFIG.solarisCommon.solarisCommon # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for solaris host - solaris target build # Sites may override these definitions in CONFIG_SITE.solarisCommon.solarisCommon #------------------------------------------------------- diff --git a/configure/os/CONFIG.win32-x86-debug.Common b/configure/os/CONFIG.win32-x86-debug.Common index 5c3376e9e..602fb9038 100644 --- a/configure/os/CONFIG.win32-x86-debug.Common +++ b/configure/os/CONFIG.win32-x86-debug.Common @@ -1,10 +1,7 @@ # CONFIG.win32-x86-debug.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for win32-x86 debug with debug compiler flags -# Sites may override these definitions in CONFIG_SITE.win32-x86-debug.Common +# Definitions for win32-x86-debug host arch +# Override these definitions in CONFIG_SITE.win32-x86-debug.Common #------------------------------------------------------- #Include definitions common to win32-x86 hosts diff --git a/configure/os/CONFIG.win32-x86-debug.win32-x86-debug b/configure/os/CONFIG.win32-x86-debug.win32-x86-debug index 92f025c49..8ee66ff8f 100644 --- a/configure/os/CONFIG.win32-x86-debug.win32-x86-debug +++ b/configure/os/CONFIG.win32-x86-debug.win32-x86-debug @@ -1,12 +1,12 @@ # CONFIG.win32-x86-debug.win32-x86-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for win32-x86 debug compiler host - win32-x86 debug compiler target builds -# Sites may override these definitions in CONFIG_SITE.win32-x86-debug.win32-x86-debug +# Definitions for win32-x86-debug host - win32-x86-debug target build +# Override these definitions in CONFIG_SITE.win32-x86-debug.win32-x86-debug #------------------------------------------------------- +#Include definitions common to win32-x86 builds include $(CONFIG)/os/CONFIG.win32-x86.win32-x86 +-include $(CONFIG)/os/CONFIG_SITE.win32-x86.win32-x86 +# Override CONFIG_SITE settings: HOST_OPT=NO diff --git a/configure/os/CONFIG.win32-x86-mingw.Common b/configure/os/CONFIG.win32-x86-mingw.Common index a488c6647..ebe195a7c 100644 --- a/configure/os/CONFIG.win32-x86-mingw.Common +++ b/configure/os/CONFIG.win32-x86-mingw.Common @@ -1,8 +1,5 @@ # CONFIG.win32-x86-mingw.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for win32-x86-mingw host archs # Sites may override these definitions in CONFIG_SITE.win32-x86-mingw.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw b/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw index 3f1cb2fd7..2a7827ccd 100644 --- a/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw +++ b/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw @@ -1,7 +1,5 @@ # CONFIG.win32-x86-mingw.win32-x86-mingw # -# $Revision-Id$ -# # Definitions for win32-x86-mingw host - win32-x86-mingw target builds # Sites may override these definitions in CONFIG_SITE.win32-x86-mingw.win32-x86-mingw #------------------------------------------------------- @@ -33,5 +31,5 @@ LOADABLE_SHRLIB_LDFLAGS = -shared \ # Don't link with gcc library GNU_LDLIBS_YES = -# Link with winsock2 -OP_SYS_LDLIBS = -lws2_32 +# Link with system libraries +OP_SYS_LDLIBS = -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm diff --git a/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw-debug b/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw-debug index 304eec53a..33148a819 100644 --- a/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw-debug +++ b/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw-debug @@ -1,8 +1,5 @@ # CONFIG.win32-x86-mingw.win32-x86-mingw-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for win32-x86-mingw compiler host - win32-x86-mingw debug compiler target builds # Sites may override these definitions in CONFIG_SITE.win32-x86-mingw.win32-x86-mingw-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.win32-x86-static.Common b/configure/os/CONFIG.win32-x86-static.Common index 7c4508ca6..d302e4614 100644 --- a/configure/os/CONFIG.win32-x86-static.Common +++ b/configure/os/CONFIG.win32-x86-static.Common @@ -1,8 +1,5 @@ # CONFIG.win32-x86-static.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for win32-x86-static host archs # Sites may override these definitions in CONFIG_SITE.win32-x86-static.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.win32-x86-static.win32-x86-static b/configure/os/CONFIG.win32-x86-static.win32-x86-static index 0bb18a6d0..da90f992a 100644 --- a/configure/os/CONFIG.win32-x86-static.win32-x86-static +++ b/configure/os/CONFIG.win32-x86-static.win32-x86-static @@ -1,13 +1,13 @@ # CONFIG.win32-x86-static.win32-x86.static # -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for win32-x86-static target archs when host arch is win32-x86-static -# Sites may override these definitions in CONFIG_SITE.win32-x86-static.win32-x86-static +# Definitions for win32-x86-static host - win32-x86-static target build +# Override these definitions in CONFIG_SITE.win32-x86-static.win32-x86-static #------------------------------------------------------- +#Include definitions common to win32-x86 builds include $(CONFIG)/os/CONFIG.win32-x86.win32-x86 +-include $(CONFIG)/os/CONFIG_SITE.win32-x86.win32-x86 +# Override CONFIG_SITE settings: SHARED_LIBRARIES = NO STATIC_BUILD = YES diff --git a/configure/os/CONFIG.win32-x86.Common b/configure/os/CONFIG.win32-x86.Common index f2c75b055..be328cc19 100644 --- a/configure/os/CONFIG.win32-x86.Common +++ b/configure/os/CONFIG.win32-x86.Common @@ -1,10 +1,7 @@ # CONFIG.win32-x86.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for win32-x86 host archs -# Sites may override these definitions in CONFIG_SITE.win32-x86.Common +# Override these definitions in CONFIG_SITE.win32-x86.Common #------------------------------------------------------- CP = $(PERL) -MExtUtils::Command -e cp diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86 index d36093d53..f9bb0b9cb 100644 --- a/configure/os/CONFIG.win32-x86.win32-x86 +++ b/configure/os/CONFIG.win32-x86.win32-x86 @@ -1,10 +1,7 @@ # CONFIG.win32-x86.win32-x86 # -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for win32-x86 target archs when host arch is win32-x86 -# Sites may override these definitions in CONFIG_SITE.win32-x86.win32-x86 +# Definitions for win32-x86 host - win32-x86 target build +# Override these definitions in CONFIG_SITE.win32-x86.win32-x86 #------------------------------------------------------- # Win32 valid build types and include directory suffixes @@ -25,16 +22,21 @@ ARCMD = lib -nologo -verbose -out:$@ $(LIB_OPT_LDFLAGS) $(LIBRARY_LD_OBJS) # Configure OS vendor C compiler CC = cl -# Override CONFIG.gnuCommon for cross builds. +# Override CONFIG.gnuCommon settings for cross builds. GNU = NO HDEPENDS_METHOD = MKMF +# Compiler flags for C files (C++ is below) + # -# -W use warning level N -# (maximum (lint type) warnings at level 4) -# -w44355 set "'this' used in the base initializer list" to be level 4 -WARN_CFLAGS_YES = -W3 -w44355 -WARN_CFLAGS_NO = -W1 +# -W display warnings at level d +# -W4 is for maximum (lint type) warnings +# -W3 is for production quality warnings +# -W2 displays significant warnings +# -W1 is the default and shows severe warnings only +# -w Set warning C to be shown at level +WARN_CFLAGS_YES = -W3 +WARN_CFLAGS_NO = -W1 # # -Ox maximum optimizations @@ -69,7 +71,7 @@ STATIC_CFLAGS_YES= -MT$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS) STATIC_CFLAGS_NO= -MD$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS) -DEPICS_CALL_DLL # OS vendor c preprocessor -CPP = cl -C -E +CPP = cl -nologo -C -E # Configure OS vendor C++ compiler # @@ -85,11 +87,15 @@ CCC = cl -EHsc -GR CODE_CPPFLAGS += -nologo -D__STDC__=0 CODE_CPPFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE + +# Compiler flags for C++ files + # # -W use warning level N # (maximum lint level warnings at level 4) # -w44355 set "'this' used in the base initializer list" to be level 4 -WARN_CXXFLAGS_YES = -W3 -w44355 +# -w44344 "behavior change: use of explicit template arguments results in ..." +WARN_CXXFLAGS_YES = -W3 -w44355 -w44344 WARN_CXXFLAGS_NO = -W1 # diff --git a/configure/os/CONFIG.win32-x86.win32-x86-debug b/configure/os/CONFIG.win32-x86.win32-x86-debug index a4949dde7..a71c9957a 100644 --- a/configure/os/CONFIG.win32-x86.win32-x86-debug +++ b/configure/os/CONFIG.win32-x86.win32-x86-debug @@ -1,20 +1,15 @@ # CONFIG.win32-x86.win32-x86-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for win32-x86 host - win32-x86-debug target build -# Sites may override these definitions in CONFIG_SITE.win32-x86.win32-x86-debug +# Override these definitions in CONFIG_SITE.win32-x86.win32-x86-debug #------------------------------------------------------- --include $(CONFIG)/os/CONFIG.Common.win32-x86 --include $(CONFIG)/os/CONFIG.win32-x86.win32-x86 --include $(CONFIG)/os/CONFIG_SITE.Common.win32-x86 +#Include definitions common to win32-x86 builds +include $(CONFIG)/os/CONFIG.win32-x86.win32-x86 -include $(CONFIG)/os/CONFIG_SITE.win32-x86.win32-x86 -GNU = NO - -HDEPENDS_METHOD = MKMF +# Override CONFIG.CrossCommon settings: BUILD_CLASS = HOST +# Override CONFIG_SITE settings: HOST_OPT = NO diff --git a/configure/os/CONFIG.win32-x86.win32-x86-static b/configure/os/CONFIG.win32-x86.win32-x86-static index a23431744..ae5313a5c 100644 --- a/configure/os/CONFIG.win32-x86.win32-x86-static +++ b/configure/os/CONFIG.win32-x86.win32-x86-static @@ -1,14 +1,16 @@ # CONFIG.win32-x86.win32-x86-static # -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for win32-x86-static target archs when host arch is win32-x86 -# Sites may override these definitions in CONFIG_SITE.win32-x86.win32-x86-static +# Definitions for win32-x86 host - win32-x86-static target build +# Override these definitions in CONFIG_SITE.win32-x86.win32-x86-static #------------------------------------------------------- +#Include definitions common to win32-x86 builds include $(CONFIG)/os/CONFIG.win32-x86.win32-x86 +-include $(CONFIG)/os/CONFIG_SITE.win32-x86.win32-x86 +# Override CONFIG.CrossCommon settings: BUILD_CLASS = HOST + +# Override CONFIG_SITE settings: SHARED_LIBRARIES = NO STATIC_BUILD = YES diff --git a/configure/os/CONFIG.win32-x86.windows-x64 b/configure/os/CONFIG.win32-x86.windows-x64 deleted file mode 100644 index d0bcbd4cf..000000000 --- a/configure/os/CONFIG.win32-x86.windows-x64 +++ /dev/null @@ -1,18 +0,0 @@ -# CONFIG.win-x86.windows-x64 -# -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for windows-x64 target archs when host arch is win32-x86 -# Sites may override these definitions in CONFIG_SITE.win32-x86.windows-x64 -#------------------------------------------------------- - --include $(CONFIG)/os/CONFIG.Common.win32-x86 --include $(CONFIG)/os/CONFIG.win32-x86.win32-x86 - -OPT_LDFLAGS += /MACHINE:X64 - -# /MACHINE:X64 -# /MACHINE:IA64 (Itanium) -# /MACHINE:X86 - diff --git a/configure/os/CONFIG.windows-x64-debug.Common b/configure/os/CONFIG.windows-x64-debug.Common index e030eb265..ad433bc8f 100644 --- a/configure/os/CONFIG.windows-x64-debug.Common +++ b/configure/os/CONFIG.windows-x64-debug.Common @@ -1,10 +1,7 @@ # CONFIG.windows-x64-debug.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for windows-x64 debug with debug compiler flags -# Sites may override these definitions in CONFIG_SITE.windows-x64-debug.Common +# Definitions for windows-x64-debug host arch +# Override these definitions in CONFIG_SITE.windows-x64-debug.Common #------------------------------------------------------- #Include definitions common to windows-x64 hosts diff --git a/configure/os/CONFIG.windows-x64-debug.windows-x64-debug b/configure/os/CONFIG.windows-x64-debug.windows-x64-debug index d15b9a3aa..0a2c88d4f 100644 --- a/configure/os/CONFIG.windows-x64-debug.windows-x64-debug +++ b/configure/os/CONFIG.windows-x64-debug.windows-x64-debug @@ -1,8 +1,5 @@ # CONFIG.windows-x64-debug.windows-x64-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for windows-x64 debug compiler host - windows-x64 debug compiler target builds # Sites may override these definitions in CONFIG_SITE.windows-x64-debug.windows-x64-debug #------------------------------------------------------- diff --git a/configure/os/CONFIG.windows-x64-mingw.Common b/configure/os/CONFIG.windows-x64-mingw.Common index c467a3a51..812168480 100644 --- a/configure/os/CONFIG.windows-x64-mingw.Common +++ b/configure/os/CONFIG.windows-x64-mingw.Common @@ -1,8 +1,5 @@ # CONFIG.windows-x64-mingw.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for windows-x64-mingw host archs # Sites may override these definitions in CONFIG_SITE.windows-x64-mingw.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.windows-x64-mingw.windows-x64-mingw b/configure/os/CONFIG.windows-x64-mingw.windows-x64-mingw index 9e42784aa..d8e49637e 100644 --- a/configure/os/CONFIG.windows-x64-mingw.windows-x64-mingw +++ b/configure/os/CONFIG.windows-x64-mingw.windows-x64-mingw @@ -1,8 +1,5 @@ # CONFIG.windows-x64-mingw.windows-x64-mingw # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for windows-x64-mingw target archs # Sites may override these definitions in CONFIG_SITE.windows-x64-mingw.windows-x64-mingw #------------------------------------------------------- diff --git a/configure/os/CONFIG.windows-x64-static.Common b/configure/os/CONFIG.windows-x64-static.Common index be61abad0..88bef64ff 100644 --- a/configure/os/CONFIG.windows-x64-static.Common +++ b/configure/os/CONFIG.windows-x64-static.Common @@ -1,11 +1,9 @@ # CONFIG.windows-x64-static.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Definitions for windows-x64-static host archs -# Sites may override these definitions in CONFIG_SITE.windows-x64-static.Common +# Override these definitions in CONFIG_SITE.windows-x64-static.Common #------------------------------------------------------- +#Include definitions common to windows-x64 hosts include $(CONFIG)/os/CONFIG.windows-x64.Common diff --git a/configure/os/CONFIG.windows-x64-static.windows-x64-static b/configure/os/CONFIG.windows-x64-static.windows-x64-static index e5e152411..097e65558 100644 --- a/configure/os/CONFIG.windows-x64-static.windows-x64-static +++ b/configure/os/CONFIG.windows-x64-static.windows-x64-static @@ -1,13 +1,12 @@ # CONFIG.windows-x64-static.windows-x64-static # -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for windows-x64-static target archs when host arch is windows-x64-static -# Sites may override these definitions in CONFIG_SITE.windows-x64-static.windows-x64-static +# Definitions for windows-x64-static host - windows-x64-static target build +# Override these definitions in CONFIG_SITE.windows-x64-static.windows-x64-static #------------------------------------------------------- +#Include definitions common to windows-x64 builds include $(CONFIG)/os/CONFIG.windows-x64.windows-x64 +# Override CONFIG_SITE settings: SHARED_LIBRARIES = NO STATIC_BUILD= YES diff --git a/configure/os/CONFIG.windows-x64.Common b/configure/os/CONFIG.windows-x64.Common index 252b46436..de2fa3f57 100644 --- a/configure/os/CONFIG.windows-x64.Common +++ b/configure/os/CONFIG.windows-x64.Common @@ -1,13 +1,9 @@ # CONFIG.windows-x64.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for windows-x64 host archs -# Sites may override these definitions in CONFIG_SITE.windows-x64.Common +# Definitions for windows-x64 host arch +# Override these definitions in CONFIG_SITE.windows-x64.Common #------------------------------------------------------- --include $(CONFIG)/os/CONFIG.win32-x86.Common - -WIND_HOST_TYPE = x86-win32 +#Include definitions common to win32-x86 hosts +include $(CONFIG)/os/CONFIG.win32-x86.Common diff --git a/configure/os/CONFIG.windows-x64.windows-x64 b/configure/os/CONFIG.windows-x64.windows-x64 index baa1ba945..d0e59bd7c 100644 --- a/configure/os/CONFIG.windows-x64.windows-x64 +++ b/configure/os/CONFIG.windows-x64.windows-x64 @@ -1,16 +1,14 @@ # CONFIG.windows-x64.windows-x64 # -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for windows-x64 target archs when host arch is windows-x64 -# Sites may override these definitions in CONFIG_SITE.windows-x64.windows-x64 +# Definitions for windows-x64 host - windows-x64 target build +# Override these definitions in CONFIG_SITE.windows-x64.windows-x64 #------------------------------------------------------- --include $(CONFIG)/os/CONFIG.win32-x86.win32-x86 +#Include definitions common to win32-x86 builds +include $(CONFIG)/os/CONFIG.win32-x86.win32-x86 +-include $(CONFIG)/os/CONFIG_SITE.win32-x86.win32-x86 OPT_LDFLAGS += /MACHINE:X64 - # /MACHINE:X64 # /MACHINE:IA64 (Itanium) # /MACHINE:X86 diff --git a/configure/os/CONFIG.windows-x64.windows-x64-debug b/configure/os/CONFIG.windows-x64.windows-x64-debug index d9f675aac..8c97ac343 100644 --- a/configure/os/CONFIG.windows-x64.windows-x64-debug +++ b/configure/os/CONFIG.windows-x64.windows-x64-debug @@ -1,12 +1,14 @@ # CONFIG.windows-x64.windows-x64-debug # -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for windows-x64 compiler host - windows-x64 debug compiler target builds -# Sites may override these definitions in CONFIG_SITE.windows-x64.windows-x64-debug +# Definitions for windows-x64 host - windows-x64-debug target build +# Override these definitions in CONFIG_SITE.windows-x64.windows-x64-debug #------------------------------------------------------- +#Include definitions common to windows-x64 builds include $(CONFIG)/os/CONFIG.windows-x64.windows-x64 +# Override CONFIG.CrossCommon settings: +BUILD_CLASS = HOST + +# Override CONFIG_SITE settings: HOST_OPT=NO diff --git a/configure/os/CONFIG.windows-x64.windows-x64-static b/configure/os/CONFIG.windows-x64.windows-x64-static index 8a6fd20f9..49bf2e0f6 100644 --- a/configure/os/CONFIG.windows-x64.windows-x64-static +++ b/configure/os/CONFIG.windows-x64.windows-x64-static @@ -1,14 +1,15 @@ -# CONFIG.windows-x86.windows-x86-static +# CONFIG.windows-x64.windows-x64-static # -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for windows-x64-static target archs when host arch is windows-x64 -# Sites may override these definitions in CONFIG_SITE.windows-x64.windows-x64-static +# Definitions for windows-x64 host - windows-x64-static target build +# Override these definitions in CONFIG_SITE.windows-x64.windows-x64-static #------------------------------------------------------- +#Include definitions common to windows-x64 builds include $(CONFIG)/os/CONFIG.windows-x64.windows-x64 +# Override CONFIG.CrossCommon settings: BUILD_CLASS = HOST + +# Override CONFIG_SITE settings: SHARED_LIBRARIES = NO STATIC_BUILD = YES diff --git a/configure/os/CONFIG_SITE.Common.RTEMS b/configure/os/CONFIG_SITE.Common.RTEMS index d2cccea67..0b5d227ee 100644 --- a/configure/os/CONFIG_SITE.Common.RTEMS +++ b/configure/os/CONFIG_SITE.Common.RTEMS @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.RTEMS # -# $Revision-Id$ -# # Site-specific information for all RTEMS targets #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.Common.cygwin-x86 b/configure/os/CONFIG_SITE.Common.cygwin-x86 index fdb014bd3..eae9ee5dd 100644 --- a/configure/os/CONFIG_SITE.Common.cygwin-x86 +++ b/configure/os/CONFIG_SITE.Common.cygwin-x86 @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.cygwin-x86 # -# $Revision-Id$ -# # Site Specific definitions for cygwin-x86 target # Depending on your version of Cygwin you'll want one of the following diff --git a/configure/os/CONFIG_SITE.Common.cygwin-x86_64 b/configure/os/CONFIG_SITE.Common.cygwin-x86_64 index 9b2ccdd3b..8d318e04e 100644 --- a/configure/os/CONFIG_SITE.Common.cygwin-x86_64 +++ b/configure/os/CONFIG_SITE.Common.cygwin-x86_64 @@ -1,22 +1,20 @@ -# CONFIG_SITE.Common.cygwin-x86_64 -# -# $Revision-Id$ -# -# Site Specific definitions for cygwin-x86_64 target -# Only the local epics system manager should modify this file - -# If readline is installed uncomment the following line -# to add command-line editing and history support -#COMMANDLINE_LIBRARY = READLINE - -# Uncomment the following line if readline has problems -#LDLIBS_READLINE = -lreadline -lcurses - - -# It makes sense to include debugging symbols even in optimized builds -# in case you want to attach gdb to the process or examine a core-dump. -# This does cost disk space, but not memory as debug symbols are not -# loaded into RAM when the binary is loaded. -OPT_CFLAGS_YES += -g -OPT_CXXFLAGS_YES += -g - +# CONFIG_SITE.Common.cygwin-x86_64 +# +# Site Specific definitions for cygwin-x86_64 target +# Only the local epics system manager should modify this file + +# If readline is installed uncomment the following line +# to add command-line editing and history support +#COMMANDLINE_LIBRARY = READLINE + +# Uncomment the following line if readline has problems +#LDLIBS_READLINE = -lreadline -lcurses + + +# It makes sense to include debugging symbols even in optimized builds +# in case you want to attach gdb to the process or examine a core-dump. +# This does cost disk space, but not memory as debug symbols are not +# loaded into RAM when the binary is loaded. +OPT_CFLAGS_YES += -g +OPT_CXXFLAGS_YES += -g + diff --git a/configure/os/CONFIG_SITE.Common.darwin-ppc b/configure/os/CONFIG_SITE.Common.darwin-ppc index 659ac782d..a2550147f 100644 --- a/configure/os/CONFIG_SITE.Common.darwin-ppc +++ b/configure/os/CONFIG_SITE.Common.darwin-ppc @@ -1,8 +1,5 @@ # CONFIG_SITE.Common.darwin-ppc # -# $Revision-Id$ -# This file is maintained by the build community. -# # Site override definitions for darwin-ppc target builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.Common.darwin-ppcx86 b/configure/os/CONFIG_SITE.Common.darwin-ppcx86 index e4c32e968..2191d54f8 100644 --- a/configure/os/CONFIG_SITE.Common.darwin-ppcx86 +++ b/configure/os/CONFIG_SITE.Common.darwin-ppcx86 @@ -1,8 +1,5 @@ # CONFIG_SITE.Common.darwin-ppcx86 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Site override definitions for darwin-ppcx86 target builds #---------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.Common.darwin-x86 b/configure/os/CONFIG_SITE.Common.darwin-x86 index e8f36c4bc..1c5c93696 100644 --- a/configure/os/CONFIG_SITE.Common.darwin-x86 +++ b/configure/os/CONFIG_SITE.Common.darwin-x86 @@ -1,8 +1,5 @@ # CONFIG_SITE.Common.darwin-x86 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Site override definitions for darwin-x86 target builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.Common.ios-arm b/configure/os/CONFIG_SITE.Common.ios-arm index 1262b4372..f406007d1 100644 --- a/configure/os/CONFIG_SITE.Common.ios-arm +++ b/configure/os/CONFIG_SITE.Common.ios-arm @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.ios-arm # -# $Revision-Id$ -# # Site-specific settings for ios-arm target builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.Common.ios-x86 b/configure/os/CONFIG_SITE.Common.ios-x86 index 8c59187c7..e97c8b778 100644 --- a/configure/os/CONFIG_SITE.Common.ios-x86 +++ b/configure/os/CONFIG_SITE.Common.ios-x86 @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.ios-x86 # -# $Revision-Id$ -# # Site-specific settings for ios-x86 target builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.Common.iosCommon b/configure/os/CONFIG_SITE.Common.iosCommon index a964c5bca..573d855ae 100644 --- a/configure/os/CONFIG_SITE.Common.iosCommon +++ b/configure/os/CONFIG_SITE.Common.iosCommon @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.iosCommon # -# $Revision-Id$ -# # Site-specific settings for Apple iOS builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.Common.linux-arm b/configure/os/CONFIG_SITE.Common.linux-arm index 0e78404cc..556ac6f09 100644 --- a/configure/os/CONFIG_SITE.Common.linux-arm +++ b/configure/os/CONFIG_SITE.Common.linux-arm @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.linux-arm # -# $Revision-Id$ -# # Site Specific definitions for all linux-arm targets #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.Common.linux-cris b/configure/os/CONFIG_SITE.Common.linux-cris index c748c1368..b17cb0ee5 100644 --- a/configure/os/CONFIG_SITE.Common.linux-cris +++ b/configure/os/CONFIG_SITE.Common.linux-cris @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.linux-cris # -# $Revision-Id$ -# # Site Specific definitions for linux-cris target # Only the local epics system manager should modify this file diff --git a/configure/os/CONFIG_SITE.Common.linux-x86 b/configure/os/CONFIG_SITE.Common.linux-x86 index a1d64726c..07182820d 100644 --- a/configure/os/CONFIG_SITE.Common.linux-x86 +++ b/configure/os/CONFIG_SITE.Common.linux-x86 @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.linux-x86 # -# $Revision-Id$ -# # Site Specific definitions for linux-x86 target # Only the local epics system manager should modify this file diff --git a/configure/os/CONFIG_SITE.Common.linux-x86_64 b/configure/os/CONFIG_SITE.Common.linux-x86_64 index 5e31809c0..18fb2974d 100644 --- a/configure/os/CONFIG_SITE.Common.linux-x86_64 +++ b/configure/os/CONFIG_SITE.Common.linux-x86_64 @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.linux-x86_64 # -# $Revision-Id$ -# # Site Specific definitions for linux-x86_64 target # Only the local epics system manager should modify this file diff --git a/configure/os/CONFIG_SITE.Common.linux-xscale_be b/configure/os/CONFIG_SITE.Common.linux-xscale_be index 226aebac6..69efd6ffa 100644 --- a/configure/os/CONFIG_SITE.Common.linux-xscale_be +++ b/configure/os/CONFIG_SITE.Common.linux-xscale_be @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.linux-xscale_be # -# $Revision-Id$ -# # Site specific definitions for linux-xscale_be target builds. #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.Common.solaris-sparc b/configure/os/CONFIG_SITE.Common.solaris-sparc index 851254203..e8a6c875a 100644 --- a/configure/os/CONFIG_SITE.Common.solaris-sparc +++ b/configure/os/CONFIG_SITE.Common.solaris-sparc @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.solaris-sparc # -# $Revision-Id$ -# # Site Specific definitions for solaris-sparc target # Only the local epics system manager should modify this file diff --git a/configure/os/CONFIG_SITE.Common.solaris-sparc-gnu b/configure/os/CONFIG_SITE.Common.solaris-sparc-gnu index 782275437..6e9c00f65 100644 --- a/configure/os/CONFIG_SITE.Common.solaris-sparc-gnu +++ b/configure/os/CONFIG_SITE.Common.solaris-sparc-gnu @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.solaris-sparc-gnu # -# $Revision-Id$ -# # Site Specific definitions for solaris-sparc-gnu target # Only the local epics system manager should modify this file diff --git a/configure/os/CONFIG_SITE.Common.solaris-sparc64 b/configure/os/CONFIG_SITE.Common.solaris-sparc64 index 3af199b04..5a6bf8d82 100644 --- a/configure/os/CONFIG_SITE.Common.solaris-sparc64 +++ b/configure/os/CONFIG_SITE.Common.solaris-sparc64 @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.solaris-sparc64 # -# $Revision-Id$ -# # Site Specific definitions for solaris-sparc64 target # Only the local epics system manager should modify this file diff --git a/configure/os/CONFIG_SITE.Common.solaris-sparc64-gnu b/configure/os/CONFIG_SITE.Common.solaris-sparc64-gnu index 5b52b8507..d7e1d726d 100644 --- a/configure/os/CONFIG_SITE.Common.solaris-sparc64-gnu +++ b/configure/os/CONFIG_SITE.Common.solaris-sparc64-gnu @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.solaris-sparc64-gnu # -# $Revision-Id$ -# # Site Specific definitions for solaris-sparc64-gnu target # Only the local epics system manager should modify this file diff --git a/configure/os/CONFIG_SITE.Common.solaris-x86 b/configure/os/CONFIG_SITE.Common.solaris-x86 index 2a972d9cb..77bb8d45c 100644 --- a/configure/os/CONFIG_SITE.Common.solaris-x86 +++ b/configure/os/CONFIG_SITE.Common.solaris-x86 @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.solaris-x86 # -# $Revision-Id$ -# # Site Specific definitions for solaris-x86 targets # Only the local epics system manager should modify this file diff --git a/configure/os/CONFIG_SITE.Common.solaris-x86-gnu b/configure/os/CONFIG_SITE.Common.solaris-x86-gnu index 2f6b3b7cd..0f93f0f18 100644 --- a/configure/os/CONFIG_SITE.Common.solaris-x86-gnu +++ b/configure/os/CONFIG_SITE.Common.solaris-x86-gnu @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.solaris-x86-gnu # -# $Revision-Id$ -# # Site Specific definitions for solaris-x86-gnu target # Only the local epics system manager should modify this file diff --git a/configure/os/CONFIG_SITE.Common.solaris-x86_64 b/configure/os/CONFIG_SITE.Common.solaris-x86_64 index ce173608d..e54ec4f94 100644 --- a/configure/os/CONFIG_SITE.Common.solaris-x86_64 +++ b/configure/os/CONFIG_SITE.Common.solaris-x86_64 @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.solaris-x86_64 # -# $Revision-Id$ -# # Site Specific definitions for solaris-x86_64 target # Only the local epics system manager should modify this file diff --git a/configure/os/CONFIG_SITE.Common.solaris-x86_64-gnu b/configure/os/CONFIG_SITE.Common.solaris-x86_64-gnu index f1f72c980..2b13215fb 100644 --- a/configure/os/CONFIG_SITE.Common.solaris-x86_64-gnu +++ b/configure/os/CONFIG_SITE.Common.solaris-x86_64-gnu @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.solaris-x86_64-gnu # -# $Revision-Id$ -# # Site Specific definitions for solaris-x86_64-gnu target # Only the local epics system manager should modify this file diff --git a/configure/os/CONFIG_SITE.Common.vxWorks-mpc8540 b/configure/os/CONFIG_SITE.Common.vxWorks-mpc8540 index d742df3fe..ea9d9651e 100644 --- a/configure/os/CONFIG_SITE.Common.vxWorks-mpc8540 +++ b/configure/os/CONFIG_SITE.Common.vxWorks-mpc8540 @@ -1,4 +1,3 @@ -# $Revision-Id$ # # Site Specific definitions for the vxWorks-mpc8540 target # diff --git a/configure/os/CONFIG_SITE.Common.vxWorks-mpc8548 b/configure/os/CONFIG_SITE.Common.vxWorks-mpc8548 index da8671436..6f84ac0a8 100644 --- a/configure/os/CONFIG_SITE.Common.vxWorks-mpc8548 +++ b/configure/os/CONFIG_SITE.Common.vxWorks-mpc8548 @@ -1,4 +1,3 @@ -# $Revision-Id$ # # Site Specific definitions for the vxWorks-mpc8548 target # diff --git a/configure/os/CONFIG_SITE.Common.vxWorks-ppc603 b/configure/os/CONFIG_SITE.Common.vxWorks-ppc603 index 6a5d91fe0..aa59245c2 100644 --- a/configure/os/CONFIG_SITE.Common.vxWorks-ppc603 +++ b/configure/os/CONFIG_SITE.Common.vxWorks-ppc603 @@ -1,4 +1,3 @@ -# $Revision-Id$ # # Site Specific definitions for the vxWorks-ppc603 target # diff --git a/configure/os/CONFIG_SITE.Common.vxWorks-ppc603_long b/configure/os/CONFIG_SITE.Common.vxWorks-ppc603_long index 554647566..1e18ad1e9 100644 --- a/configure/os/CONFIG_SITE.Common.vxWorks-ppc603_long +++ b/configure/os/CONFIG_SITE.Common.vxWorks-ppc603_long @@ -1,4 +1,3 @@ -# $Revision-Id$ # # Site Specific definitions for the vxWorks-ppc603_long target # diff --git a/configure/os/CONFIG_SITE.Common.vxWorks-ppc604 b/configure/os/CONFIG_SITE.Common.vxWorks-ppc604 index c92b532ed..5b89bb342 100644 --- a/configure/os/CONFIG_SITE.Common.vxWorks-ppc604 +++ b/configure/os/CONFIG_SITE.Common.vxWorks-ppc604 @@ -1,4 +1,3 @@ -# $Revision-Id$ # # Site Specific definitions for the vxWorks-ppc604 target # diff --git a/configure/os/CONFIG_SITE.Common.vxWorks-ppc604_altivec b/configure/os/CONFIG_SITE.Common.vxWorks-ppc604_altivec index 437e4ddc9..6790a8955 100644 --- a/configure/os/CONFIG_SITE.Common.vxWorks-ppc604_altivec +++ b/configure/os/CONFIG_SITE.Common.vxWorks-ppc604_altivec @@ -1,4 +1,3 @@ -# $Revision-Id$ # # Site Specific definitions for the vxWorks-ppc604_altivec target # diff --git a/configure/os/CONFIG_SITE.Common.vxWorks-ppc604_long b/configure/os/CONFIG_SITE.Common.vxWorks-ppc604_long index be404fcfb..74a581b31 100644 --- a/configure/os/CONFIG_SITE.Common.vxWorks-ppc604_long +++ b/configure/os/CONFIG_SITE.Common.vxWorks-ppc604_long @@ -1,4 +1,3 @@ -# $Revision-Id$ # # Site Specific definitions for the vxWorks-ppc604_long target # diff --git a/configure/os/CONFIG_SITE.Common.win32-x86-mingw b/configure/os/CONFIG_SITE.Common.win32-x86-mingw index 39f219b19..ba19ac65a 100644 --- a/configure/os/CONFIG_SITE.Common.win32-x86-mingw +++ b/configure/os/CONFIG_SITE.Common.win32-x86-mingw @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.win32-x86-mingw # -# $Revision-Id$ -# # Site Specific definitions for win32-x86-mingw target # If readline is available uncomment the following line diff --git a/configure/os/CONFIG_SITE.Common.windows-x64-static b/configure/os/CONFIG_SITE.Common.windows-x64-static index 5da06c053..f2f059751 100644 --- a/configure/os/CONFIG_SITE.Common.windows-x64-static +++ b/configure/os/CONFIG_SITE.Common.windows-x64-static @@ -1,7 +1,5 @@ # CONFIG_SITE.Common.windows-x64-static # -# $Revision-Id$ -# # Site Specific definitions for windows-x64-static target # Only the local epics system manager should modify this file diff --git a/configure/os/CONFIG_SITE.cygwin-x86.Common b/configure/os/CONFIG_SITE.cygwin-x86.Common index d81e414ad..7d132051c 100644 --- a/configure/os/CONFIG_SITE.cygwin-x86.Common +++ b/configure/os/CONFIG_SITE.cygwin-x86.Common @@ -1,8 +1,5 @@ # CONFIG_SITE.cygwin-x86.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Site override definitions for cygwin-x86 host builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86 b/configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86 index 97e3cb1f3..3125c7a64 100644 --- a/configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86 +++ b/configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86 @@ -1,8 +1,5 @@ # CONFIG_SITE.cygwin-x86.cygwin-x86 # -# $Revision-Id$ -# This file is maintained by the build community. -# # Site override definitions for cygwin-x86 host - cygwin-x86 target builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.cygwin-x86.linux-arm b/configure/os/CONFIG_SITE.cygwin-x86.linux-arm index 7630864f8..75829c36d 100644 --- a/configure/os/CONFIG_SITE.cygwin-x86.linux-arm +++ b/configure/os/CONFIG_SITE.cygwin-x86.linux-arm @@ -1,7 +1,5 @@ # CONFIG_SITE.cygwin-x86.linux-arm # -# $Revision-Id$ -# # Site specific definitions for cygwin-x86 host - linux-arm target builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.cygwin-x86_64.linux-arm b/configure/os/CONFIG_SITE.cygwin-x86_64.linux-arm index bf48209cc..93ec7c878 100644 --- a/configure/os/CONFIG_SITE.cygwin-x86_64.linux-arm +++ b/configure/os/CONFIG_SITE.cygwin-x86_64.linux-arm @@ -1,7 +1,5 @@ # CONFIG_SITE.cygwin-x86_64.linux-arm # -# $Revision-Id$ -# # Site specific definitions for cygwin-x86_64 host - linux-arm target builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.darwin-ppc.Common b/configure/os/CONFIG_SITE.darwin-ppc.Common index b02dddc06..05417e1f9 100644 --- a/configure/os/CONFIG_SITE.darwin-ppc.Common +++ b/configure/os/CONFIG_SITE.darwin-ppc.Common @@ -1,7 +1,4 @@ # CONFIG_SITE.darwin-ppc.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Site override definitions for darwin-ppc host builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.darwin-ppcx86.Common b/configure/os/CONFIG_SITE.darwin-ppcx86.Common index 79330e215..42bd00531 100644 --- a/configure/os/CONFIG_SITE.darwin-ppcx86.Common +++ b/configure/os/CONFIG_SITE.darwin-ppcx86.Common @@ -1,7 +1,4 @@ # CONFIG_SITE.darwin-ppcx86.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Site override definitions for darwin-ppcx86 host builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.darwin-x86.Common b/configure/os/CONFIG_SITE.darwin-x86.Common index 53757afce..8a894104f 100644 --- a/configure/os/CONFIG_SITE.darwin-x86.Common +++ b/configure/os/CONFIG_SITE.darwin-x86.Common @@ -1,8 +1,5 @@ # CONFIG_SITE.darwin-x86.Common # -# This file is maintained by the build community. -# -# $Revision-Id$ # Site override definitions for darwin-x86 host builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.darwinCommon.darwinCommon b/configure/os/CONFIG_SITE.darwinCommon.darwinCommon index e1690ba09..297fd8e4f 100644 --- a/configure/os/CONFIG_SITE.darwinCommon.darwinCommon +++ b/configure/os/CONFIG_SITE.darwinCommon.darwinCommon @@ -1,20 +1,23 @@ # CONFIG_SITE.darwinCommon.darwinCommon # -# $Revision-Id$ -# This file is maintained by the build community. -# # Site specific definitions for darwin builds #------------------------------------------------------- -# Uncomment the following two definitions to enable the use of DarwinPorts packages. -# +# Note the dir/firstword/wildcard functions below are used +# to avoid warnings about missing directories. + +# Mix-and-match of different package systems is probably not advisable, +# but you can try that if you like... + +# Uncomment these definitions when using Homebrew packages: +#OP_SYS_INCLUDES += -I/usr/local/include +#OP_SYS_LDFLAGS += $(addprefix -L,$(dir $(firstword $(wildcard /usr/local/lib/*)))) + +# Uncomment these definitions when using DarwinPorts packages: #OP_SYS_INCLUDES += -I/opt/local/include -# dir/firstword/wildcard used to avoid warning -L: directory name (...) does not exist -#OP_SYS_LDFLAGS += $(addprefix -L,$(dir $(firstword $(wildcard /opt/local/lib/*)))) +#OP_SYS_LDFLAGS += $(addprefix -L,$(dir $(firstword $(wildcard /opt/local/lib/*)))) -# Uncomment the following two definitions to enable the use of Fink packages. -# +# Uncomment these definitions when using Fink packages: #OP_SYS_INCLUDES += -I/sw/include -# dir/firstword/wildcard used to avoid warning -L: directory name (...) does not exist -#OP_SYS_LDFLAGS += $(addprefix -L,$(dir $(firstword $(wildcard /sw/lib/*)))) +#OP_SYS_LDFLAGS += $(addprefix -L,$(dir $(firstword $(wildcard /sw/lib/*)))) diff --git a/configure/os/CONFIG_SITE.linux-arm-debug.linux-arm-debug b/configure/os/CONFIG_SITE.linux-arm-debug.linux-arm-debug index fc4a9f2a9..972f7d6c8 100644 --- a/configure/os/CONFIG_SITE.linux-arm-debug.linux-arm-debug +++ b/configure/os/CONFIG_SITE.linux-arm-debug.linux-arm-debug @@ -1,7 +1,5 @@ # CONFIG_SITE.linux-arm-debug.linux-arm-debug # -# $Revision-Id$ -# # Site specific overrides for linux-arm-debug host and target builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.linux-arm.linux-arm b/configure/os/CONFIG_SITE.linux-arm.linux-arm index a8cc0ff9f..a5e56eaa1 100644 --- a/configure/os/CONFIG_SITE.linux-arm.linux-arm +++ b/configure/os/CONFIG_SITE.linux-arm.linux-arm @@ -1,7 +1,5 @@ # CONFIG_SITE.linux-arm.linux-arm # -# $Revision-Id$ -# # Site specific definitions for native linux-arm builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.linux-x86-debug.linux-x86-debug b/configure/os/CONFIG_SITE.linux-x86-debug.linux-x86-debug index 7e6cd3768..b3fccda81 100644 --- a/configure/os/CONFIG_SITE.linux-x86-debug.linux-x86-debug +++ b/configure/os/CONFIG_SITE.linux-x86-debug.linux-x86-debug @@ -1,7 +1,5 @@ # CONFIG_SITE.linux-x86-debug.linux-x86-debug # -# $Revision-Id$ -# # Site specific overrides for linux-x86-debug host and target builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.linux-x86.Common b/configure/os/CONFIG_SITE.linux-x86.Common index f5a3e910b..dc29e8f0d 100644 --- a/configure/os/CONFIG_SITE.linux-x86.Common +++ b/configure/os/CONFIG_SITE.linux-x86.Common @@ -1,8 +1,5 @@ # CONFIG_SITE.linux-x86.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Site override definitions for linux-x86 host builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.linux-x86.UnixCommon b/configure/os/CONFIG_SITE.linux-x86.UnixCommon index c7c9b9c35..fcf81cb14 100644 --- a/configure/os/CONFIG_SITE.linux-x86.UnixCommon +++ b/configure/os/CONFIG_SITE.linux-x86.UnixCommon @@ -1,5 +1,4 @@ # -# $Revision-Id$ # # Site Specific Configuration Information # Only the local epics system manager should modify this file diff --git a/configure/os/CONFIG_SITE.linux-x86.linux-arm b/configure/os/CONFIG_SITE.linux-x86.linux-arm index 528c9bc6c..1500c4526 100644 --- a/configure/os/CONFIG_SITE.linux-x86.linux-arm +++ b/configure/os/CONFIG_SITE.linux-x86.linux-arm @@ -1,15 +1,14 @@ # CONFIG_SITE.linux-x86.linux-arm # -# $Revision-Id$ -# # Site specific definitions for linux-x86 host - linux-arm target builds #------------------------------------------------------- -# Tools install path -#GNU_DIR = /home/targetOS/linux-arm/host/x86-linux/gcc_3.3.3 +# Set GNU crosscompiler target name +GNU_TARGET = arm-xilinx-linux-gnueabi -# APS: +# Set GNU tools install path +# This is the install path at APS: GNU_DIR = /usr/local/vw/zynq-2011.09 -# GNU crosscompiler target name -GNU_TARGET = arm-xilinx-linux-gnueabi +# With a Xilinx SDK, it'll be something like +#GNU_DIR = /usr/local/zynq/Xilinx/SDK/2015.4/gnu/arm/lin diff --git a/configure/os/CONFIG_SITE.linux-x86.linux-arm-debug b/configure/os/CONFIG_SITE.linux-x86.linux-arm-debug index 461c44290..57aff03b7 100644 --- a/configure/os/CONFIG_SITE.linux-x86.linux-arm-debug +++ b/configure/os/CONFIG_SITE.linux-x86.linux-arm-debug @@ -1,7 +1,5 @@ # CONFIG_SITE.linux-x86.linux-arm-debug # -# $Revision-Id$ -# # Site specific settings for linux-x86 host - linux-arm-debug target builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.linux-x86.linux-arm_eb b/configure/os/CONFIG_SITE.linux-x86.linux-arm_eb index 18309ae7f..0bc2a4e5a 100644 --- a/configure/os/CONFIG_SITE.linux-x86.linux-arm_eb +++ b/configure/os/CONFIG_SITE.linux-x86.linux-arm_eb @@ -1,7 +1,5 @@ # CONFIG_SITE.linux-x86.linux-arm_eb # -# $Revision-Id$ -# # Site specific definitions for linux-x86 host - linux-arm_eb target builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.linux-x86.linux-arm_el b/configure/os/CONFIG_SITE.linux-x86.linux-arm_el index 3195c0c5b..b82bc13bf 100644 --- a/configure/os/CONFIG_SITE.linux-x86.linux-arm_el +++ b/configure/os/CONFIG_SITE.linux-x86.linux-arm_el @@ -1,7 +1,5 @@ # CONFIG_SITE.linux-x86.linux-arm_el # -# $Revision-Id$ -# # Site specific definitions for linux-x86 host - linux-arm_el target builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.linux-x86.linux-x86 b/configure/os/CONFIG_SITE.linux-x86.linux-x86 index b7090cf6b..d359d174f 100644 --- a/configure/os/CONFIG_SITE.linux-x86.linux-x86 +++ b/configure/os/CONFIG_SITE.linux-x86.linux-x86 @@ -1,7 +1,5 @@ # CONFIG_SITE.linux-x86.linux-x86 # -# $Revision-Id$ -# # Site specific definitions for linux-x86 host - linux-x86 target builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.linux-x86.solaris-sparc b/configure/os/CONFIG_SITE.linux-x86.solaris-sparc index 7bd401330..156c748bd 100644 --- a/configure/os/CONFIG_SITE.linux-x86.solaris-sparc +++ b/configure/os/CONFIG_SITE.linux-x86.solaris-sparc @@ -1,8 +1,5 @@ # CONFIG_SITE.linux-x86.solaris-sparc # -# $Revision-Id$ -# This file is maintained by the build community. -# # Site specific definitions for linux-x86 host - solaris-sparc target builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.linux-x86.vxWorks-68040 b/configure/os/CONFIG_SITE.linux-x86.vxWorks-68040 index 95ff59130..4515d8b4c 100644 --- a/configure/os/CONFIG_SITE.linux-x86.vxWorks-68040 +++ b/configure/os/CONFIG_SITE.linux-x86.vxWorks-68040 @@ -1,7 +1,5 @@ # CONFIG_SITE.linux-x86.vxWorks-68040 # -# $Revision-Id$ -# # Site specific definitions for linux-x86 host - vxWorks-68040 target builds # Only the local epics system manager should modify this file #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.linux-x86.vxWorks-ppc603 b/configure/os/CONFIG_SITE.linux-x86.vxWorks-ppc603 index 5c68d52eb..de1f98c35 100644 --- a/configure/os/CONFIG_SITE.linux-x86.vxWorks-ppc603 +++ b/configure/os/CONFIG_SITE.linux-x86.vxWorks-ppc603 @@ -1,4 +1,3 @@ -# $Revision-Id$ # # Site-specific definitions for linux-x86 builds of vxWorks-ppc603 # diff --git a/configure/os/CONFIG_SITE.linux-x86.vxWorks-ppc603_long b/configure/os/CONFIG_SITE.linux-x86.vxWorks-ppc603_long index 9109e98d1..4cc5c6e81 100644 --- a/configure/os/CONFIG_SITE.linux-x86.vxWorks-ppc603_long +++ b/configure/os/CONFIG_SITE.linux-x86.vxWorks-ppc603_long @@ -1,4 +1,3 @@ -# $Revision-Id$ # # Site-specific definitions for linux-x86 builds of vxWorks-ppc603_long # diff --git a/configure/os/CONFIG_SITE.linux-x86.vxWorksCommon b/configure/os/CONFIG_SITE.linux-x86.vxWorksCommon index 3fce09ec5..4c7d044f5 100644 --- a/configure/os/CONFIG_SITE.linux-x86.vxWorksCommon +++ b/configure/os/CONFIG_SITE.linux-x86.vxWorksCommon @@ -1,6 +1,5 @@ # CONFIG_SITE.linux-x86.vxWorksCommon # -# $Revision-Id$ # This file is maintained by the build community. # # Definitions for linux-x86 host - vxWorks target builds diff --git a/configure/os/CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug b/configure/os/CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug index 3685bc811..8ff68471a 100644 --- a/configure/os/CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug +++ b/configure/os/CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug @@ -1,7 +1,5 @@ # CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug # -# $Revision-Id$ -# # Site specific overrides for linux-x86_64 host and target builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.linux-x86_64.Common b/configure/os/CONFIG_SITE.linux-x86_64.Common index 3604f4d90..244e163b4 100644 --- a/configure/os/CONFIG_SITE.linux-x86_64.Common +++ b/configure/os/CONFIG_SITE.linux-x86_64.Common @@ -1,8 +1,5 @@ # CONFIG_SITE.linux-x86_64.Common # -# $Revision-Id$ -# This file is maintained by the build community. -# # Site override definitions for linux-x86_64 host builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.linux-x86_64.UnixCommon b/configure/os/CONFIG_SITE.linux-x86_64.UnixCommon index 811e698ae..fa67bd3b8 100644 --- a/configure/os/CONFIG_SITE.linux-x86_64.UnixCommon +++ b/configure/os/CONFIG_SITE.linux-x86_64.UnixCommon @@ -1,6 +1,4 @@ # CONFIG_SITE.linux-x86_64.UnixCommon -$ -# $Revision-Id$ # # Site Specific configure override definitions # Only the local epics system manager should modify this file diff --git a/configure/os/CONFIG_SITE.linux-x86_64.linux-arm b/configure/os/CONFIG_SITE.linux-x86_64.linux-arm index 95d64e108..9fcf3452a 100644 --- a/configure/os/CONFIG_SITE.linux-x86_64.linux-arm +++ b/configure/os/CONFIG_SITE.linux-x86_64.linux-arm @@ -1,7 +1,5 @@ # CONFIG_SITE.linux-x86_64.linux-arm # -# $Revision-Id$ -# # Site specific settings for linux-x86_64 host - linux-arm target builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.linux-x86_64.linux-arm-debug b/configure/os/CONFIG_SITE.linux-x86_64.linux-arm-debug index 98e644671..4f1e89a1b 100644 --- a/configure/os/CONFIG_SITE.linux-x86_64.linux-arm-debug +++ b/configure/os/CONFIG_SITE.linux-x86_64.linux-arm-debug @@ -1,7 +1,5 @@ # CONFIG_SITE.linux-x86_64.linux-arm-debug # -# $Revision-Id$ -# # Site specific settings for linux-x86_64 host - linux-arm-debug target builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64 b/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64 index 8fccd7612..7a19d0dfe 100644 --- a/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64 +++ b/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64 @@ -1,7 +1,5 @@ # CONFIG_SITE.linux-x86_64.linux-x86_64 # -# $Revision-Id$ -# # Site specific definitions for linux-x86_64 host - linux-x86_64 target builds #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.linux-x86_64.vxWorks-68040 b/configure/os/CONFIG_SITE.linux-x86_64.vxWorks-68040 index 4773d8d2b..63ca76f2d 100644 --- a/configure/os/CONFIG_SITE.linux-x86_64.vxWorks-68040 +++ b/configure/os/CONFIG_SITE.linux-x86_64.vxWorks-68040 @@ -1,7 +1,5 @@ # CONFIG_SITE.linux-x86_64.vxWorks-68040 # -# $Revision-Id$ -# # Site specific definitions for linux-x86_64 host - vxWorks-68040 target builds # Only the local epics system manager should modify this file #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.linux-x86_64.vxWorks-ppc603 b/configure/os/CONFIG_SITE.linux-x86_64.vxWorks-ppc603 index cc05608cf..dfcc96f42 100644 --- a/configure/os/CONFIG_SITE.linux-x86_64.vxWorks-ppc603 +++ b/configure/os/CONFIG_SITE.linux-x86_64.vxWorks-ppc603 @@ -1,4 +1,3 @@ -# $Revision-Id$ # # Site-specific definitions for linux-x86_64 builds of vxWorks-ppc603 # diff --git a/configure/os/CONFIG_SITE.linux-x86_64.vxWorks-ppc603_long b/configure/os/CONFIG_SITE.linux-x86_64.vxWorks-ppc603_long index 2346ece4e..729bb80d4 100644 --- a/configure/os/CONFIG_SITE.linux-x86_64.vxWorks-ppc603_long +++ b/configure/os/CONFIG_SITE.linux-x86_64.vxWorks-ppc603_long @@ -1,4 +1,3 @@ -# $Revision-Id$ # # Site-specific definitions for linux-x86 builds of vxWorks-ppc603_long # diff --git a/configure/os/CONFIG_SITE.solaris-sparc.Common b/configure/os/CONFIG_SITE.solaris-sparc.Common index a7398dbcf..eaa42044c 100644 --- a/configure/os/CONFIG_SITE.solaris-sparc.Common +++ b/configure/os/CONFIG_SITE.solaris-sparc.Common @@ -1,7 +1,5 @@ # CONFIG_SITE.solaris-sparc.Common # -# $Revision-Id$ -# # Site specific override definitions for solaris-sparc host builds # Only the local epics system manager should modify this file diff --git a/configure/os/CONFIG_SITE.win32-x86-mingw.win32-x86-mingw b/configure/os/CONFIG_SITE.win32-x86-mingw.win32-x86-mingw index 9022b8e2b..1f0e83d61 100644 --- a/configure/os/CONFIG_SITE.win32-x86-mingw.win32-x86-mingw +++ b/configure/os/CONFIG_SITE.win32-x86-mingw.win32-x86-mingw @@ -1,7 +1,5 @@ # CONFIG_SITE.win32-x86-mingw.win32-x86-mingw # -# $Revision-Id$ -# # Site Specific definitions for win32-x86-mingw target # The MinGW bin directory must be in your path. diff --git a/configure/os/CONFIG_SITE.win32-x86.Common b/configure/os/CONFIG_SITE.win32-x86.Common index 9bcd14d2d..9141333d0 100644 --- a/configure/os/CONFIG_SITE.win32-x86.Common +++ b/configure/os/CONFIG_SITE.win32-x86.Common @@ -1,7 +1,5 @@ # CONFIG_SITE.win32-x86.Common # -# $Revision-Id$ -# # Site specific definitions for win32-x86 host # Only the local epics system manager should modify this file diff --git a/configure/os/CONFIG_SITE.win32-x86.win32-x86 b/configure/os/CONFIG_SITE.win32-x86.win32-x86 deleted file mode 100644 index 84f6870b8..000000000 --- a/configure/os/CONFIG_SITE.win32-x86.win32-x86 +++ /dev/null @@ -1,17 +0,0 @@ -# $Revision-Id$ - -# If you have Visual C++ 6.0, uncomment the following override lines -# This will to eliminate warnings about unknown options /GL, /LTCG, and /w44355. -#OPT_CFLAGS_YES = /Ox -#OPT_CXXFLAGS_YES = /Ox -#OPT_CFLAGS_NO = /Zi -#OPT_CXXFLAGS_NO = /Zi -#LINK_OPT_FLAGS_YES = /incremental:no /opt:ref /release $(PROD_VERSION:%=/version:%) -#WARN_CFLAGS_YES = /W3 -#WARN_CXXFLAGS_YES = /W3 - - -# If you have Visual C++ 8.0 or 8.0 express, uncomment the following override. -# This will eliminate warnings about /GX being deprecated. -#CCC = cl /nologo /EHsc /GR - diff --git a/configure/os/CONFIG_SITE.windows-x64-mingw.windows-x64-mingw b/configure/os/CONFIG_SITE.windows-x64-mingw.windows-x64-mingw index bdb8c995e..63b559769 100644 --- a/configure/os/CONFIG_SITE.windows-x64-mingw.windows-x64-mingw +++ b/configure/os/CONFIG_SITE.windows-x64-mingw.windows-x64-mingw @@ -1,7 +1,5 @@ # CONFIG_SITE.windows-x64-mingw.windows-x64-mingw # -# $Revision-Id$ -# # Site Specific definitions for windows-x64-mingw target # Only the local epics system manager should modify this file diff --git a/documentation/README.darwin.html b/documentation/README.darwin.html index 68e86171b..cbc290178 100644 --- a/documentation/README.darwin.html +++ b/documentation/README.darwin.html @@ -179,8 +179,6 @@ runAppleScript(const char *format, ...) [pool release]; return ret; } -
-

-$Revision-Id$
+
diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html index 635198704..4a4804672 100644 --- a/documentation/RELEASE_NOTES.html +++ b/documentation/RELEASE_NOTES.html @@ -11,7 +11,7 @@

This version of EPICS Base has not been released yet.

-

Changes made on the 3.16 branch since 3.15.3

+

Changes made on the 3.16 branch since 3.16.0.1

+ + +

Changes from the 3.14 branch since 3.15.4

+ + +

General Time updates

+ +

The iocInit code now performs a sanity check of the current time +returned by the generalTime subsystem and will print a warning if the wall-clock +time returned has not been initialized yet. This is just a warning message; when +a time provider does synchonize the IOC will subsequently pick up and use the +correct time. This check code also primes the registered event system provider +if there is one so the epicsTimeGetEventInt() routine will work on IOCs +that ask for event time within an interrupt service routine.

+ +

The osiClockTime provider's synchronization thread (which is only used on +some embedded targets) will now poll the other time providers at 1Hz until the +first time it manages to get a successful timestamp, after which it will poll +for updates every 60 seconds as before.

+ +

The routine generalTimeGetExceptPriority() was designed for use by +backup (lower priority) time providers like the osiClockTime provider which do +not have their own absolute time reference and rely on other providers for an +absolute time source. This routine no longer implements the ratchet mechanism +that prevented the time it returned from going backwards. If the backup clock's +tick-timer runs fast the synchronization of the backup time provider would never +allow it to be corrected backwards when the ratchet was in place. The regular +epicsTimeGetCurrent() API still uses the ratchet mechanism, so this +change will not cause the IOC to see time going backwards.

+ +

Microsoft Visual Studio builds

+ +

The build configuration files for builds using the Microsoft compilers have +been updated, although there should be no noticable difference at most sites. +One extra compiler warning is now being suppressed for C++ code, C4344: +behavior change: use of explicit template arguments results in ... which is +gratuitous and was appearing frequently in builds of the EPICS V4 modules.

+ +

Cross-builds of the windows-x64 target from a win32-x86 host have been +removed as they don't actually work within the context of a single make +run. Significant changes to the build configuration files would be necessary for +these kinds of cross-builds to work properly, which could be done if someone +needs them (email Andrew Johnson before working on this, and see + +this stack-overflow answer for a starting point).

+ +

Bazaar keywords such as 'Revision-Id' removed

+ +

In preparation for moving to git in place of the Bazaar revision control +system we have removed all the keywords from the Base source code.

+ +

Linux systemd service file for CA Repeater

+ +

Building this version of Base on a Linux system creates a systemd service +file suitable for starting the Channel Access Repeater under systemd. The file +will be installed into the target bin directory, from where it can be copied +into the appropriate systemd location and modified as necessary. Installation +instructions are included as comments in the file.

+ + +

Changes made between 3.15.3 and 3.15.4

+ +

New string input device support "getenv"

+ +

A new "getenv" device support for both the stringin and lsi (long string +input) record types can be used to read the value of an environment variable +from the IOC at runtime. See base/db/softIocExit.db for sample usage.

+ +

Build rules and DELAY_INSTALL_LIBS

+ +

A new order-only prerequisite build rule has been added to ensure that +library files (and DLL stubs on Windows) get installed before linking any +executables, which resolves parallel build problems on high-powered CPUs. There +are some (rare) cases though where a Makefile has to build an executable and run +it to be able to compile code for a library built by the same Makefile. With +this new build rule GNUmake will complain about a circular dependency and the +build will probably fail in those cases. To avoid this problem the failing +Makefile should set DELAY_INSTALL_LIBS = YES before including the +$(TOP)/configure/RULES file, disabling the new build rule.

+ +

IOC environment variables and build parameters

+ +

The IOC now sets a number of environment variables at startup that provide +the version of EPICS Base it was built against (EPICS_VERSION_...) and its build +architecture (ARCH). In some cases this allows a single iocBoot/ioc directory to +be used to run the same IOC on several different architectures without any +changes.

+ +

There are also 3 new environment parameters (EPICS_BUILD_...) available that +C/C++ code can use to find out the target architecture, OS class and compiler +class it was built with. These may be useful when writing interfaces to other +languages.

+ +

New implementation of promptgroup/gui_group field property

+ +

The mechanism behind the "promptgroup()" field property inside a record type +definition has been changed. Instead of using a fixed set of choices, +the static database access library now collects the used gui group names +while parsing DBD information. Group names should start with a two-digit number +plus space-dash-space to allow proper sorting of groups.

+ +

The include file guigroup.h that defined the fixed set of choices +has been deprecated. Instead, use the conversion functions between index number +and group string that have been added to dbStaticLib.

+ +

When a DBD file containing record-type descriptions is expanded, any +old-style GUI_xxx group names will be replaced by a new-style +string for use by the IOC. This permits an older record type to be used with +the 3.15.4 release, although eventually record types should be converted by +hand with better group names used.

CA server configuration changes

@@ -194,7 +305,76 @@ dbQuietMacroWarnings=1 VxWorks 541119.

-

Changes pulled from the 3.14 branch since 3.15.3

+

Changes from the 3.14 branch between 3.15.3 and 3.15.4

+ +

NTP Time Provider adjusts to OS tick rate changes

+ +

Dirk Zimoch provided code that allows the NTP Time provider (used on VxWorks +and RTEMS only) to adapt to changes in the OS clock tick rate after the provider +has been initialized. Note that changing the tick rate after iocInit() is not +advisable, and that other software might still misbehave if initialized before +an OS tick rate change. This change was back-ported from the 3.15 branch.

+ +

Making IOC ca_get operations atomic

+ +

When a CA client gets data from an IOC record using a compound data type such +as DBR_TIME_DOUBLE the value field is fetched from the database in a +separate call than the other metadata, without keeping the record locked. This +allows some other thread such as a periodic scan thread a chance to interrupt +the get operation and process the record in between. CA monitors have always +been atomic as long as the value data isn't a string or an array, but this race +condition in the CA get path has now been fixed so the record will stay locked +between the two fetch operations.

+ +

This fixes +Launchpad bug #1581212, thanks to Till Strauman and Dehong Zhang.

+ +

New CONFIG_SITE variable for running self-tests

+ +

The 'make runtests' and 'make tapfiles' build targets normally only run the +self-tests for the main EPICS_HOST_ARCH architecture. If the host is +able to execute self-test programs for other target architectures that are being +built by the host, such as when building a -debug version of the host +architecture for example, the names of those other architectures can be added to +the new CROSS_COMPILER_RUNTEST_ARCHS variable in either the +configure/CONFIG_SITE file or in an appropriate +configure/os/CONFIG_SITE.<host>.Common file to have the test +programs for those targets be run as well.

+ +

Additional RELEASE file checks

+ +

An additional check has been added at build-time for the contents of the +configure/RELEASE file(s), which will mostly only affect users of the Debian +EPICS packages published by NSLS-2. Support modules may share an install path, +but all such modules must be listed adjacent to each other in any RELEASE files +that point to them. For example the following will fail the new checks:

+ +
+AUTOSAVE = /usr/lib/epics
+ASYN = /home/mdavidsaver/asyn
+EPICS_BASE = /usr/lib/epics
+
+ +

giving the compile-time error

+ +
+This application's RELEASE file(s) define
+	EPICS_BASE = /usr/lib/epics
+after but not adjacent to
+	AUTOSAVE = /usr/lib/epics
+Module definitions that share paths must be grouped together.
+Either remove a definition, or move it to a line immediately
+above or below the other(s).
+Any non-module definitions belong in configure/CONFIG_SITE.
+
+ + +

In many cases such as the one above the order of the AUTOSAVE and +ASYN lines can be swapped to let the checks pass, but if the +AUTOSAVE module depended on ASYN and hence had to appear +before it in the list this error indicates that AUTOSAVE should also be +built in its own private area; a shared copy would likely be incompatible with +the version of ASYN built in the home directory.

String field buffer overflows

diff --git a/documentation/ReleaseChecklist.html b/documentation/ReleaseChecklist.html index 62b1b9d0e..0a2cdab5f 100644 --- a/documentation/ReleaseChecklist.html +++ b/documentation/ReleaseChecklist.html @@ -32,12 +32,6 @@

EPICS Base Release Procedures & Checklist

-
-

$Date$
- $Authors$
- $Revision-Id$

-
-

This document describes the procedures and provides a checklist of tasks that should be performed when creating production releases of EPICS Base.

diff --git a/src/Makefile b/src/Makefile index 74dfc172a..257099840 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,9 +6,6 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in the file LICENSE that is included with this distribution. #************************************************************************* -# -# $Revision-Id$ -# TOP = .. include $(TOP)/configure/CONFIG diff --git a/src/ca/client/CAref.html b/src/ca/client/CAref.html index 56b5a5c01..87ad469a6 100644 --- a/src/ca/client/CAref.html +++ b/src/ca/client/CAref.html @@ -51,8 +51,6 @@ width="88"> Valid HTML 4.01!

-

Modified on -$Date$

Table of Contents

diff --git a/src/ca/client/Makefile b/src/ca/client/Makefile index b6881f473..358552b46 100644 --- a/src/ca/client/Makefile +++ b/src/ca/client/Makefile @@ -99,8 +99,12 @@ caConnTest_SRCS = caConnTestMain.cpp caConnTest.cpp casw_SYS_LIBS_solaris = socket -SCRIPTS_solaris := S99caRepeater -SCRIPTS_Linux := S99caRepeater +SCRIPTS_HOST = S99caRepeater +SCRIPTS_Linux = caRepeater.service + +EXPAND += S99caRepeater@ +EXPAND += caRepeater.service@ +EXPAND_VARS = INSTALL_BIN=$(abspath $(INSTALL_BIN)) SRC_DIRS += $(TOP)/src/ca/client/test PROD_HOST += ca_test @@ -111,6 +115,3 @@ ca_test_SYS_LIBS_WIN32 = ws2_32 advapi32 user32 OBJS_vxWorks += ca_test include $(TOP)/configure/RULES - -S99%: ../rc2.% - sed -e s%:INSTALL_BIN:%`cd $(INSTALL_BIN); pwd`% $< >$@ diff --git a/src/ca/client/rc2.caRepeater b/src/ca/client/S99caRepeater@ similarity index 96% rename from src/ca/client/rc2.caRepeater rename to src/ca/client/S99caRepeater@ index 4db37b49a..aabefb72c 100644 --- a/src/ca/client/rc2.caRepeater +++ b/src/ca/client/S99caRepeater@ @@ -3,7 +3,7 @@ # System-V init script for the EPICS CA Repeater. # -INSTALL_BIN=:INSTALL_BIN: +INSTALL_BIN=@INSTALL_BIN@ # To change the default values for the EPICS environment parameters, # uncomment and modify the relevant lines below. These are the only diff --git a/src/ca/client/caRepeater.service@ b/src/ca/client/caRepeater.service@ new file mode 100644 index 000000000..ee50305a1 --- /dev/null +++ b/src/ca/client/caRepeater.service@ @@ -0,0 +1,25 @@ +# +# Linux systemd service file for the EPICS CA Repeater +# +# To install this file, as root: +# cp caRepeater.service /etc/systemd/system +# chmod 664 /etc/systemd/system/caRepeater.service +# systemctl daemon-reload +# systemctl enable caRepeater +# systemctl start caRepeater +# +# To check the status: +# systemctl status caRepeater + +[Unit] +Description=EPICS CA Repeater +Requires=network.target +After=network.target + +[Service] +ExecStart=@INSTALL_BIN@/caRepeater +Restart=always +User=daemon + +[Install] +WantedBy=multi-user.target diff --git a/src/ca/client/cac.cpp b/src/ca/client/cac.cpp index 9d23cce62..d66cf9dad 100644 --- a/src/ca/client/cac.cpp +++ b/src/ca/client/cac.cpp @@ -333,6 +333,12 @@ cac::~cac () this->ipToAEngine.release (); + // clean-up the list of un-notified msg objects + while ( msgForMultiplyDefinedPV * msg = this->msgMultiPVList.get() ) { + msg->~msgForMultiplyDefinedPV (); + this->mdpvFreeList.release ( msg ); + } + errlogFlush (); osiSockRelease (); @@ -606,6 +612,8 @@ void cac::transferChanToVirtCircuit ( msgForMultiplyDefinedPV * pMsg = new ( this->mdpvFreeList ) msgForMultiplyDefinedPV ( this->ipToAEngine, *this, pChan->pName ( guard ), acc ); + // cac keeps a list of these objects for proper clean-up in ~cac + this->msgMultiPVList.add ( *pMsg ); // It is possible for the ioInitiate call below to // call the callback directly if queue quota is exceeded. // This callback takes the callback lock and therefore we @@ -1297,6 +1305,8 @@ void cac::pvMultiplyDefinedNotify ( msgForMultiplyDefinedPV & mfmdpv, epicsGuard < epicsMutex > guard ( this->mutex ); this->exception ( mgr.cbGuard, guard, ECA_DBLCHNL, buf, __FILE__, __LINE__ ); } + // remove from the list and delete msg object + this->msgMultiPVList.remove ( mfmdpv ); mfmdpv.~msgForMultiplyDefinedPV (); this->mdpvFreeList.release ( & mfmdpv ); } diff --git a/src/ca/client/cac.h b/src/ca/client/cac.h index 9f9d45a65..99c3d3d27 100644 --- a/src/ca/client/cac.h +++ b/src/ca/client/cac.h @@ -237,6 +237,7 @@ private: resTable < tcpiiu, caServerID > serverTable; tsDLList < tcpiiu > circuitList; tsDLList < SearchDest > searchDestList; + tsDLList < msgForMultiplyDefinedPV > msgMultiPVList; tsFreeList < class tcpiiu, 32, epicsMutexNOOP > freeListVirtualCircuit; diff --git a/src/ca/client/msgForMultiplyDefinedPV.cpp b/src/ca/client/msgForMultiplyDefinedPV.cpp index 2f1a45cde..7002dd4b9 100644 --- a/src/ca/client/msgForMultiplyDefinedPV.cpp +++ b/src/ca/client/msgForMultiplyDefinedPV.cpp @@ -55,8 +55,10 @@ msgForMultiplyDefinedPV::~msgForMultiplyDefinedPV () void msgForMultiplyDefinedPV::transactionComplete ( const char * pHostNameRej ) { + // calls into cac for the notification + // the msg object (= this) is being deleted as part of the notification this->cb.pvMultiplyDefinedNotify ( *this, this->channel, this->acc, pHostNameRej ); - // !! dont touch this pointer after this point because object has been deleted !! + // !! dont touch 'this' pointer after this point because object has been deleted !! } void * msgForMultiplyDefinedPV::operator new ( size_t size, diff --git a/src/ca/client/msgForMultiplyDefinedPV.h b/src/ca/client/msgForMultiplyDefinedPV.h index 45d3453ac..3f1e771c0 100644 --- a/src/ca/client/msgForMultiplyDefinedPV.h +++ b/src/ca/client/msgForMultiplyDefinedPV.h @@ -33,6 +33,7 @@ #include "ipAddrToAsciiAsynchronous.h" #include "tsFreeList.h" +#include "tsDLList.h" #include "compilerDependencies.h" #ifdef msgForMultiplyDefinedPVh_epicsExportSharedSymbols @@ -47,7 +48,9 @@ public: const char * pAcc, const char * pRej ) = 0; }; -class msgForMultiplyDefinedPV : public ipAddrToAsciiCallBack { +class msgForMultiplyDefinedPV : + public ipAddrToAsciiCallBack, + public tsDLNode < msgForMultiplyDefinedPV > { public: msgForMultiplyDefinedPV ( ipAddrToAsciiEngine & engine, callbackForMultiplyDefinedPV &, const char * pChannelName, @@ -62,8 +65,8 @@ private: ipAddrToAsciiTransaction & dnsTransaction; callbackForMultiplyDefinedPV & cb; void transactionComplete ( const char * pHostName ); - msgForMultiplyDefinedPV ( const msgForMultiplyDefinedPV & ); - msgForMultiplyDefinedPV & operator = ( const msgForMultiplyDefinedPV & ); + msgForMultiplyDefinedPV ( const msgForMultiplyDefinedPV & ); + msgForMultiplyDefinedPV & operator = ( const msgForMultiplyDefinedPV & ); void operator delete ( void * ); }; diff --git a/src/ca/client/perl/Cap5.xs b/src/ca/client/perl/Cap5.xs index 287c1826c..e519198ec 100644 --- a/src/ca/client/perl/Cap5.xs +++ b/src/ca/client/perl/Cap5.xs @@ -1138,6 +1138,20 @@ void CA_add_exception_event(const char *class, SV *sub) { static SV * printf_sub = NULL; +#ifndef va_copy +# ifdef __GNUC__ +# define va_copy(d, s) __va_copy(d, s) +# else +# define va_copy(d, s) ((d) = (s)) +/* The above macro is NOT PORTABLE but works on Windows when + * stdarg.h doesn't provide va_copy(). Some architectures need + * define va_copy(d, s) ((*d) = (*s)) + * while others may be even more complicated, but hopefully the + * system stdarg.h header defines va_copy() in those cases. + */ +# endif +#endif + static int printf_handler(const char *format, va_list args) { if (! printf_sub) @@ -1152,11 +1166,7 @@ int printf_handler(const char *format, va_list args) { ENTER; SAVETMPS; -#ifdef __GNUC__ - __va_copy(argcopy, args); -#else va_copy(argcopy, args); -#endif printf_str = NEWSV(0, strlen(format) + 32); sv_vsetpvf(printf_str, format, &argcopy); diff --git a/src/ca/client/perl/Makefile b/src/ca/client/perl/Makefile index bac6e347a..fb0fc96ff 100644 --- a/src/ca/client/perl/Makefile +++ b/src/ca/client/perl/Makefile @@ -20,10 +20,19 @@ ifeq ($(OS_CLASS),Darwin) LOADABLE_SHRLIB_SUFFIX = .$(shell $(PERL) ../perlConfig.pl dlext) endif -PERL_VERSION = $(shell $(PERL) ../perlConfig.pl version) -PERL_ARCHNAME = $(shell $(PERL) ../perlConfig.pl archname) -PERL_ARCHPATH = $(PERL_VERSION)/$(PERL_ARCHNAME) +ifdef T_A + PERL_VERSION = $(shell $(PERL) ../perlConfig.pl version) + PERL_ARCHNAME = $(shell $(PERL) ../perlConfig.pl archname) + PERL_ARCHPATH := $(PERL_VERSION)/$(PERL_ARCHNAME) + EXTUTILS := $(shell $(PERL) ../perlConfig.pl privlib)/ExtUtils + PERLBIN := $(shell $(PERL) ../perlConfig.pl bin) + XSUBPP := $(firstword $(wildcard $(PERLBIN)/xsubpp $(EXTUTILS)/xsubpp)) + +ifeq ($(strip $(XSUBPP)),) + $(warning Perl's xsubpp program was not found.) + $(warning The Perl CA module will not be built.) +else ifeq ($(T_A),$(EPICS_HOST_ARCH)) # No cross-builds (wrong Perl!) ifeq ($(findstring $(OS_CLASS),WIN32 cygwin32),) # Doesn't build on WIN32 LOADABLE_LIBRARY_HOST = Cap5 @@ -41,6 +50,8 @@ ifeq ($(findstring $(OS_CLASS),WIN32 cygwin32),) # Doesn't build on WIN32 HTMLS = CA.html endif endif +endif +endif Cap5_SRCS = Cap5.xs Cap5_LIBS = ca Com @@ -52,10 +63,6 @@ CLEANS += Cap5.c pod2htmd.tmp pod2htmi.tmp include $(TOP)/configure/RULES ifdef T_A - EXTUTILS = $(shell $(PERL) ../perlConfig.pl privlib)/ExtUtils - PERLBIN = $(shell $(PERL) ../perlConfig.pl bin) - XSUBPP = $(firstword $(wildcard $(PERLBIN)/xsubpp $(EXTUTILS)/xsubpp)) - %.c: ../%.xs $(RM) $@ $@_new $(PERL) $(XSUBPP) -typemap $(EXTUTILS)/typemap $< > $@_new && $(MV) $@_new $@ diff --git a/src/ca/client/perl/perlConfig.pl b/src/ca/client/perl/perlConfig.pl index 01b9b9fdd..5292041d1 100644 --- a/src/ca/client/perl/perlConfig.pl +++ b/src/ca/client/perl/perlConfig.pl @@ -3,7 +3,13 @@ # This script is used to extract information about the Perl build # configuration, so the EPICS build system uses the same settings. +use strict; use Config; my $arg = shift; -print $Config{$arg}; +my $val = $Config{$arg}; + +$val =~ s{\\}{/}go + if $^O eq 'MSWin32'; + +print $val; diff --git a/src/ca/client/test/ca_test.c b/src/ca/client/test/ca_test.c index f4954797f..998536843 100644 --- a/src/ca/client/test/ca_test.c +++ b/src/ca/client/test/ca_test.c @@ -7,12 +7,9 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* @(#)ca_test.c $Revision-Id$ +/* * Author: Jeff Hill * Date: 07-01-91 - * - * make options - * -DvxWorks makes a version for VxWorks */ /* diff --git a/src/ca/client/test/ca_test.h b/src/ca/client/test/ca_test.h index f14fea600..076f8936a 100644 --- a/src/ca/client/test/ca_test.h +++ b/src/ca/client/test/ca_test.h @@ -7,7 +7,7 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* @(#)ca_test.k $Revision-Id$ +/* * Author: Jeff Hill * Date: 21JAN2000 */ diff --git a/src/ca/client/test/ca_test_main.c b/src/ca/client/test/ca_test_main.c index ae41f40ef..85fd7ea19 100644 --- a/src/ca/client/test/ca_test_main.c +++ b/src/ca/client/test/ca_test_main.c @@ -7,7 +7,7 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* @(#)ca_test_main.c $Revision-Id$ +/* * Author: Jeff Hill * Date: 21JAN2000 */ diff --git a/src/ca/client/tools/caput.c b/src/ca/client/tools/caput.c index fbd4ef79e..f6dcc21cd 100644 --- a/src/ca/client/tools/caput.c +++ b/src/ca/client/tools/caput.c @@ -492,14 +492,13 @@ int main (int argc, char *argv[]) } else { /* Not an ENUM */ if (charArrAsStr) { - count = len; dbrType = DBR_CHAR; - ebuf = calloc(strlen(cbuf)+1, sizeof(char)); + ebuf = calloc(len, sizeof(char)); if(!ebuf) { fprintf(stderr, "Memory allocation failed\n"); return 1; } - epicsStrnRawFromEscaped(ebuf, strlen(cbuf)+1, cbuf, strlen(cbuf)); + count = epicsStrnRawFromEscaped(ebuf, len, cbuf, len-1) + 1; } else { for (i = 0; i < count; ++i) { epicsStrnRawFromEscaped(sbuf[i], sizeof(EpicsStr), *(argv+optind+i), sizeof(EpicsStr)); diff --git a/src/ca/legacy/gdd/Makefile b/src/ca/legacy/gdd/Makefile index b1e8fceaa..9c5638eb4 100644 --- a/src/ca/legacy/gdd/Makefile +++ b/src/ca/legacy/gdd/Makefile @@ -69,6 +69,11 @@ CLEANS += $(COMMON_DIR)/aitConvertGenerated.cc USR_CXXFLAGS_Linux = -fno-strict-aliasing USR_CXXFLAGS_RTEMS = -fno-strict-aliasing +ifeq ($(T_A),$(EPICS_HOST_ARCH)) + # genApps and aitGen are needed to finish libgdd + DELAY_INSTALL_LIBS = YES +endif + include $(TOP)/configure/RULES # Manual dependencies diff --git a/src/ca/legacy/gdd/README b/src/ca/legacy/gdd/README index d7ab4b9c2..4c5dd4094 100644 --- a/src/ca/legacy/gdd/README +++ b/src/ca/legacy/gdd/README @@ -2,8 +2,6 @@ # Author: Jim Kowalkowski # Date: 2/96 # -# $Revision-Id$ -# Some Notes: diff --git a/src/ca/legacy/gdd/aitConvert.cc b/src/ca/legacy/gdd/aitConvert.cc index 5839756c2..b2a4e42e3 100644 --- a/src/ca/legacy/gdd/aitConvert.cc +++ b/src/ca/legacy/gdd/aitConvert.cc @@ -11,8 +11,6 @@ // Author: Jim Kowalkowski // Date: 2/96 // -// $Revision-Id$ -// #define AIT_CONVERT_SOURCE 1 diff --git a/src/ca/legacy/gdd/aitConvert.h b/src/ca/legacy/gdd/aitConvert.h index f75fdb1ba..6571df44e 100644 --- a/src/ca/legacy/gdd/aitConvert.h +++ b/src/ca/legacy/gdd/aitConvert.h @@ -13,9 +13,6 @@ /* * Author: Jim Kowalkowski * Date: 2/96 - * - * $Revision-Id$ - * */ #include diff --git a/src/ca/legacy/gdd/aitGen.c b/src/ca/legacy/gdd/aitGen.c index 37861af4e..39f885531 100644 --- a/src/ca/legacy/gdd/aitGen.c +++ b/src/ca/legacy/gdd/aitGen.c @@ -10,9 +10,6 @@ /* * Author: Jim Kowalkowski * Date: 2/96 - * - * $Revision-Id$ - * */ #include diff --git a/src/ca/legacy/gdd/aitHelpers.cc b/src/ca/legacy/gdd/aitHelpers.cc index 6fc7f24b9..5d95a899c 100644 --- a/src/ca/legacy/gdd/aitHelpers.cc +++ b/src/ca/legacy/gdd/aitHelpers.cc @@ -10,9 +10,6 @@ // Author: Jim Kowalkowski // Date: 6/20/96 -// -// $Revision-Id$ -// #include diff --git a/src/ca/legacy/gdd/aitHelpers.h b/src/ca/legacy/gdd/aitHelpers.h index bfd4069f1..aa66a38e7 100644 --- a/src/ca/legacy/gdd/aitHelpers.h +++ b/src/ca/legacy/gdd/aitHelpers.h @@ -13,9 +13,6 @@ /* * Authors: Jeff Hill and Jim Kowalkowski * Date: 6/20/96 - * - * $Revision-Id$ - * */ #include diff --git a/src/ca/legacy/gdd/aitTypes.c b/src/ca/legacy/gdd/aitTypes.c index 8f3cb179f..35a87ce1e 100644 --- a/src/ca/legacy/gdd/aitTypes.c +++ b/src/ca/legacy/gdd/aitTypes.c @@ -10,9 +10,6 @@ /* * Author: Jim Kowalkowski * Date: 2/96 - * - * $Revision-Id$ - * */ #include diff --git a/src/ca/legacy/gdd/aitTypes.h b/src/ca/legacy/gdd/aitTypes.h index b8c1a45c8..135abc3c6 100644 --- a/src/ca/legacy/gdd/aitTypes.h +++ b/src/ca/legacy/gdd/aitTypes.h @@ -13,9 +13,6 @@ /* * Author: Jim Kowalkowski * Date: 2/96 - * - * $Revision-Id$ - * */ /* This is the file the user sets up for a given architecture */ diff --git a/src/ca/legacy/gdd/dbMapper.cc b/src/ca/legacy/gdd/dbMapper.cc index b075b34df..c15c26110 100644 --- a/src/ca/legacy/gdd/dbMapper.cc +++ b/src/ca/legacy/gdd/dbMapper.cc @@ -9,9 +9,6 @@ \*************************************************************************/ // Author: Jim Kowalkowski // Date: 2/96 -// -// $Revision-Id$ -// #define DB_MAPPER_SOURCE 1 diff --git a/src/ca/legacy/gdd/dbMapper.h b/src/ca/legacy/gdd/dbMapper.h index 7be845612..c059c8386 100644 --- a/src/ca/legacy/gdd/dbMapper.h +++ b/src/ca/legacy/gdd/dbMapper.h @@ -13,9 +13,6 @@ /* * Author: Jim Kowalkowski * Date: 2/96 - * - * $Revision-Id$ - * */ #include "shareLib.h" diff --git a/src/ca/legacy/gdd/gdd.cc b/src/ca/legacy/gdd/gdd.cc index 26f71d739..fd2b662c9 100644 --- a/src/ca/legacy/gdd/gdd.cc +++ b/src/ca/legacy/gdd/gdd.cc @@ -9,9 +9,6 @@ \*************************************************************************/ // Author: Jim Kowalkowski // Date: 2/96 -// -// $Revision-Id$ -// #include #include diff --git a/src/ca/legacy/gdd/gdd.h b/src/ca/legacy/gdd/gdd.h index e05dd3cc8..b713c2204 100644 --- a/src/ca/legacy/gdd/gdd.h +++ b/src/ca/legacy/gdd/gdd.h @@ -13,9 +13,6 @@ /* * Author: Jim Kowalkowski * Date: 2/96 - * - * $Revision-Id$ - * */ // Still need to handle to network byte order stuff. diff --git a/src/ca/legacy/gdd/gddAppDefs.cc b/src/ca/legacy/gdd/gddAppDefs.cc index 67b0aea62..2da4058b5 100644 --- a/src/ca/legacy/gdd/gddAppDefs.cc +++ b/src/ca/legacy/gdd/gddAppDefs.cc @@ -9,9 +9,6 @@ \*************************************************************************/ // Author: Jim Kowalkowski // Date: 2/96 -// -// $Revision-Id$ -// #define epicsExportSharedSymbols #include "gddAppTable.h" diff --git a/src/ca/legacy/gdd/gddAppFuncTable.h b/src/ca/legacy/gdd/gddAppFuncTable.h index 43a7b24f7..fca158d27 100644 --- a/src/ca/legacy/gdd/gddAppFuncTable.h +++ b/src/ca/legacy/gdd/gddAppFuncTable.h @@ -7,8 +7,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/gdd/gddAppTable.cc b/src/ca/legacy/gdd/gddAppTable.cc index 80238f015..ee3b82a7b 100644 --- a/src/ca/legacy/gdd/gddAppTable.cc +++ b/src/ca/legacy/gdd/gddAppTable.cc @@ -9,9 +9,6 @@ \*************************************************************************/ // Author: Jim Kowalkowski // Date: 2/96 -// -// $Revision-Id$ -// #define epicsExportSharedSymbols #include "gddAppTable.h" diff --git a/src/ca/legacy/gdd/gddAppTable.h b/src/ca/legacy/gdd/gddAppTable.h index a7b30e7a0..fe67c6577 100644 --- a/src/ca/legacy/gdd/gddAppTable.h +++ b/src/ca/legacy/gdd/gddAppTable.h @@ -13,9 +13,6 @@ /* * Author: Jim Kowalkowski * Date: 2/96 - * - * $Revision-Id$ - * */ #include "gdd.h" diff --git a/src/ca/legacy/gdd/gddArray.cc b/src/ca/legacy/gdd/gddArray.cc index cd0e566ff..8c9df0835 100644 --- a/src/ca/legacy/gdd/gddArray.cc +++ b/src/ca/legacy/gdd/gddArray.cc @@ -13,8 +13,6 @@ // Author: Jim Kowalkowski // Date: 3/97 -// -// $Revision-Id$ #define epicsExportSharedSymbols #include "gdd.h" diff --git a/src/ca/legacy/gdd/gddArray.h b/src/ca/legacy/gdd/gddArray.h index 8ca9c9017..10d1e4ed0 100644 --- a/src/ca/legacy/gdd/gddArray.h +++ b/src/ca/legacy/gdd/gddArray.h @@ -14,8 +14,6 @@ * Author: Jim Kowalkowski * Date: 3/97 * - * $Revision-Id$ - * * *********************************************************************** * Adds ability to put array data into a DD, get it out, and adjust it * *********************************************************************** diff --git a/src/ca/legacy/gdd/gddContainer.cc b/src/ca/legacy/gdd/gddContainer.cc index 77266e1cc..a5bea0298 100644 --- a/src/ca/legacy/gdd/gddContainer.cc +++ b/src/ca/legacy/gdd/gddContainer.cc @@ -14,9 +14,7 @@ // Author: Jim Kowalkowski // Date: 3/97 -// -// $Revision-Id$ -// + #define epicsExportSharedSymbols #include "gdd.h" diff --git a/src/ca/legacy/gdd/gddContainer.h b/src/ca/legacy/gdd/gddContainer.h index 070f978d9..7830eb641 100644 --- a/src/ca/legacy/gdd/gddContainer.h +++ b/src/ca/legacy/gdd/gddContainer.h @@ -13,8 +13,6 @@ /* * Author: Jim Kowalkowski * Date: 3/97 - * - * $Revision-Id$ */ #include "shareLib.h" diff --git a/src/ca/legacy/gdd/gddContainerI.h b/src/ca/legacy/gdd/gddContainerI.h index 8903ad825..55f306342 100644 --- a/src/ca/legacy/gdd/gddContainerI.h +++ b/src/ca/legacy/gdd/gddContainerI.h @@ -13,9 +13,6 @@ /* * Author: Jim Kowalkowski * Date: 3/97 - * - * $Revision-Id$ - * */ inline gddContainer::gddContainer(int,int,int,int*) { } diff --git a/src/ca/legacy/gdd/gddErrorCodes.cc b/src/ca/legacy/gdd/gddErrorCodes.cc index d5e34ffeb..7c20292be 100644 --- a/src/ca/legacy/gdd/gddErrorCodes.cc +++ b/src/ca/legacy/gdd/gddErrorCodes.cc @@ -10,9 +10,6 @@ // Author: Jim Kowalkowski // Date: 3/97 -// -// $Revision-Id$ -// // -------------------------- Error messages ------------------------- diff --git a/src/ca/legacy/gdd/gddErrorCodes.h b/src/ca/legacy/gdd/gddErrorCodes.h index af7523a7a..061fbab71 100644 --- a/src/ca/legacy/gdd/gddErrorCodes.h +++ b/src/ca/legacy/gdd/gddErrorCodes.h @@ -13,9 +13,6 @@ /* * Author: Jim Kowalkowski * Date: 2/96 - * - * $Revision-Id$ - * */ #include "shareLib.h" diff --git a/src/ca/legacy/gdd/gddI.h b/src/ca/legacy/gdd/gddI.h index 09679343c..ef13f66bd 100644 --- a/src/ca/legacy/gdd/gddI.h +++ b/src/ca/legacy/gdd/gddI.h @@ -13,9 +13,6 @@ /* * Author: Jim Kowalkowski * Date: 3/97 - * - * $Revision-Id$ - * */ inline void gdd::setData(void* d) { data.Pointer=d; } diff --git a/src/ca/legacy/gdd/gddNewDel.cc b/src/ca/legacy/gdd/gddNewDel.cc index 6859bec48..4e6f3c05f 100644 --- a/src/ca/legacy/gdd/gddNewDel.cc +++ b/src/ca/legacy/gdd/gddNewDel.cc @@ -9,9 +9,6 @@ \*************************************************************************/ // Author: Jim Kowalkowski // Date: 2/96 -// -// $Revision-Id$ -// #define epicsExportSharedSymbols #include "gddNewDel.h" diff --git a/src/ca/legacy/gdd/gddNewDel.h b/src/ca/legacy/gdd/gddNewDel.h index ce10d8cc1..2bd88598e 100644 --- a/src/ca/legacy/gdd/gddNewDel.h +++ b/src/ca/legacy/gdd/gddNewDel.h @@ -13,9 +13,6 @@ /* * Author: Jim Kowalkowski * Date: 2/96 - * - * $Revision-Id$ - * */ // this file if formatted with tab stop = 4 diff --git a/src/ca/legacy/gdd/gddTest.cc b/src/ca/legacy/gdd/gddTest.cc index 0d6868666..d36014018 100644 --- a/src/ca/legacy/gdd/gddTest.cc +++ b/src/ca/legacy/gdd/gddTest.cc @@ -9,9 +9,6 @@ \*************************************************************************/ // Author: Jim Kowalkowski // Date: 2/96 -// -// $Revision-Id$ -// #include #define epicsExportSharedSymbols diff --git a/src/ca/legacy/gdd/gddUtils.cc b/src/ca/legacy/gdd/gddUtils.cc index 3ddab8bfd..b0f5a5a0e 100644 --- a/src/ca/legacy/gdd/gddUtils.cc +++ b/src/ca/legacy/gdd/gddUtils.cc @@ -10,9 +10,6 @@ // Author: Jim Kowalkowski // Date: 3/97 -// -// $Revision-Id$ -// #include #include diff --git a/src/ca/legacy/gdd/gddUtils.h b/src/ca/legacy/gdd/gddUtils.h index c486738bc..ef45bf74c 100644 --- a/src/ca/legacy/gdd/gddUtils.h +++ b/src/ca/legacy/gdd/gddUtils.h @@ -13,9 +13,6 @@ /* * Author: Jim Kowalkowski * Date: 2/96 - * - * $Revision-Id$ - * */ #ifdef vxWorks diff --git a/src/ca/legacy/gdd/gddUtilsI.h b/src/ca/legacy/gdd/gddUtilsI.h index 5caec8414..c2eaf90ac 100644 --- a/src/ca/legacy/gdd/gddUtilsI.h +++ b/src/ca/legacy/gdd/gddUtilsI.h @@ -13,9 +13,6 @@ /* * Author: Jim Kowalkowski * Date: 3/97 - * - * $Revision-Id$ - * */ // inline gddBounds::gddBounds(aitIndex c) { start=0; count=c; } diff --git a/src/ca/legacy/gdd/gddref.html b/src/ca/legacy/gdd/gddref.html index 2a0bf9ba8..80aac6778 100644 --- a/src/ca/legacy/gdd/gddref.html +++ b/src/ca/legacy/gdd/gddref.html @@ -1,14 +1,9 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ + + GDD Reference Manual -

GDD Reference Manual

+ + +

GDD Reference Manual

gdd
gddAtomic
@@ -511,8 +506,6 @@ methods. Convenience methods so casting can be done from this GDD to any supported ait_xxxxx pointer variable. Same as getRef(...) and get(...) methods. -
Argonne National Laboratory -Copyright -Information
-
Jim Kowalkowski (jbk@aps.anl.gov)
updated 4/12/95 + + diff --git a/src/ca/legacy/gdd/gddref2.html b/src/ca/legacy/gdd/gddref2.html index 672dfebc7..928696208 100644 --- a/src/ca/legacy/gdd/gddref2.html +++ b/src/ca/legacy/gdd/gddref2.html @@ -1,14 +1,9 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ + + GDD Reference Manual -

GDD Reference Manual

+ + +

GDD Reference Manual

gdd
gddAtomic
@@ -658,8 +653,6 @@ gdd* to_gdd(void* dbr_data_structure, aitIndex dbr_element_count); int to_dbr(void* dbr_data_structure, gdd* gdd_instance); -
Argonne National Laboratory -Copyright -Information
-
Jim Kowalkowski (jbk@aps.anl.gov)
updated 4/12/95 + + diff --git a/src/ca/legacy/gdd/genApps.cc b/src/ca/legacy/gdd/genApps.cc index 9657ace3b..c8b934a76 100644 --- a/src/ca/legacy/gdd/genApps.cc +++ b/src/ca/legacy/gdd/genApps.cc @@ -9,9 +9,6 @@ \*************************************************************************/ // Author: Jim Kowalkowski // Date: 2/96 -// -// $Revision-Id$ -// #define epicsExportSharedSymbols #include "gddAppTable.h" diff --git a/src/ca/legacy/pcas/README b/src/ca/legacy/pcas/README index cf44c0513..b016c6737 100644 --- a/src/ca/legacy/pcas/README +++ b/src/ca/legacy/pcas/README @@ -1,6 +1,3 @@ - -$Revision-Id$ - README file for the EPICS Channel Access Server Author Jeff Hill johill@lanl.gov diff --git a/src/ca/legacy/pcas/example/directoryService/vxEntry.cc b/src/ca/legacy/pcas/example/directoryService/vxEntry.cc index 2cbf68e3a..1cb240723 100644 --- a/src/ca/legacy/pcas/example/directoryService/vxEntry.cc +++ b/src/ca/legacy/pcas/example/directoryService/vxEntry.cc @@ -8,7 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ // -// $Revision-Id$ // Author: Jeff HIll (LANL) // diff --git a/src/ca/legacy/pcas/generic/beaconAnomalyGovernor.cc b/src/ca/legacy/pcas/generic/beaconAnomalyGovernor.cc index e0a4f4cf4..df22e5301 100644 --- a/src/ca/legacy/pcas/generic/beaconAnomalyGovernor.cc +++ b/src/ca/legacy/pcas/generic/beaconAnomalyGovernor.cc @@ -9,8 +9,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/beaconAnomalyGovernor.h b/src/ca/legacy/pcas/generic/beaconAnomalyGovernor.h index 6d063c5ee..cb520b6f1 100644 --- a/src/ca/legacy/pcas/generic/beaconAnomalyGovernor.h +++ b/src/ca/legacy/pcas/generic/beaconAnomalyGovernor.h @@ -9,8 +9,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/beaconTimer.cc b/src/ca/legacy/pcas/generic/beaconTimer.cc index b4fe82689..71124fac6 100644 --- a/src/ca/legacy/pcas/generic/beaconTimer.cc +++ b/src/ca/legacy/pcas/generic/beaconTimer.cc @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/beaconTimer.h b/src/ca/legacy/pcas/generic/beaconTimer.h index bb516a9af..7b6a5654c 100644 --- a/src/ca/legacy/pcas/generic/beaconTimer.h +++ b/src/ca/legacy/pcas/generic/beaconTimer.h @@ -9,8 +9,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/caHdrLargeArray.h b/src/ca/legacy/pcas/generic/caHdrLargeArray.h index feae270e6..89b0d6d4b 100644 --- a/src/ca/legacy/pcas/generic/caHdrLargeArray.h +++ b/src/ca/legacy/pcas/generic/caHdrLargeArray.h @@ -9,8 +9,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/caNetAddr.cc b/src/ca/legacy/pcas/generic/caNetAddr.cc index 1f2ca244e..0c831be88 100644 --- a/src/ca/legacy/pcas/generic/caNetAddr.cc +++ b/src/ca/legacy/pcas/generic/caNetAddr.cc @@ -9,8 +9,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ -// -// $Revision-Id$ // // Author: Jeffrey O. Hill // johill@lanl.gov diff --git a/src/ca/legacy/pcas/generic/caServer.cc b/src/ca/legacy/pcas/generic/caServer.cc index c4d91558d..f992eb56d 100644 --- a/src/ca/legacy/pcas/generic/caServer.cc +++ b/src/ca/legacy/pcas/generic/caServer.cc @@ -7,8 +7,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/caServerI.cc b/src/ca/legacy/pcas/generic/caServerI.cc index 1d7097610..e8609eb8a 100644 --- a/src/ca/legacy/pcas/generic/caServerI.cc +++ b/src/ca/legacy/pcas/generic/caServerI.cc @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 @@ -35,8 +33,7 @@ // include a version string for POSIX systems static const char pVersionCAS[] = "@(#) " EPICS_VERSION_STRING - ", CA Portable Server Library " - "$Date$"; + ", CA Portable Server Library "; caServerI::caServerI ( caServer & tool ) : adapter (tool), diff --git a/src/ca/legacy/pcas/generic/casAsyncIOI.cc b/src/ca/legacy/pcas/generic/casAsyncIOI.cc index 7c79a28f8..e90247a6a 100644 --- a/src/ca/legacy/pcas/generic/casAsyncIOI.cc +++ b/src/ca/legacy/pcas/generic/casAsyncIOI.cc @@ -7,8 +7,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casAsyncIOI.h b/src/ca/legacy/pcas/generic/casAsyncIOI.h index 9bdabde9f..24a48512d 100644 --- a/src/ca/legacy/pcas/generic/casAsyncIOI.h +++ b/src/ca/legacy/pcas/generic/casAsyncIOI.h @@ -9,8 +9,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casAsyncPVAttachIO.cc b/src/ca/legacy/pcas/generic/casAsyncPVAttachIO.cc index 09ff6976a..0098c13ba 100644 --- a/src/ca/legacy/pcas/generic/casAsyncPVAttachIO.cc +++ b/src/ca/legacy/pcas/generic/casAsyncPVAttachIO.cc @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casAsyncPVAttachIOI.cpp b/src/ca/legacy/pcas/generic/casAsyncPVAttachIOI.cpp index 728de843d..1543c74cb 100644 --- a/src/ca/legacy/pcas/generic/casAsyncPVAttachIOI.cpp +++ b/src/ca/legacy/pcas/generic/casAsyncPVAttachIOI.cpp @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casAsyncPVAttachIOI.h b/src/ca/legacy/pcas/generic/casAsyncPVAttachIOI.h index a73871f6d..d8c5d5943 100644 --- a/src/ca/legacy/pcas/generic/casAsyncPVAttachIOI.h +++ b/src/ca/legacy/pcas/generic/casAsyncPVAttachIOI.h @@ -9,8 +9,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casAsyncPVExistIO.cc b/src/ca/legacy/pcas/generic/casAsyncPVExistIO.cc index 517121d1c..34f827b34 100644 --- a/src/ca/legacy/pcas/generic/casAsyncPVExistIO.cc +++ b/src/ca/legacy/pcas/generic/casAsyncPVExistIO.cc @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casAsyncPVExistIOI.cpp b/src/ca/legacy/pcas/generic/casAsyncPVExistIOI.cpp index 9b6808bd1..f03a9deb6 100644 --- a/src/ca/legacy/pcas/generic/casAsyncPVExistIOI.cpp +++ b/src/ca/legacy/pcas/generic/casAsyncPVExistIOI.cpp @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casAsyncPVExistIOI.h b/src/ca/legacy/pcas/generic/casAsyncPVExistIOI.h index 6712d619e..d436c23cb 100644 --- a/src/ca/legacy/pcas/generic/casAsyncPVExistIOI.h +++ b/src/ca/legacy/pcas/generic/casAsyncPVExistIOI.h @@ -9,8 +9,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casAsyncReadIO.cc b/src/ca/legacy/pcas/generic/casAsyncReadIO.cc index a9ca5ee2a..e235e3ebe 100644 --- a/src/ca/legacy/pcas/generic/casAsyncReadIO.cc +++ b/src/ca/legacy/pcas/generic/casAsyncReadIO.cc @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casAsyncReadIOI.cc b/src/ca/legacy/pcas/generic/casAsyncReadIOI.cc index 45248d31d..4bf01b546 100644 --- a/src/ca/legacy/pcas/generic/casAsyncReadIOI.cc +++ b/src/ca/legacy/pcas/generic/casAsyncReadIOI.cc @@ -7,8 +7,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casAsyncReadIOI.h b/src/ca/legacy/pcas/generic/casAsyncReadIOI.h index a1ce60ce4..6f8b7d6c5 100644 --- a/src/ca/legacy/pcas/generic/casAsyncReadIOI.h +++ b/src/ca/legacy/pcas/generic/casAsyncReadIOI.h @@ -9,8 +9,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casAsyncWriteIO.cc b/src/ca/legacy/pcas/generic/casAsyncWriteIO.cc index abd0bb965..0366eb59b 100644 --- a/src/ca/legacy/pcas/generic/casAsyncWriteIO.cc +++ b/src/ca/legacy/pcas/generic/casAsyncWriteIO.cc @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casAsyncWriteIOI.cpp b/src/ca/legacy/pcas/generic/casAsyncWriteIOI.cpp index 2d505679f..0b8c0a2cd 100644 --- a/src/ca/legacy/pcas/generic/casAsyncWriteIOI.cpp +++ b/src/ca/legacy/pcas/generic/casAsyncWriteIOI.cpp @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casAsyncWriteIOI.h b/src/ca/legacy/pcas/generic/casAsyncWriteIOI.h index f9ad3aa28..86b9c4add 100644 --- a/src/ca/legacy/pcas/generic/casAsyncWriteIOI.h +++ b/src/ca/legacy/pcas/generic/casAsyncWriteIOI.h @@ -9,8 +9,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casBufferFactory.cpp b/src/ca/legacy/pcas/generic/casBufferFactory.cpp index 41d4ca742..9f311a091 100644 --- a/src/ca/legacy/pcas/generic/casBufferFactory.cpp +++ b/src/ca/legacy/pcas/generic/casBufferFactory.cpp @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casChannel.cc b/src/ca/legacy/pcas/generic/casChannel.cc index 81351eb0d..2d9d97796 100644 --- a/src/ca/legacy/pcas/generic/casChannel.cc +++ b/src/ca/legacy/pcas/generic/casChannel.cc @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casChannelI.cc b/src/ca/legacy/pcas/generic/casChannelI.cc index a44ef6f40..588f67d78 100644 --- a/src/ca/legacy/pcas/generic/casChannelI.cc +++ b/src/ca/legacy/pcas/generic/casChannelI.cc @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casChannelI.h b/src/ca/legacy/pcas/generic/casChannelI.h index 76eec5e7f..2c72e88e4 100644 --- a/src/ca/legacy/pcas/generic/casChannelI.h +++ b/src/ca/legacy/pcas/generic/casChannelI.h @@ -9,8 +9,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casCoreClient.cc b/src/ca/legacy/pcas/generic/casCoreClient.cc index a1514a1df..9c384776e 100644 --- a/src/ca/legacy/pcas/generic/casCoreClient.cc +++ b/src/ca/legacy/pcas/generic/casCoreClient.cc @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casCoreClient.h b/src/ca/legacy/pcas/generic/casCoreClient.h index aad5e0030..f19f282a9 100644 --- a/src/ca/legacy/pcas/generic/casCoreClient.h +++ b/src/ca/legacy/pcas/generic/casCoreClient.h @@ -9,8 +9,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casCtx.h b/src/ca/legacy/pcas/generic/casCtx.h index a505299c0..706376e77 100644 --- a/src/ca/legacy/pcas/generic/casCtx.h +++ b/src/ca/legacy/pcas/generic/casCtx.h @@ -1,5 +1,3 @@ - - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -10,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casDGClient.cc b/src/ca/legacy/pcas/generic/casDGClient.cc index ce0d6e1ba..4f1f41ecb 100644 --- a/src/ca/legacy/pcas/generic/casDGClient.cc +++ b/src/ca/legacy/pcas/generic/casDGClient.cc @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 @@ -26,39 +24,39 @@ casDGClient::pCASMsgHandler const casDGClient::msgHandlers[] = { - & casDGClient::versionAction, - & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, + & casDGClient::versionAction, + & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction, & casDGClient::uknownMessageAction, & casDGClient::searchAction, & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, - & casDGClient::echoAction, - & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction, + & casDGClient::echoAction, + & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction, - & casDGClient::uknownMessageAction + & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction, + & casDGClient::uknownMessageAction }; // @@ -86,7 +84,7 @@ casDGClient::~casDGClient() // void casDGClient::destroy() { - printf("Attempt to destroy the DG client was ignored\n"); + printf("Attempt to destroy the DG client was ignored\n"); } // @@ -94,16 +92,16 @@ void casDGClient::destroy() // void casDGClient::show (unsigned level) const { - printf ( "casDGClient at %p\n", - static_cast ( this ) ); - if (level>=1u) { - char buf[64]; - this->hostName (buf, sizeof(buf)); - printf ("Client Host=%s\n", buf); - this->casCoreClient::show ( level - 1u ); - this->in.show ( level - 1u ); - this->out.show ( level - 1u ); - } + printf ( "casDGClient at %p\n", + static_cast ( this ) ); + if (level>=1u) { + char buf[64]; + this->hostName (buf, sizeof(buf)); + printf ("Client Host=%s\n", buf); + this->casCoreClient::show ( level - 1u ); + this->in.show ( level - 1u ); + this->out.show ( level - 1u ); + } } // @@ -111,7 +109,7 @@ void casDGClient::show (unsigned level) const // caStatus casDGClient::uknownMessageAction () { - const caHdrLargeArray * mp = this->ctx.getMsg(); + const caHdrLargeArray * mp = this->ctx.getMsg(); char pHostName[64u]; this->lastRecvAddr.stringConvert ( pHostName, sizeof ( pHostName ) ); @@ -119,7 +117,7 @@ caStatus casDGClient::uknownMessageAction () caServerI::dumpMsg ( pHostName, "?", mp, this->ctx.getData(), "bad request code=%u in DG\n", mp->m_cmmd ); - return S_cas_badProtocol; + return S_cas_badProtocol; } // @@ -127,9 +125,9 @@ caStatus casDGClient::uknownMessageAction () // caStatus casDGClient::searchAction() { - const caHdrLargeArray *mp = this->ctx.getMsg(); + const caHdrLargeArray *mp = this->ctx.getMsg(); const char *pChanName = static_cast ( this->ctx.getData() ); - caStatus status; + caStatus status; // // check the sanity of the message @@ -137,7 +135,7 @@ caStatus casDGClient::searchAction() if ( mp->m_postsize <= 1 ) { char pHostName[64u]; this->lastRecvAddr.stringConvert ( pHostName, sizeof ( pHostName ) ); - caServerI::dumpMsg ( pHostName, "?", mp, this->ctx.getData(), + caServerI::dumpMsg ( pHostName, "?", mp, this->ctx.getData(), "empty PV name extension in UDP search request?\n" ); return S_cas_success; } @@ -145,7 +143,7 @@ caStatus casDGClient::searchAction() if ( pChanName[0] == '\0' ) { char pHostName[64u]; this->lastRecvAddr.stringConvert ( pHostName, sizeof ( pHostName ) ); - caServerI::dumpMsg ( pHostName, "?", mp, this->ctx.getData(), + caServerI::dumpMsg ( pHostName, "?", mp, this->ctx.getData(), "zero length PV name in UDP search request?\n" ); return S_cas_success; } @@ -157,56 +155,56 @@ caStatus casDGClient::searchAction() if ( i <= 1 ) { char pHostName[64u]; this->lastRecvAddr.stringConvert ( pHostName, sizeof ( pHostName ) ); - caServerI::dumpMsg ( pHostName, "?", mp, this->ctx.getData(), + caServerI::dumpMsg ( pHostName, "?", mp, this->ctx.getData(), "unterminated PV name in UDP search request?\n" ); return S_cas_success; } } - if ( this->getCAS().getDebugLevel() > 6u ) { - char pHostName[64u]; - this->hostName ( pHostName, sizeof ( pHostName ) ); - printf ( "\"%s\" is searching for \"%s\"\n", + if ( this->getCAS().getDebugLevel() > 6u ) { + char pHostName[64u]; + this->hostName ( pHostName, sizeof ( pHostName ) ); + printf ( "\"%s\" is searching for \"%s\"\n", pHostName, pChanName ); - } + } - // - // verify that we have sufficent memory for a PV and a - // monitor prior to calling PV exist test so that when - // the server runs out of memory we dont reply to - // search requests, and therefore dont thrash through - // caServer::pvExistTest() and casCreatePV::pvAttach() - // + // + // verify that we have sufficent memory for a PV and a + // monitor prior to calling PV exist test so that when + // the server runs out of memory we dont reply to + // search requests, and therefore dont thrash through + // caServer::pvExistTest() and casCreatePV::pvAttach() + // if ( ! osiSufficentSpaceInPool ( 0 ) ) { return S_cas_success; } - // - // ask the server tool if this PV exists - // - this->userStartedAsyncIO = false; - pvExistReturn pver = - this->getCAS()->pvExistTest ( this->ctx, this->lastRecvAddr, pChanName ); + // + // ask the server tool if this PV exists + // + this->userStartedAsyncIO = false; + pvExistReturn pver = + this->getCAS()->pvExistTest ( this->ctx, this->lastRecvAddr, pChanName ); - // - // prevent problems when they initiate - // async IO but dont return status - // indicating so (and vise versa) - // - if ( this->userStartedAsyncIO ) { + // + // prevent problems when they initiate + // async IO but dont return status + // indicating so (and vise versa) + // + if ( this->userStartedAsyncIO ) { if ( pver.getStatus() != pverAsyncCompletion ) { - errMessage (S_cas_badParameter, - "- assuming asynch IO status from caServer::pvExistTest()"); + errMessage (S_cas_badParameter, + "- assuming asynch IO status from caServer::pvExistTest()"); } status = S_cas_success; - } - else { - // - // otherwise we assume sync IO operation was initiated - // + } + else { + // + // otherwise we assume sync IO operation was initiated + // switch ( pver.getStatus() ) { case pverExistsHere: - status = this->searchResponse (*mp, pver); + status = this->searchResponse (*mp, pver); break; case pverDoesNotExistHere: @@ -214,25 +212,25 @@ caStatus casDGClient::searchAction() break; case pverAsyncCompletion: - errMessage (S_cas_badParameter, - "- unexpected asynch IO status from caServer::pvExistTest() ignored"); + errMessage (S_cas_badParameter, + "- unexpected asynch IO status from caServer::pvExistTest() ignored"); status = S_cas_success; break; default: - errMessage (S_cas_badParameter, - "- invalid return from caServer::pvExistTest() ignored"); + errMessage (S_cas_badParameter, + "- invalid return from caServer::pvExistTest() ignored"); status = S_cas_success; break; - } - } + } + } return status; } // // caStatus casDGClient::searchResponse() // -caStatus casDGClient::searchResponse ( const caHdrLargeArray & msg, +caStatus casDGClient::searchResponse ( const caHdrLargeArray & msg, const pvExistReturn & retVal ) { caStatus status; @@ -342,13 +340,13 @@ caStatus casDGClient::searchResponse ( const caHdrLargeArray & msg, } // -// casDGClient::searchFailResponse() -// (only when requested by the client -// - when it isnt a reply to a broadcast) +// casDGClient::searchFailResponse() +// (only when requested by the client +// - when it isnt a reply to a broadcast) // caStatus casDGClient::searchFailResponse ( const caHdrLargeArray * mp ) { - int status; + caStatus status; epicsGuard < epicsMutex > guard ( this->mutex ); status = this->out.copyInHeader ( CA_PROTO_NOT_FOUND, 0, @@ -366,7 +364,7 @@ caStatus casDGClient::searchFailResponse ( const caHdrLargeArray * mp ) */ caStatus casDGClient::versionAction () { - const caHdrLargeArray * mp = this->ctx.getMsg(); + const caHdrLargeArray * mp = this->ctx.getMsg(); if ( mp->m_count != 0 ) { this->minor_version_number = static_cast ( mp->m_count ); @@ -377,7 +375,7 @@ caStatus casDGClient::versionAction () this->seqNoOfReq = 0; } } - return S_cas_success; + return S_cas_success; } // @@ -386,25 +384,25 @@ caStatus casDGClient::versionAction () // void casDGClient::sendBeacon ( ca_uint32_t beaconNumber ) { - union { - caHdr msg; - char buf; - }; + union { + caHdr msg; + char buf; + }; - // - // create the message - // - memset ( & buf, 0, sizeof ( msg ) ); + // + // create the message + // + memset ( & buf, 0, sizeof ( msg ) ); AlignedWireRef < epicsUInt16 > ( msg.m_cmmd ) = CA_PROTO_RSRV_IS_UP; AlignedWireRef < epicsUInt16 > ( msg.m_dataType ) = CA_MINOR_PROTOCOL_REVISION; AlignedWireRef < epicsUInt32 > ( msg.m_cid ) = beaconNumber; - // - // send it to all addresses on the beacon list, + // + // send it to all addresses on the beacon list, // but let the IO specific code set the address // field and the port field - // - this->sendBeaconIO ( buf, sizeof (msg), msg.m_count, msg.m_available ); + // + this->sendBeaconIO ( buf, sizeof (msg), msg.m_count, msg.m_available ); } // @@ -425,8 +423,8 @@ outBufClient::flushCondition casDGClient::xSend ( char *pBufIn, if ( pHdr->cadg_addr.isValid() ) { outBufClient::flushCondition stat = - this->osdSend ( pDG, sizeDG, pHdr->cadg_addr ); - if ( stat != outBufClient::flushProgress ) { + this->osdSend ( pDG, sizeDG, pHdr->cadg_addr ); + if ( stat != outBufClient::flushProgress ) { break; } } @@ -435,10 +433,10 @@ outBufClient::flushCondition casDGClient::xSend ( char *pBufIn, } if ( totalBytes ) { - // - // !! this time fetch may be slowing things down !! - // - //this->lastSendTS = epicsTime::getCurrent(); + // + // !! this time fetch may be slowing things down !! + // + //this->lastSendTS = epicsTime::getCurrent(); nBytesSent = totalBytes; return outBufClient::flushProgress; } @@ -461,16 +459,16 @@ inBufClient::fillCondition casDGClient::xRecv (char *pBufIn, bufSizeT nBytesToRe while (pAfter-pCurBuf >= static_cast(MAX_UDP_RECV+sizeof(cadg))) { pHdr = reinterpret_cast < cadg * > ( pCurBuf ); - stat = this->osdRecv ( reinterpret_cast < char * > ( pHdr + 1 ), + stat = this->osdRecv ( reinterpret_cast < char * > ( pHdr + 1 ), MAX_UDP_RECV, parm, nDGBytesRecv, pHdr->cadg_addr); - if (stat==casFillProgress) { + if (stat==casFillProgress) { pHdr->cadg_nBytes = nDGBytesRecv + sizeof(*pHdr); pCurBuf += pHdr->cadg_nBytes; - // - // !! this time fetch may be slowing things down !! - // - //this->lastRecvTS = epicsTime::getCurrent(); - } + // + // !! this time fetch may be slowing things down !! + // + //this->lastRecvTS = epicsTime::getCurrent(); + } else { break; } @@ -495,7 +493,7 @@ inBufClient::fillCondition casDGClient::xRecv (char *pBufIn, bufSizeT nBytesToRe // caStatus casDGClient::asyncSearchResponse ( epicsGuard < casClientMutex > &, const caNetAddr & outAddr, - const caHdrLargeArray & msg, const pvExistReturn & retVal, + const caHdrLargeArray & msg, const pvExistReturn & retVal, ca_uint16_t protocolRevision, ca_uint32_t sequenceNumber ) { if ( retVal.getStatus() != pverExistsHere ) { @@ -521,7 +519,7 @@ caStatus casDGClient::asyncSearchResponse ( pMsg->m_dataType = htons ( sequenceNoIsValid ); } - caStatus stat = this->searchResponse ( msg, retVal ); + caStatus stat = this->searchResponse ( msg, retVal ); pRespHdr->cadg_nBytes = this->out.popCtx (outctx) + sizeof ( *pRespHdr ); if ( pRespHdr->cadg_nBytes > sizeof ( *pRespHdr ) + sizeof (caHdr) ) { @@ -529,7 +527,7 @@ caStatus casDGClient::asyncSearchResponse ( this->out.commitRawMsg ( pRespHdr->cadg_nBytes ); } - return stat; + return stat; } // @@ -539,8 +537,8 @@ caStatus casDGClient::processDG () { bufSizeT bytesLeft; caStatus status; - - status = S_cas_success; + + status = S_cas_success; while ( ( bytesLeft = this->in.bytesPresent() ) ) { bufSizeT dgInBytesConsumed; const cadg * pReqHdr = reinterpret_cast < cadg * > ( this->in.msgPtr () ); @@ -659,7 +657,7 @@ caStatus casDGClient::processDG () // unsigned casDGClient::getDebugLevel() const { - return this->getCAS().getDebugLevel(); + return this->getCAS().getDebugLevel(); } // @@ -667,7 +665,7 @@ unsigned casDGClient::getDebugLevel() const // caNetAddr casDGClient::fetchLastRecvAddr () const { - return this->lastRecvAddr; + return this->lastRecvAddr; } // @@ -675,7 +673,7 @@ caNetAddr casDGClient::fetchLastRecvAddr () const // ca_uint32_t casDGClient::datagramSequenceNumber () const { - return this->seqNoOfReq; + return this->seqNoOfReq; } // @@ -735,27 +733,27 @@ outBufClient::flushCondition casDGClient::flush () // caStatus casDGClient::processMsg () { - int status = S_cas_success; + int status = S_cas_success; try { - unsigned bytesLeft; - while ( ( bytesLeft = this->in.bytesPresent() ) ) { + unsigned bytesLeft; + while ( ( bytesLeft = this->in.bytesPresent() ) ) { caHdrLargeArray msgTmp; unsigned msgSize; ca_uint32_t hdrSize; char * rawMP; { - // - // copy as raw bytes in order to avoid - // alignment problems - // + // + // copy as raw bytes in order to avoid + // alignment problems + // caHdr smallHdr; if ( bytesLeft < sizeof ( smallHdr ) ) { break; } rawMP = this->in.msgPtr (); - memcpy ( & smallHdr, rawMP, sizeof ( smallHdr ) ); + memcpy ( & smallHdr, rawMP, sizeof ( smallHdr ) ); ca_uint32_t payloadSize = AlignedWireRef < epicsUInt16 > ( smallHdr.m_postsize ); ca_uint32_t nElem = AlignedWireRef < epicsUInt16 > ( smallHdr.m_count ); @@ -804,45 +802,45 @@ caStatus casDGClient::processMsg () this->ctx.setMsg ( msgTmp, rawMP + hdrSize ); - if ( this->getCAS().getDebugLevel() > 5u ) { + if ( this->getCAS().getDebugLevel() > 5u ) { char pHostName[64u]; this->lastRecvAddr.stringConvert ( pHostName, sizeof ( pHostName ) ); - caServerI::dumpMsg ( pHostName, "?", + caServerI::dumpMsg ( pHostName, "?", & msgTmp, rawMP + hdrSize, 0 ); - } + } } - // - // Reset the context to the default - // (guarantees that previous message does not get mixed - // up with the current message) - // - this->ctx.setChannel ( NULL ); - this->ctx.setPV ( NULL ); + // + // Reset the context to the default + // (guarantees that previous message does not get mixed + // up with the current message) + // + this->ctx.setChannel ( NULL ); + this->ctx.setPV ( NULL ); - // - // Call protocol stub - // + // + // Call protocol stub + // casDGClient::pCASMsgHandler pHandler; - if ( msgTmp.m_cmmd < NELEMENTS ( casDGClient::msgHandlers ) ) { + if ( msgTmp.m_cmmd < NELEMENTS ( casDGClient::msgHandlers ) ) { pHandler = this->casDGClient::msgHandlers[msgTmp.m_cmmd]; - } + } else { pHandler = & casDGClient::uknownMessageAction; } - status = ( this->*pHandler ) (); - if ( status ) { + status = ( this->*pHandler ) (); + if ( status ) { this->in.removeMsg ( this->in.bytesPresent() ); - break; - } + break; + } this->in.removeMsg ( msgSize ); - } + } } catch ( std::exception & except ) { this->in.removeMsg ( this->in.bytesPresent() ); - status = this->sendErr ( + status = this->sendErr ( this->ctx.getMsg(), invalidResID, ECA_INTERNAL, "C++ exception \"%s\" in CA circuit server", except.what () ); @@ -850,39 +848,39 @@ caStatus casDGClient::processMsg () } catch (...) { this->in.removeMsg ( this->in.bytesPresent() ); - status = this->sendErr ( + status = this->sendErr ( this->ctx.getMsg(), invalidResID, ECA_INTERNAL, "unexpected C++ exception in CA datagram server" ); status = S_cas_internal; } - return status; + return status; } // -// casDGClient::sendErr() +// casDGClient::sendErr() // caStatus casDGClient::sendErr ( const caHdrLargeArray *curp, ca_uint32_t cid, const int reportedStatus, const char *pformat, ... ) { - unsigned stringSize; - char msgBuf[1024]; /* allocate plenty of space for the message string */ - if ( pformat ) { - va_list args; - va_start ( args, pformat ); - int status = vsprintf ( msgBuf, pformat, args ); - if ( status < 0 ) { - errPrintf (S_cas_internal, __FILE__, __LINE__, - "bad sendErr(%s)", pformat); - stringSize = 0u; - } - else { - stringSize = 1u + (unsigned) status; - } - } - else { - stringSize = 0u; - } + unsigned stringSize; + char msgBuf[1024]; /* allocate plenty of space for the message string */ + if ( pformat ) { + va_list args; + va_start ( args, pformat ); + int status = vsprintf ( msgBuf, pformat, args ); + if ( status < 0 ) { + errPrintf (S_cas_internal, __FILE__, __LINE__, + "bad sendErr(%s)", pformat); + stringSize = 0u; + } + else { + stringSize = 1u + (unsigned) status; + } + } + else { + stringSize = 0u; + } unsigned hdrSize = sizeof ( caHdr ); if ( ( curp->m_postsize >= 0xffff || curp->m_count >= 0xffff ) && @@ -933,7 +931,7 @@ caStatus casDGClient::sendErr ( const caHdrLargeArray *curp, this->out.commitMsg (); } - return S_cas_success; + return S_cas_success; } @@ -942,8 +940,8 @@ caStatus casDGClient::sendErr ( const caHdrLargeArray *curp, // caStatus casDGClient::echoAction () { - const caHdrLargeArray * mp = this->ctx.getMsg(); - const void * dp = this->ctx.getData(); + const caHdrLargeArray * mp = this->ctx.getMsg(); + const void * dp = this->ctx.getData(); void * pPayloadOut; epicsGuard < epicsMutex > guard ( this->mutex ); @@ -954,5 +952,5 @@ caStatus casDGClient::echoAction () memcpy ( pPayloadOut, dp, mp->m_postsize ); this->out.commitMsg (); } - return S_cas_success; + return S_cas_success; } diff --git a/src/ca/legacy/pcas/generic/casDGClient.h b/src/ca/legacy/pcas/generic/casDGClient.h index 334af2043..cac093380 100644 --- a/src/ca/legacy/pcas/generic/casDGClient.h +++ b/src/ca/legacy/pcas/generic/casDGClient.h @@ -1,5 +1,3 @@ - - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. diff --git a/src/ca/legacy/pcas/generic/casEvent.h b/src/ca/legacy/pcas/generic/casEvent.h index a4ba0424c..efe62b5b7 100644 --- a/src/ca/legacy/pcas/generic/casEvent.h +++ b/src/ca/legacy/pcas/generic/casEvent.h @@ -1,4 +1,3 @@ - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -9,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casEventMask.cc b/src/ca/legacy/pcas/generic/casEventMask.cc index 062d41043..a72ced06d 100644 --- a/src/ca/legacy/pcas/generic/casEventMask.cc +++ b/src/ca/legacy/pcas/generic/casEventMask.cc @@ -7,8 +7,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casEventMask.h b/src/ca/legacy/pcas/generic/casEventMask.h index 27d805f6b..d166ca918 100644 --- a/src/ca/legacy/pcas/generic/casEventMask.h +++ b/src/ca/legacy/pcas/generic/casEventMask.h @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casEventRegistry.h b/src/ca/legacy/pcas/generic/casEventRegistry.h index 12c3a62e4..c10f982e3 100644 --- a/src/ca/legacy/pcas/generic/casEventRegistry.h +++ b/src/ca/legacy/pcas/generic/casEventRegistry.h @@ -1,6 +1,3 @@ - - - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -11,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casEventSys.cc b/src/ca/legacy/pcas/generic/casEventSys.cc index 46a75a051..8783f36f3 100644 --- a/src/ca/legacy/pcas/generic/casEventSys.cc +++ b/src/ca/legacy/pcas/generic/casEventSys.cc @@ -7,8 +7,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casEventSys.h b/src/ca/legacy/pcas/generic/casEventSys.h index bde07f2f8..d194eedc0 100644 --- a/src/ca/legacy/pcas/generic/casEventSys.h +++ b/src/ca/legacy/pcas/generic/casEventSys.h @@ -1,5 +1,3 @@ - - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -10,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casMonEvent.cc b/src/ca/legacy/pcas/generic/casMonEvent.cc index 09b0131a0..bcba9f92e 100644 --- a/src/ca/legacy/pcas/generic/casMonEvent.cc +++ b/src/ca/legacy/pcas/generic/casMonEvent.cc @@ -7,8 +7,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casMonEvent.h b/src/ca/legacy/pcas/generic/casMonEvent.h index 23db817e7..d31200cc0 100644 --- a/src/ca/legacy/pcas/generic/casMonEvent.h +++ b/src/ca/legacy/pcas/generic/casMonEvent.h @@ -1,4 +1,3 @@ - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -9,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casMonitor.cc b/src/ca/legacy/pcas/generic/casMonitor.cc index 93a036648..05deb4a82 100644 --- a/src/ca/legacy/pcas/generic/casMonitor.cc +++ b/src/ca/legacy/pcas/generic/casMonitor.cc @@ -7,8 +7,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casMonitor.h b/src/ca/legacy/pcas/generic/casMonitor.h index aa4ef090e..1c59dfbdf 100644 --- a/src/ca/legacy/pcas/generic/casMonitor.h +++ b/src/ca/legacy/pcas/generic/casMonitor.h @@ -1,5 +1,3 @@ - - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -10,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casPV.cc b/src/ca/legacy/pcas/generic/casPV.cc index 33d21d08e..317200121 100644 --- a/src/ca/legacy/pcas/generic/casPV.cc +++ b/src/ca/legacy/pcas/generic/casPV.cc @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/casPVI.cc b/src/ca/legacy/pcas/generic/casPVI.cc index 8702614be..50e5d27a7 100644 --- a/src/ca/legacy/pcas/generic/casPVI.cc +++ b/src/ca/legacy/pcas/generic/casPVI.cc @@ -7,8 +7,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 @@ -225,8 +223,9 @@ void casPVI::updateEnumStringTableAsyncCompletion ( const gdd & resp ) assert ( gdd_status == 0 ); // - // preallocate the correct amount + // clear and preallocate the correct amount // + this->enumStrTbl.clear (); this->enumStrTbl.reserve ( count ); if ( resp.primitiveType() == aitEnumString ) { @@ -264,6 +263,18 @@ void casPVI::updateEnumStringTableAsyncCompletion ( const gdd & resp ) void casPVI::postEvent ( const casEventMask & select, const gdd & event ) { epicsGuard < epicsMutex > guard ( this->mutex ); + // if this is a DBE_PROPERTY event for an enum type + // update the enum string table + if ( (select & this->pCAS->propertyEventMask()).eventsSelected() ) { + const gdd *menu = NULL; + if ( event.applicationType() == gddAppType_dbr_gr_enum ) + menu = event.getDD( gddAppTypeIndex_dbr_gr_enum_enums ); + else if ( event.applicationType() == gddAppType_dbr_ctrl_enum ) + menu = event.getDD( gddAppTypeIndex_dbr_ctrl_enum_enums ); + if ( menu ) + updateEnumStringTableAsyncCompletion( *menu ); + } + if ( this->nMonAttached ) { // we are paying some significant locking overhead for // these diagnostic counters diff --git a/src/ca/legacy/pcas/generic/casPVI.h b/src/ca/legacy/pcas/generic/casPVI.h index 1939144db..feea79d23 100644 --- a/src/ca/legacy/pcas/generic/casPVI.h +++ b/src/ca/legacy/pcas/generic/casPVI.h @@ -1,4 +1,3 @@ - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -9,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/chanIntfForPV.cc b/src/ca/legacy/pcas/generic/chanIntfForPV.cc index 2ea2da606..4c983df60 100644 --- a/src/ca/legacy/pcas/generic/chanIntfForPV.cc +++ b/src/ca/legacy/pcas/generic/chanIntfForPV.cc @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/chanIntfForPV.h b/src/ca/legacy/pcas/generic/chanIntfForPV.h index 10a2216a7..c61a97bab 100644 --- a/src/ca/legacy/pcas/generic/chanIntfForPV.h +++ b/src/ca/legacy/pcas/generic/chanIntfForPV.h @@ -1,4 +1,3 @@ - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -9,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/channelDestroyEvent.cpp b/src/ca/legacy/pcas/generic/channelDestroyEvent.cpp index 6256e75b3..33c64938a 100644 --- a/src/ca/legacy/pcas/generic/channelDestroyEvent.cpp +++ b/src/ca/legacy/pcas/generic/channelDestroyEvent.cpp @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/channelDestroyEvent.h b/src/ca/legacy/pcas/generic/channelDestroyEvent.h index 7c8b5821c..17b32f72a 100644 --- a/src/ca/legacy/pcas/generic/channelDestroyEvent.h +++ b/src/ca/legacy/pcas/generic/channelDestroyEvent.h @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/clientBufMemoryManager.cpp b/src/ca/legacy/pcas/generic/clientBufMemoryManager.cpp index bde66a28c..2f5fc128b 100644 --- a/src/ca/legacy/pcas/generic/clientBufMemoryManager.cpp +++ b/src/ca/legacy/pcas/generic/clientBufMemoryManager.cpp @@ -1,4 +1,3 @@ - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -9,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/inBuf.cc b/src/ca/legacy/pcas/generic/inBuf.cc index f75a68df7..db97a082c 100644 --- a/src/ca/legacy/pcas/generic/inBuf.cc +++ b/src/ca/legacy/pcas/generic/inBuf.cc @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/ioBlocked.h b/src/ca/legacy/pcas/generic/ioBlocked.h index 51429f8ce..000292eaf 100644 --- a/src/ca/legacy/pcas/generic/ioBlocked.h +++ b/src/ca/legacy/pcas/generic/ioBlocked.h @@ -9,8 +9,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/mt/ioBlocked.cc b/src/ca/legacy/pcas/generic/mt/ioBlocked.cc index 7d43af575..974d113e2 100644 --- a/src/ca/legacy/pcas/generic/mt/ioBlocked.cc +++ b/src/ca/legacy/pcas/generic/mt/ioBlocked.cc @@ -8,7 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ // -// $Revision-Id$ // Author: Jeff Hill // This file implements a IO blocked list NOOP for multi-threaded systems // diff --git a/src/ca/legacy/pcas/generic/outBuf.cc b/src/ca/legacy/pcas/generic/outBuf.cc index a4f4d3eac..e755753e8 100644 --- a/src/ca/legacy/pcas/generic/outBuf.cc +++ b/src/ca/legacy/pcas/generic/outBuf.cc @@ -7,8 +7,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ca/legacy/pcas/generic/pvAttachReturn.cc b/src/ca/legacy/pcas/generic/pvAttachReturn.cc index 11167ea1b..0b70fef8c 100644 --- a/src/ca/legacy/pcas/generic/pvAttachReturn.cc +++ b/src/ca/legacy/pcas/generic/pvAttachReturn.cc @@ -1,4 +1,3 @@ - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -9,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ -// -// $Revision-Id$ // // Author: Jeffrey O. Hill // johill@lanl.gov diff --git a/src/ca/legacy/pcas/generic/pvExistReturn.cc b/src/ca/legacy/pcas/generic/pvExistReturn.cc index 8d200eb0b..46fd7eb65 100644 --- a/src/ca/legacy/pcas/generic/pvExistReturn.cc +++ b/src/ca/legacy/pcas/generic/pvExistReturn.cc @@ -1,4 +1,3 @@ - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -9,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ -// -// $Revision-Id$ // // Author: Jeffrey O. Hill // johill@lanl.gov diff --git a/src/ca/legacy/pcas/generic/st/casDGEvWakeup.h b/src/ca/legacy/pcas/generic/st/casDGEvWakeup.h index ff41d6b62..9676bad1c 100644 --- a/src/ca/legacy/pcas/generic/st/casDGEvWakeup.h +++ b/src/ca/legacy/pcas/generic/st/casDGEvWakeup.h @@ -1,5 +1,3 @@ - - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -9,9 +7,6 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -// -// $Revision-Id$ -// #ifndef casDGEvWakeuph #define casDGEvWakeuph diff --git a/src/ca/legacy/pcas/generic/st/casDGIOWakeup.h b/src/ca/legacy/pcas/generic/st/casDGIOWakeup.h index d9ffb8f79..0f71ce607 100644 --- a/src/ca/legacy/pcas/generic/st/casDGIOWakeup.h +++ b/src/ca/legacy/pcas/generic/st/casDGIOWakeup.h @@ -1,4 +1,3 @@ - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -8,9 +7,6 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -// -// $Revision-Id$ -// #ifndef casDGIOWakeuph #define casDGIOWakeuph diff --git a/src/ca/legacy/pcas/generic/st/casDGIntfOS.cc b/src/ca/legacy/pcas/generic/st/casDGIntfOS.cc index 92e26ff4e..0ce4258d1 100644 --- a/src/ca/legacy/pcas/generic/st/casDGIntfOS.cc +++ b/src/ca/legacy/pcas/generic/st/casDGIntfOS.cc @@ -9,7 +9,6 @@ // // casDGIntfOS.cc -// $Revision-Id$ // #include "fdManager.h" diff --git a/src/ca/legacy/pcas/generic/st/casDGIntfOS.h b/src/ca/legacy/pcas/generic/st/casDGIntfOS.h index 4919daa46..38d4b46ac 100644 --- a/src/ca/legacy/pcas/generic/st/casDGIntfOS.h +++ b/src/ca/legacy/pcas/generic/st/casDGIntfOS.h @@ -1,4 +1,3 @@ - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -8,9 +7,6 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -// -// $Revision-Id$ -// #ifndef casDGIntfOSh #define casDGIntfOSh diff --git a/src/ca/legacy/pcas/generic/st/casIntfOS.cc b/src/ca/legacy/pcas/generic/st/casIntfOS.cc index 4f86db965..87d24a0a4 100644 --- a/src/ca/legacy/pcas/generic/st/casIntfOS.cc +++ b/src/ca/legacy/pcas/generic/st/casIntfOS.cc @@ -9,11 +9,7 @@ \*************************************************************************/ /* - * * casIntfOS.cc - * $Revision-Id$ - * - * */ #include "fdManager.h" diff --git a/src/ca/legacy/pcas/generic/st/casIntfOS.h b/src/ca/legacy/pcas/generic/st/casIntfOS.h index 68c21bded..40d077bb0 100644 --- a/src/ca/legacy/pcas/generic/st/casIntfOS.h +++ b/src/ca/legacy/pcas/generic/st/casIntfOS.h @@ -1,4 +1,3 @@ - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -9,12 +8,8 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ // -// $Revision-Id$ -// // casOSD.h - Channel Access Server OS dependent wrapper // -// -// #ifndef casIntfOSh #define casIntfOSh diff --git a/src/ca/legacy/pcas/generic/st/casOSD.h b/src/ca/legacy/pcas/generic/st/casOSD.h index 980c7b560..0fb8baf46 100644 --- a/src/ca/legacy/pcas/generic/st/casOSD.h +++ b/src/ca/legacy/pcas/generic/st/casOSD.h @@ -8,12 +8,8 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ // -// $Revision-Id$ -// // casOSD.h - Channel Access Server OS dependent wrapper // -// -// #ifndef includeCASOSDH #define includeCASOSDH diff --git a/src/ca/legacy/pcas/generic/st/casStreamOS.cc b/src/ca/legacy/pcas/generic/st/casStreamOS.cc index e1fedb38a..1b6c4e2c2 100644 --- a/src/ca/legacy/pcas/generic/st/casStreamOS.cc +++ b/src/ca/legacy/pcas/generic/st/casStreamOS.cc @@ -8,7 +8,6 @@ \*************************************************************************/ // // casStreamOS.cc -// $Revision-Id$ // // TO DO: // o armRecv() and armSend() should return bad status when diff --git a/src/ca/legacy/pcas/generic/st/casStreamOS.h b/src/ca/legacy/pcas/generic/st/casStreamOS.h index 294cfcb5e..7d0612c18 100644 --- a/src/ca/legacy/pcas/generic/st/casStreamOS.h +++ b/src/ca/legacy/pcas/generic/st/casStreamOS.h @@ -1,4 +1,3 @@ - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -8,9 +7,6 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -// -// $Revision-Id$ -// #ifndef casStreamOSh #define casStreamOSh diff --git a/src/ca/legacy/pcas/generic/st/ioBlocked.cc b/src/ca/legacy/pcas/generic/st/ioBlocked.cc index b05f0ba26..4d5856f6a 100644 --- a/src/ca/legacy/pcas/generic/st/ioBlocked.cc +++ b/src/ca/legacy/pcas/generic/st/ioBlocked.cc @@ -9,7 +9,6 @@ \*************************************************************************/ // -// $Revision-Id$ // Author Jeff Hill // // IO Blocked list class diff --git a/src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc b/src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc index 8e5c356a6..04c729654 100644 --- a/src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc +++ b/src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc @@ -7,11 +7,8 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ // -// $Revision-Id$ -// // verify connection state prior to doing anything in this file // -// #include #include diff --git a/src/ca/legacy/pcas/io/bsdSocket/caServerIO.h b/src/ca/legacy/pcas/io/bsdSocket/caServerIO.h index b45903cff..980549c3e 100644 --- a/src/ca/legacy/pcas/io/bsdSocket/caServerIO.h +++ b/src/ca/legacy/pcas/io/bsdSocket/caServerIO.h @@ -1,5 +1,3 @@ - - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -9,9 +7,6 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -// -// $Revision-Id$ -// #ifndef caServerIOh #define caServerIOh diff --git a/src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.h b/src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.h index 370bfe1d1..f84190cab 100644 --- a/src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.h +++ b/src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.h @@ -1,4 +1,3 @@ - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -8,9 +7,6 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -// -// $Revision-Id$ -// #ifndef casDGIntfIOh #define casDGIntfIOh diff --git a/src/ca/legacy/pcas/io/bsdSocket/casIOD.h b/src/ca/legacy/pcas/io/bsdSocket/casIOD.h index 2940874fd..318efb81b 100644 --- a/src/ca/legacy/pcas/io/bsdSocket/casIOD.h +++ b/src/ca/legacy/pcas/io/bsdSocket/casIOD.h @@ -7,9 +7,6 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -// -// $Revision-Id$ -// #ifndef includeCASIODH #define includeCASIODH diff --git a/src/ca/legacy/pcas/io/bsdSocket/casIntfIO.h b/src/ca/legacy/pcas/io/bsdSocket/casIntfIO.h index 833533d5e..dd9f333b3 100644 --- a/src/ca/legacy/pcas/io/bsdSocket/casIntfIO.h +++ b/src/ca/legacy/pcas/io/bsdSocket/casIntfIO.h @@ -1,4 +1,3 @@ - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -8,9 +7,6 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -// -// $Revision-Id$ -// #ifndef casIntfIOh #define casIntfIOh diff --git a/src/ca/legacy/pcas/io/bsdSocket/casStreamIO.h b/src/ca/legacy/pcas/io/bsdSocket/casStreamIO.h index e1ac52580..6d25ea3bf 100644 --- a/src/ca/legacy/pcas/io/bsdSocket/casStreamIO.h +++ b/src/ca/legacy/pcas/io/bsdSocket/casStreamIO.h @@ -7,10 +7,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ -// -// $Revision-Id$ -// - #ifndef casStreamIOh #define casStreamIOh diff --git a/src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.cpp b/src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.cpp index 9c7f06336..79fba2c79 100644 --- a/src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.cpp +++ b/src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.cpp @@ -7,8 +7,6 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ - -// // // Author: Jeffrey O. Hill // johill@lanl.gov diff --git a/src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.h b/src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.h index bf9ee4791..d27a77f18 100644 --- a/src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.h +++ b/src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.h @@ -1,5 +1,3 @@ - - /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. @@ -9,9 +7,6 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -// -// $Revision-Id$ -// #ifndef ipIgnoreEntryh #define ipIgnoreEntryh diff --git a/src/ioc/as/asDbLib.h b/src/ioc/as/asDbLib.h index b0c3516f6..65c4c6f59 100644 --- a/src/ioc/as/asDbLib.h +++ b/src/ioc/as/asDbLib.h @@ -7,8 +7,6 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* share/epicsH/dbAsLib.h */ -/* $Revision-Id$ */ /* Author: Marty Kraimer Date: 02-23-94*/ #ifndef INCdbAsLibh diff --git a/src/ioc/as/ascheck.c b/src/ioc/as/ascheck.c index e7303f87f..7272ef4ae 100644 --- a/src/ioc/as/ascheck.c +++ b/src/ioc/as/ascheck.c @@ -7,9 +7,8 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ */ /* Author: Marty Kraimer Date: 03-24-94 */ - + #include #include #include diff --git a/src/ioc/bpt/cvtTable.h b/src/ioc/bpt/cvtTable.h index 3147db934..374666450 100644 --- a/src/ioc/bpt/cvtTable.h +++ b/src/ioc/bpt/cvtTable.h @@ -7,7 +7,7 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ +/* * Breakpoint Tables * * Author: Marty Kraimer diff --git a/src/ioc/bpt/makeBpt.c b/src/ioc/bpt/makeBpt.c index 9ea334362..93095f1c2 100644 --- a/src/ioc/bpt/makeBpt.c +++ b/src/ioc/bpt/makeBpt.c @@ -7,7 +7,7 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ +/* * Author: Marty Kraimer * Date: 9/28/95 * Replacement for old bldCvtTable diff --git a/src/ioc/db/callback.h b/src/ioc/db/callback.h index d306f2ab9..d25b782c9 100644 --- a/src/ioc/db/callback.h +++ b/src/ioc/db/callback.h @@ -7,7 +7,6 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ */ /* includes for general purpose callback tasks */ /* diff --git a/src/ioc/db/cvtBpt.c b/src/ioc/db/cvtBpt.c index 21d6938b0..2689483ee 100644 --- a/src/ioc/db/cvtBpt.c +++ b/src/ioc/db/cvtBpt.c @@ -7,7 +7,6 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ */ /* cvtBpt.c - Convert using breakpoint table * diff --git a/src/ioc/db/dbAccess.c b/src/ioc/db/dbAccess.c index bdfe86eab..d624fa5e4 100644 --- a/src/ioc/db/dbAccess.c +++ b/src/ioc/db/dbAccess.c @@ -9,7 +9,7 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ - +/* dbAccess.c */ /* * Original Author: Bob Dalesio * Current Author: Marty Kraimer @@ -403,19 +403,29 @@ struct rset * dbGetRset(const struct dbAddr *paddr) } long dbPutAttribute( - const char *recordTypename,const char *name,const char*value) + const char *recordTypename, const char *name, const char *value) { - DBENTRY dbEntry; - DBENTRY *pdbEntry = &dbEntry; - long status=0; + DBENTRY dbEntry; + DBENTRY *pdbEntry = &dbEntry; + long status = 0; - if(!pdbbase) return(S_db_notFound); - dbInitEntry(pdbbase,pdbEntry); - status = dbFindRecordType(pdbEntry,recordTypename); - if(!status) status = dbPutRecordAttribute(pdbEntry,name,value); - dbFinishEntry(pdbEntry); - if(status) errMessage(status,"dbPutAttribute failure"); - return(status); + if (!pdbbase) + return S_db_notFound; + if (!name) { + status = S_db_badField; + goto done; + } + if (!value) + value = ""; + dbInitEntry(pdbbase, pdbEntry); + status = dbFindRecordType(pdbEntry, recordTypename); + if (!status) + status = dbPutRecordAttribute(pdbEntry, name, value); + dbFinishEntry(pdbEntry); +done: + if (status) + errMessage(status, "dbPutAttribute failure"); + return status; } int dbIsValueField(const struct dbFldDes *pdbFldDes) diff --git a/src/ioc/db/dbAccessDefs.h b/src/ioc/db/dbAccessDefs.h index e0e8f4484..8fbf4d551 100644 --- a/src/ioc/db/dbAccessDefs.h +++ b/src/ioc/db/dbAccessDefs.h @@ -7,7 +7,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* dbAccessDefs.h */ -/* $Revision-Id$ */ #ifndef INCdbAccessDefsh #define INCdbAccessDefsh diff --git a/src/ioc/db/dbBkpt.c b/src/ioc/db/dbBkpt.c index 4059dd2d3..347e28cd4 100644 --- a/src/ioc/db/dbBkpt.c +++ b/src/ioc/db/dbBkpt.c @@ -8,7 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* dbBkpt.c */ -/* base/src/db $Revision-Id$ */ /* * Author: Matthew Needes * Date: 8-30-93 diff --git a/src/ioc/db/dbBkpt.h b/src/ioc/db/dbBkpt.h index 49c905289..7240b701c 100644 --- a/src/ioc/db/dbBkpt.h +++ b/src/ioc/db/dbBkpt.h @@ -8,7 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* dbBkpt.h */ -/* base/include $Revision-Id$ */ /* * Author: Matthew Needes * Date: 8-30-93 diff --git a/src/ioc/db/dbCAC.h b/src/ioc/db/dbCAC.h index 92d6a2689..2d97fac35 100644 --- a/src/ioc/db/dbCAC.h +++ b/src/ioc/db/dbCAC.h @@ -8,16 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * - * - * L O S A L A M O S - * Los Alamos National Laboratory - * Los Alamos, New Mexico 87545 - * - * Copyright, 1986, The Regents of the University of California. - * - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ioc/db/dbCa.c b/src/ioc/db/dbCa.c index d05b8c7e5..b9f18c478 100644 --- a/src/ioc/db/dbCa.c +++ b/src/ioc/db/dbCa.c @@ -6,11 +6,10 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* dbCa.c - * + +/* * Original Authors: Bob Dalesio and Marty Kraimer * Date: 26MAR96 - * */ #define EPICS_DBCA_PRIVATE_API #include diff --git a/src/ioc/db/dbChannelIO.cpp b/src/ioc/db/dbChannelIO.cpp index 6ac1efbdb..a086d3e56 100644 --- a/src/ioc/db/dbChannelIO.cpp +++ b/src/ioc/db/dbChannelIO.cpp @@ -7,17 +7,7 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* - * $Revision-Id$ - * - * - * L O S A L A M O S - * Los Alamos National Laboratory - * Los Alamos, New Mexico 87545 - * - * Copyright, 1986, The Regents of the University of California. - * - * +/* * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ioc/db/dbChannelIO.h b/src/ioc/db/dbChannelIO.h index 42c9cb5c9..5eb7c4eb2 100644 --- a/src/ioc/db/dbChannelIO.h +++ b/src/ioc/db/dbChannelIO.h @@ -9,16 +9,6 @@ \*************************************************************************/ /* - * $Revision-Id$ - * - * - * L O S A L A M O S - * Los Alamos National Laboratory - * Los Alamos, New Mexico 87545 - * - * Copyright, 1986, The Regents of the University of California. - * - * * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ioc/db/dbCommon.dbd b/src/ioc/db/dbCommon.dbd index f58d8d78c..c01847c71 100644 --- a/src/ioc/db/dbCommon.dbd +++ b/src/ioc/db/dbCommon.dbd @@ -4,7 +4,7 @@ # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. # EPICS BASE is distributed subject to a Software License Agreement found -# in file LICENSE that is included with this distribution. +# in file LICENSE that is included with this distribution. #************************************************************************* %#include "epicsTypes.h" %#include "link.h" @@ -15,59 +15,59 @@ } field(DESC,DBF_STRING) { prompt("Descriptor") - promptgroup(GUI_COMMON) + promptgroup("10 - Common") size(41) } field(ASG,DBF_STRING) { prompt("Access Security Group") - promptgroup(GUI_COMMON) + promptgroup("10 - Common") special(SPC_AS) size(29) } field(SCAN,DBF_MENU) { prompt("Scan Mechanism") - promptgroup(GUI_SCAN) + promptgroup("20 - Scan") special(SPC_SCAN) interest(1) menu(menuScan) } field(PINI,DBF_MENU) { prompt("Process at iocInit") - promptgroup(GUI_SCAN) + promptgroup("20 - Scan") interest(1) menu(menuPini) } field(PHAS,DBF_SHORT) { prompt("Scan Phase") - promptgroup(GUI_SCAN) + promptgroup("20 - Scan") special(SPC_SCAN) interest(1) } field(EVNT,DBF_STRING) { prompt("Event Name") - promptgroup(GUI_SCAN) + promptgroup("20 - Scan") special(SPC_SCAN) size(40) interest(1) } field(TSE,DBF_SHORT) { prompt("Time Stamp Event") - promptgroup(GUI_SCAN) + promptgroup("20 - Scan") interest(1) } field(TSEL,DBF_INLINK) { prompt("Time Stamp Link") - promptgroup(GUI_SCAN) + promptgroup("20 - Scan") interest(1) } field(DTYP,DBF_DEVICE) { prompt("Device Type") - promptgroup(GUI_LINKS) + promptgroup("10 - Common") interest(1) } field(DISV,DBF_SHORT) { prompt("Disable Value") - promptgroup(GUI_SCAN) + promptgroup("20 - Scan") initial("1") } field(DISA,DBF_SHORT) { @@ -75,7 +75,7 @@ } field(SDIS,DBF_INLINK) { prompt("Scanning Disable") - promptgroup(GUI_SCAN) + promptgroup("20 - Scan") interest(1) } %#include "epicsMutex.h" @@ -137,7 +137,7 @@ } field(ACKT,DBF_MENU) { prompt("Alarm Ack Transient") - promptgroup(GUI_ALARMS) + promptgroup("70 - Alarm") special(SPC_NOMOD) interest(2) menu(menuYesNo) @@ -145,7 +145,7 @@ } field(DISS,DBF_MENU) { prompt("Disable Alarm Sevrty") - promptgroup(GUI_SCAN) + promptgroup("70 - Alarm") interest(1) menu(menuAlarmSevr) } @@ -225,7 +225,7 @@ } field(PRIO,DBF_MENU) { prompt("Scheduling Priority") - promptgroup(GUI_SCAN) + promptgroup("20 - Scan") special(SPC_SCAN) interest(1) menu(menuPriority) @@ -241,14 +241,14 @@ } field(UDF,DBF_UCHAR) { prompt("Undefined") - promptgroup(GUI_COMMON) + promptgroup("10 - Common") pp(TRUE) interest(1) initial("1") } field(UDFS,DBF_MENU) { prompt("Undefined Alarm Sevrty") - promptgroup(GUI_COMMON) + promptgroup("70 - Alarm") interest(1) menu(menuAlarmSevr) initial("INVALID") @@ -262,6 +262,6 @@ } field(FLNK,DBF_FWDLINK) { prompt("Forward Process Link") - promptgroup(GUI_LINKS) + promptgroup("20 - Scan") interest(1) } diff --git a/src/ioc/db/dbContext.cpp b/src/ioc/db/dbContext.cpp index c0f57b759..832820206 100644 --- a/src/ioc/db/dbContext.cpp +++ b/src/ioc/db/dbContext.cpp @@ -6,17 +6,7 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* - * $Revision-Id$ - * - * - * L O S A L A M O S - * Los Alamos National Laboratory - * Los Alamos, New Mexico 87545 - * - * Copyright, 1986, The Regents of the University of California. - * - * +/* * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ioc/db/dbContextReadNotifyCache.cpp b/src/ioc/db/dbContextReadNotifyCache.cpp index b172068be..e3196b25d 100644 --- a/src/ioc/db/dbContextReadNotifyCache.cpp +++ b/src/ioc/db/dbContextReadNotifyCache.cpp @@ -9,7 +9,6 @@ \*************************************************************************/ /* - * $Revision-Id$ * Auther Jeff Hill */ diff --git a/src/ioc/db/dbEvent.c b/src/ioc/db/dbEvent.c index b3fce746a..5e386dd5c 100644 --- a/src/ioc/db/dbEvent.c +++ b/src/ioc/db/dbEvent.c @@ -9,6 +9,7 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ +/* dbEvent.c */ /* * Author: Jeffrey O. Hill diff --git a/src/ioc/db/dbFastLinkConv.c b/src/ioc/db/dbFastLinkConv.c index e358eaa2e..8bd053033 100644 --- a/src/ioc/db/dbFastLinkConv.c +++ b/src/ioc/db/dbFastLinkConv.c @@ -8,7 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* dbFastLinkConv.c */ -/* base/src/db $Revision-Id$ */ /* * Author: Matthew Needes * Date: 12-9-93 diff --git a/src/ioc/db/dbLink.c b/src/ioc/db/dbLink.c index a224eac0f..b532a3270 100644 --- a/src/ioc/db/dbLink.c +++ b/src/ioc/db/dbLink.c @@ -1,13 +1,13 @@ /*************************************************************************\ * Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE is distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* dbLink.c - * + * National Laboratory. + * Copyright (c) 2002 The Regents of the University of California, as + * Operator of Los Alamos National Laboratory. + * EPICS BASE is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. + \*************************************************************************/ +/* dbLink.c */ +/* * Original Authors: Bob Dalesio, Marty Kraimer * Current Author: Andrew Johnson */ @@ -254,6 +254,7 @@ static long dbDbGetValue(struct link *plink, short dbrType, void *pbuffer, return S_db_badDbrtype; if (paddr->no_elements == 1 && (!pnRequest || *pnRequest == 1) + && paddr->special != SPC_DBADDR && paddr->special != SPC_ATTRIBUTE) { ppv_link->getCvt = dbFastGetConvertRoutine[dbfType][dbrType]; status = ppv_link->getCvt(paddr->pfield, pbuffer, paddr); diff --git a/src/ioc/db/dbNotify.c b/src/ioc/db/dbNotify.c index c322bc65f..c718d3740 100644 --- a/src/ioc/db/dbNotify.c +++ b/src/ioc/db/dbNotify.c @@ -6,7 +6,7 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ - +/* dbNotify.c */ /* * Author: Marty Kraimer * Andrew Johnson diff --git a/src/ioc/db/dbPutNotifyBlocker.cpp b/src/ioc/db/dbPutNotifyBlocker.cpp index 54cdec9fe..1a796cdbd 100644 --- a/src/ioc/db/dbPutNotifyBlocker.cpp +++ b/src/ioc/db/dbPutNotifyBlocker.cpp @@ -7,18 +7,8 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* - * $Revision-Id$ - * - * - * L O S A L A M O S - * Los Alamos National Laboratory - * Los Alamos, New Mexico 87545 - * - * Copyright, 1986, The Regents of the University of California. - * - * - * Author: +/* + * Author: * Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ioc/db/dbPutNotifyBlocker.h b/src/ioc/db/dbPutNotifyBlocker.h index 78acc0a13..6ca11cc5d 100644 --- a/src/ioc/db/dbPutNotifyBlocker.h +++ b/src/ioc/db/dbPutNotifyBlocker.h @@ -8,17 +8,7 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* - * $Revision-Id$ - * - * - * L O S A L A M O S - * Los Alamos National Laboratory - * Los Alamos, New Mexico 87545 - * - * Copyright, 1986, The Regents of the University of California. - * - * +/* * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ioc/db/dbScan.h b/src/ioc/db/dbScan.h index 83ff550d5..4ec6dda60 100644 --- a/src/ioc/db/dbScan.h +++ b/src/ioc/db/dbScan.h @@ -6,8 +6,7 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ - * +/* * Author: Marty Kraimer * Date: 07-17-91 */ diff --git a/src/ioc/db/dbSubscriptionIO.cpp b/src/ioc/db/dbSubscriptionIO.cpp index 70864b2dd..5b9b85ef5 100644 --- a/src/ioc/db/dbSubscriptionIO.cpp +++ b/src/ioc/db/dbSubscriptionIO.cpp @@ -7,17 +7,7 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* - * $Revision-Id$ - * - * - * L O S A L A M O S - * Los Alamos National Laboratory - * Los Alamos, New Mexico 87545 - * - * Copyright, 1986, The Regents of the University of California. - * - * +/* * Author Jeffrey O. Hill * johill@lanl.gov * 505 665 1831 diff --git a/src/ioc/db/dbTest.c b/src/ioc/db/dbTest.c index d7d778d7f..97279de08 100644 --- a/src/ioc/db/dbTest.c +++ b/src/ioc/db/dbTest.c @@ -7,7 +7,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ */ /* database access test subroutines */ #include @@ -941,7 +940,9 @@ static void printBuffer( } else { for (i = 0; i < no_elements; i+= MAXLINE - 5) { - sprintf(pmsg, " \"%.*s\"", MAXLINE - 5, (char *)pbuffer + i); + int width = no_elements - i; + if (width > MAXLINE - 5) width = MAXLINE - 5; + sprintf(pmsg, " \"%.*s\"", width, (char *)pbuffer + i); if (i + MAXLINE - 5 < no_elements) strcat(pmsg, " +"); dbpr_msgOut(pMsgBuff, tab_size); } diff --git a/src/ioc/db/db_access.c b/src/ioc/db/db_access.c index 3e957b4ed..35712ddd6 100644 --- a/src/ioc/db/db_access.c +++ b/src/ioc/db/db_access.c @@ -39,6 +39,7 @@ #include "dbChannel.h" #include "dbCommon.h" #include "dbEvent.h" +#include "dbLock.h" #include "dbNotify.h" #include "dbStaticLib.h" #include "recSup.h" @@ -153,28 +154,30 @@ int dbChannel_get_count( * in the dbAccess.c dbGet() and getOptions() routines. */ + dbScanLock(dbChannelRecord(chan)); + switch(buffer_type) { case(oldDBR_STRING): - status = dbChannelGetField(chan, DBR_STRING, pbuffer, &zero, nRequest, pfl); + status = dbChannelGet(chan, DBR_STRING, pbuffer, &zero, nRequest, pfl); break; /* case(oldDBR_INT): */ case(oldDBR_SHORT): - status = dbChannelGetField(chan, DBR_SHORT, pbuffer, &zero, nRequest, pfl); + status = dbChannelGet(chan, DBR_SHORT, pbuffer, &zero, nRequest, pfl); break; case(oldDBR_FLOAT): - status = dbChannelGetField(chan, DBR_FLOAT, pbuffer, &zero, nRequest, pfl); + status = dbChannelGet(chan, DBR_FLOAT, pbuffer, &zero, nRequest, pfl); break; case(oldDBR_ENUM): - status = dbChannelGetField(chan, DBR_ENUM, pbuffer, &zero, nRequest, pfl); + status = dbChannelGet(chan, DBR_ENUM, pbuffer, &zero, nRequest, pfl); break; case(oldDBR_CHAR): - status = dbChannelGetField(chan, DBR_CHAR, pbuffer, &zero, nRequest, pfl); + status = dbChannelGet(chan, DBR_CHAR, pbuffer, &zero, nRequest, pfl); break; case(oldDBR_LONG): - status = dbChannelGetField(chan, DBR_LONG, pbuffer, &zero, nRequest, pfl); + status = dbChannelGet(chan, DBR_LONG, pbuffer, &zero, nRequest, pfl); break; case(oldDBR_DOUBLE): - status = dbChannelGetField(chan, DBR_DOUBLE, pbuffer, &zero, nRequest, pfl); + status = dbChannelGet(chan, DBR_DOUBLE, pbuffer, &zero, nRequest, pfl); break; case(oldDBR_STS_STRING): @@ -187,10 +190,10 @@ int dbChannel_get_count( } newSt; options = DBR_STATUS; - status = dbChannelGetField(chan, DBR_STRING, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_STRING, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; - status = dbChannelGetField(chan, DBR_STRING, pold->value, &zero, + status = dbChannelGet(chan, DBR_STRING, pold->value, &zero, nRequest, pfl); } break; @@ -203,10 +206,10 @@ int dbChannel_get_count( } newSt; options = DBR_STATUS; - status = dbChannelGetField(chan, DBR_SHORT, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_SHORT, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; - status = dbChannelGetField(chan, DBR_SHORT, &pold->value, &zero, + status = dbChannelGet(chan, DBR_SHORT, &pold->value, &zero, nRequest, pfl); } break; @@ -218,10 +221,10 @@ int dbChannel_get_count( } newSt; options = DBR_STATUS; - status = dbChannelGetField(chan, DBR_FLOAT, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_FLOAT, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; - status = dbChannelGetField(chan, DBR_FLOAT, &pold->value, &zero, + status = dbChannelGet(chan, DBR_FLOAT, &pold->value, &zero, nRequest, pfl); } break; @@ -233,10 +236,10 @@ int dbChannel_get_count( } newSt; options = DBR_STATUS; - status = dbChannelGetField(chan, DBR_ENUM, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_ENUM, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; - status = dbChannelGetField(chan, DBR_ENUM, &pold->value, &zero, + status = dbChannelGet(chan, DBR_ENUM, &pold->value, &zero, nRequest, pfl); } break; @@ -248,10 +251,10 @@ int dbChannel_get_count( } newSt; options = DBR_STATUS; - status = dbChannelGetField(chan, DBR_UCHAR, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_UCHAR, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; - status = dbChannelGetField(chan, DBR_UCHAR, &pold->value, &zero, + status = dbChannelGet(chan, DBR_UCHAR, &pold->value, &zero, nRequest, pfl); } break; @@ -263,10 +266,10 @@ int dbChannel_get_count( } newSt; options = DBR_STATUS; - status = dbChannelGetField(chan, DBR_LONG, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_LONG, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; - status = dbChannelGetField(chan, DBR_LONG, &pold->value, &zero, + status = dbChannelGet(chan, DBR_LONG, &pold->value, &zero, nRequest, pfl); } break; @@ -278,11 +281,11 @@ int dbChannel_get_count( } newSt; options = DBR_STATUS; - status = dbChannelGetField(chan, DBR_DOUBLE, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_DOUBLE, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; options = 0; - status = dbChannelGetField(chan, DBR_DOUBLE, &pold->value, &options, + status = dbChannelGet(chan, DBR_DOUBLE, &pold->value, &options, nRequest, pfl); } break; @@ -296,12 +299,12 @@ int dbChannel_get_count( } newSt; options = DBR_STATUS | DBR_TIME; - status = dbChannelGetField(chan, DBR_STRING, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_STRING, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; pold->stamp = newSt.time; /* structure copy */ options = 0; - status = dbChannelGetField(chan, DBR_STRING, pold->value, &options, + status = dbChannelGet(chan, DBR_STRING, pold->value, &options, nRequest, pfl); } break; @@ -315,12 +318,12 @@ int dbChannel_get_count( } newSt; options = DBR_STATUS | DBR_TIME; - status = dbChannelGetField(chan, DBR_SHORT, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_SHORT, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; pold->stamp = newSt.time; /* structure copy */ options = 0; - status = dbChannelGetField(chan, DBR_SHORT, &pold->value, &options, + status = dbChannelGet(chan, DBR_SHORT, &pold->value, &options, nRequest, pfl); } break; @@ -333,12 +336,12 @@ int dbChannel_get_count( } newSt; options = DBR_STATUS | DBR_TIME; - status = dbChannelGetField(chan, DBR_FLOAT, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_FLOAT, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; pold->stamp = newSt.time; /* structure copy */ options = 0; - status = dbChannelGetField(chan, DBR_FLOAT, &pold->value, &options, + status = dbChannelGet(chan, DBR_FLOAT, &pold->value, &options, nRequest, pfl); } break; @@ -351,12 +354,12 @@ int dbChannel_get_count( } newSt; options = DBR_STATUS | DBR_TIME; - status = dbChannelGetField(chan, DBR_ENUM, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_ENUM, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; pold->stamp = newSt.time; /* structure copy */ options = 0; - status = dbChannelGetField(chan, DBR_ENUM, &pold->value, &options, + status = dbChannelGet(chan, DBR_ENUM, &pold->value, &options, nRequest, pfl); } break; @@ -369,12 +372,12 @@ int dbChannel_get_count( } newSt; options = DBR_STATUS | DBR_TIME; - status = dbChannelGetField(chan, DBR_CHAR, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_CHAR, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; pold->stamp = newSt.time; /* structure copy */ options = 0; - status = dbChannelGetField(chan, DBR_CHAR, &pold->value, &options, + status = dbChannelGet(chan, DBR_CHAR, &pold->value, &options, nRequest, pfl); } break; @@ -387,12 +390,12 @@ int dbChannel_get_count( } newSt; options = DBR_STATUS | DBR_TIME; - status = dbChannelGetField(chan, DBR_LONG, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_LONG, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; pold->stamp = newSt.time; /* structure copy */ options = 0; - status = dbChannelGetField(chan, DBR_LONG, &pold->value, &options, + status = dbChannelGet(chan, DBR_LONG, &pold->value, &options, nRequest, pfl); } break; @@ -405,12 +408,12 @@ int dbChannel_get_count( } newSt; options = DBR_STATUS | DBR_TIME; - status = dbChannelGetField(chan, DBR_DOUBLE, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_DOUBLE, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; pold->stamp = newSt.time; /* structure copy */ options = 0; - status = dbChannelGetField(chan, DBR_DOUBLE, &pold->value, &options, + status = dbChannelGet(chan, DBR_DOUBLE, &pold->value, &options, nRequest, pfl); } break; @@ -428,7 +431,7 @@ int dbChannel_get_count( } newSt; options = DBR_STATUS | DBR_UNITS | DBR_GR_LONG | DBR_AL_LONG; - status = dbChannelGetField(chan, DBR_SHORT, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_SHORT, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; strncpy(pold->units, newSt.units, MAX_UNITS_SIZE); @@ -440,7 +443,7 @@ int dbChannel_get_count( pold->lower_warning_limit = newSt.lower_warning_limit; pold->lower_alarm_limit = newSt.lower_alarm_limit; options = 0; - status = dbChannelGetField(chan, DBR_SHORT, &pold->value, &options, + status = dbChannelGet(chan, DBR_SHORT, &pold->value, &options, nRequest, pfl); } break; @@ -457,7 +460,7 @@ int dbChannel_get_count( options = DBR_STATUS | DBR_UNITS | DBR_PRECISION | DBR_GR_DOUBLE | DBR_AL_DOUBLE; - status = dbChannelGetField(chan, DBR_FLOAT, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_FLOAT, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; pold->precision = (dbr_short_t) newSt.precision.dp; @@ -470,7 +473,7 @@ int dbChannel_get_count( pold->upper_warning_limit = epicsConvertDoubleToFloat(newSt.upper_warning_limit); pold->lower_warning_limit = epicsConvertDoubleToFloat(newSt.lower_warning_limit); options = 0; - status = dbChannelGetField(chan, DBR_FLOAT, &pold->value, &options, + status = dbChannelGet(chan, DBR_FLOAT, &pold->value, &options, nRequest, pfl); } break; @@ -486,7 +489,7 @@ int dbChannel_get_count( } newSt; options = DBR_STATUS | DBR_UNITS | DBR_GR_LONG | DBR_AL_LONG; - status = dbChannelGetField(chan, DBR_UCHAR, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_UCHAR, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; strncpy(pold->units, newSt.units, MAX_UNITS_SIZE); @@ -498,7 +501,7 @@ int dbChannel_get_count( pold->lower_warning_limit = newSt.lower_warning_limit; pold->lower_alarm_limit = newSt.lower_alarm_limit; options = 0; - status = dbChannelGetField(chan, DBR_UCHAR, &pold->value, &options, + status = dbChannelGet(chan, DBR_UCHAR, &pold->value, &options, nRequest, pfl); } break; @@ -513,7 +516,7 @@ int dbChannel_get_count( } newSt; options = DBR_STATUS | DBR_UNITS | DBR_GR_LONG | DBR_AL_LONG; - status = dbChannelGetField(chan, DBR_LONG, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_LONG, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; strncpy(pold->units, newSt.units, MAX_UNITS_SIZE); @@ -525,7 +528,7 @@ int dbChannel_get_count( pold->lower_warning_limit = newSt.lower_warning_limit; pold->lower_alarm_limit = newSt.lower_alarm_limit; options = 0; - status = dbChannelGetField(chan, DBR_LONG, &pold->value, &options, + status = dbChannelGet(chan, DBR_LONG, &pold->value, &options, nRequest, pfl); } break; @@ -542,7 +545,7 @@ int dbChannel_get_count( options = DBR_STATUS | DBR_UNITS | DBR_PRECISION | DBR_GR_DOUBLE | DBR_AL_DOUBLE; - status = dbChannelGetField(chan, DBR_DOUBLE, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_DOUBLE, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; pold->precision = (dbr_short_t) newSt.precision.dp; @@ -555,7 +558,7 @@ int dbChannel_get_count( pold->lower_warning_limit = newSt.lower_warning_limit; pold->lower_alarm_limit = newSt.lower_alarm_limit; options = 0; - status = dbChannelGetField(chan, DBR_DOUBLE, &pold->value, &options, + status = dbChannelGet(chan, DBR_DOUBLE, &pold->value, &options, nRequest, pfl); } break; @@ -574,7 +577,7 @@ int dbChannel_get_count( options = DBR_STATUS | DBR_UNITS | DBR_GR_LONG | DBR_CTRL_LONG | DBR_AL_LONG; - status = dbChannelGetField(chan, DBR_SHORT, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_SHORT, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; strncpy(pold->units, newSt.units, MAX_UNITS_SIZE); @@ -588,7 +591,7 @@ int dbChannel_get_count( pold->upper_ctrl_limit = newSt.upper_ctrl_limit; pold->lower_ctrl_limit = newSt.lower_ctrl_limit; options = 0; - status = dbChannelGetField(chan, DBR_SHORT, &pold->value, &options, + status = dbChannelGet(chan, DBR_SHORT, &pold->value, &options, nRequest, pfl); } break; @@ -606,7 +609,7 @@ int dbChannel_get_count( options = DBR_STATUS | DBR_UNITS | DBR_PRECISION | DBR_GR_DOUBLE | DBR_CTRL_DOUBLE | DBR_AL_DOUBLE; - status = dbChannelGetField(chan, DBR_FLOAT, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_FLOAT, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; pold->precision = (dbr_short_t) newSt.precision.dp; @@ -621,7 +624,7 @@ int dbChannel_get_count( pold->upper_ctrl_limit = epicsConvertDoubleToFloat(newSt.upper_ctrl_limit); pold->lower_ctrl_limit = epicsConvertDoubleToFloat(newSt.lower_ctrl_limit); options = 0; - status = dbChannelGetField(chan, DBR_FLOAT, &pold->value, &options, + status = dbChannelGet(chan, DBR_FLOAT, &pold->value, &options, nRequest, pfl); } break; @@ -638,7 +641,7 @@ int dbChannel_get_count( memset(pold, '\0', sizeof(struct dbr_ctrl_enum)); /* first get status and severity */ options = DBR_STATUS | DBR_ENUM_STRS; - status = dbChannelGetField(chan, DBR_ENUM, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_ENUM, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; no_str = newSt.no_str; @@ -648,7 +651,7 @@ int dbChannel_get_count( strncpy(pold->strs[i], newSt.strs[i], sizeof(pold->strs[i])); /*now get values*/ options = 0; - status = dbChannelGetField(chan, DBR_ENUM, &pold->value, &options, + status = dbChannelGet(chan, DBR_ENUM, &pold->value, &options, nRequest, pfl); } break; @@ -665,7 +668,7 @@ int dbChannel_get_count( options = DBR_STATUS | DBR_UNITS | DBR_GR_LONG | DBR_CTRL_LONG | DBR_AL_LONG; - status = dbChannelGetField(chan, DBR_UCHAR, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_UCHAR, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; strncpy(pold->units, newSt.units, MAX_UNITS_SIZE); @@ -679,7 +682,7 @@ int dbChannel_get_count( pold->upper_ctrl_limit = newSt.upper_ctrl_limit; pold->lower_ctrl_limit = newSt.lower_ctrl_limit; options = 0; - status = dbChannelGetField(chan, DBR_UCHAR, &pold->value, &options, + status = dbChannelGet(chan, DBR_UCHAR, &pold->value, &options, nRequest, pfl); } break; @@ -696,7 +699,7 @@ int dbChannel_get_count( options = DBR_STATUS | DBR_UNITS | DBR_GR_LONG | DBR_CTRL_LONG | DBR_AL_LONG; - status = dbChannelGetField(chan, DBR_LONG, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_LONG, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; strncpy(pold->units, newSt.units, MAX_UNITS_SIZE); @@ -710,7 +713,7 @@ int dbChannel_get_count( pold->upper_ctrl_limit = newSt.upper_ctrl_limit; pold->lower_ctrl_limit = newSt.lower_ctrl_limit; options = 0; - status = dbChannelGetField(chan, DBR_LONG, &pold->value, &options, + status = dbChannelGet(chan, DBR_LONG, &pold->value, &options, nRequest, pfl); } break; @@ -728,7 +731,7 @@ int dbChannel_get_count( options = DBR_STATUS | DBR_UNITS | DBR_PRECISION | DBR_GR_DOUBLE | DBR_CTRL_DOUBLE | DBR_AL_DOUBLE; - status = dbChannelGetField(chan, DBR_DOUBLE, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_DOUBLE, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; pold->precision = (dbr_short_t) newSt.precision.dp; @@ -743,7 +746,7 @@ int dbChannel_get_count( pold->upper_ctrl_limit = newSt.upper_ctrl_limit; pold->lower_ctrl_limit = newSt.lower_ctrl_limit; options = 0; - status = dbChannelGetField(chan, DBR_DOUBLE, &pold->value, &options, + status = dbChannelGet(chan, DBR_DOUBLE, &pold->value, &options, nRequest, pfl); } break; @@ -756,13 +759,13 @@ int dbChannel_get_count( } newSt; options = DBR_STATUS; - status = dbChannelGetField(chan, DBR_STRING, &newSt, &options, &zero, pfl); + status = dbChannelGet(chan, DBR_STRING, &newSt, &options, &zero, pfl); pold->status = newSt.status; pold->severity = newSt.severity; pold->ackt = newSt.ackt; pold->acks = newSt.acks; options = 0; - status = dbChannelGetField(chan, DBR_STRING, pold->value, + status = dbChannelGet(chan, DBR_STRING, pold->value, &options, nRequest, pfl); } break; @@ -791,8 +794,12 @@ int dbChannel_get_count( } break; default: - return -1; + status = -1; + break; } + + dbScanUnlock(dbChannelRecord(chan)); + if (status) return -1; return 0; } diff --git a/src/ioc/db/db_access_routines.h b/src/ioc/db/db_access_routines.h index 36b926d1a..f48ebb001 100644 --- a/src/ioc/db/db_access_routines.h +++ b/src/ioc/db/db_access_routines.h @@ -6,7 +6,6 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* base/include/db_access_routines.h */ /* This defined routines for old database access. These were broken out of db_access.h so that ca can be build independent of db. diff --git a/src/ioc/db/db_field_log.h b/src/ioc/db/db_field_log.h index 93a1fefdb..1534517bb 100644 --- a/src/ioc/db/db_field_log.h +++ b/src/ioc/db/db_field_log.h @@ -9,7 +9,6 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ - /* * Author: Jeffrey O. Hill * @@ -19,7 +18,8 @@ #ifndef INCLdb_field_logh #define INCLdb_field_logh -#include "epicsTime.h" +#include +#include #ifdef __cplusplus extern "C" { @@ -32,18 +32,20 @@ extern "C" { * priority task pending on the event queue wakes up). Strings would slow down * events for more reasonable size values. DB fields of native type string * will most likely change infrequently. - * + * + * Strings can be added to the set of types for which updates will be queued + * by defining the macro DB_EVENT_LOG_STRINGS. The code in db_add_event() + * will adjust automatically, it just compares field sizes. */ union native_value { - short dbf_int; - short dbf_short; - float dbf_float; - short dbf_enum; - char dbf_char; - long dbf_long; - double dbf_double; + epicsInt8 dbf_char; + epicsInt16 dbf_short; + epicsEnum16 dbf_enum; + epicsInt32 dbf_long; + epicsFloat32 dbf_float; + epicsFloat64 dbf_double; #ifdef DB_EVENT_LOG_STRINGS - char dbf_string[MAX_STRING_SIZE]; + char dbf_string[MAX_STRING_SIZE]; #endif }; diff --git a/src/ioc/db/db_test.c b/src/ioc/db/db_test.c index 4dc26a07d..b011c6819 100644 --- a/src/ioc/db/db_test.c +++ b/src/ioc/db/db_test.c @@ -6,7 +6,6 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ - /* database access subroutines */ /* * Author: Bob Dalesio diff --git a/src/ioc/db/initHooks.c b/src/ioc/db/initHooks.c index 8590480ae..9070c53f5 100644 --- a/src/ioc/db/initHooks.c +++ b/src/ioc/db/initHooks.c @@ -6,7 +6,6 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ */ /* * Authors: Benjamin Franksen (BESY) and Marty Kraimer * Date: 06-01-91 diff --git a/src/ioc/db/initHooks.h b/src/ioc/db/initHooks.h index c4c84b7b9..429a768db 100644 --- a/src/ioc/db/initHooks.h +++ b/src/ioc/db/initHooks.h @@ -6,7 +6,6 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ */ /* * Authors: Benjamin Franksen (BESY) and Marty Kraimer * Date: 06-01-91 diff --git a/src/ioc/db/recGbl.c b/src/ioc/db/recGbl.c index 7b7affd97..f1e3e7e62 100644 --- a/src/ioc/db/recGbl.c +++ b/src/ioc/db/recGbl.c @@ -6,7 +6,7 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ - +/* recGbl.c */ /* * Author: Marty Kraimer * Andrew Johnson diff --git a/src/ioc/db/test/callbackParallelTest.c b/src/ioc/db/test/callbackParallelTest.c index 6dda789e3..2ccc44375 100644 --- a/src/ioc/db/test/callbackParallelTest.c +++ b/src/ioc/db/test/callbackParallelTest.c @@ -7,7 +7,6 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ */ /* Author: Marty Kraimer Date: 26JAN2000 */ @@ -99,7 +98,7 @@ MAIN(callbackParallelTest) myPvt *pcbt[NCALLBACKS]; epicsTimeStamp start; int noCpus = epicsThreadGetCPUs(); - int i, j; + int i, j, slowups, faults; /* Statistics: min/max/sum/sum^2/n for each priority */ double setupError[NUM_CALLBACK_PRIORITIES][5]; double timeError[NUM_CALLBACK_PRIORITIES][5]; @@ -109,7 +108,7 @@ MAIN(callbackParallelTest) for (j = 0; j < 5; j++) setupError[i][j] = timeError[i][j] = defaultError[j]; - testPlan(NCALLBACKS * 2 + 1); + testPlan(4); testDiag("Starting %d parallel callback threads", noCpus); @@ -138,7 +137,7 @@ MAIN(callbackParallelTest) pcbt[NCALLBACKS-1]->delay = TEST_DELAY(NCALLBACKS) + 1.0; pcbt[NCALLBACKS-1]->pass = 0; - testOk1(epicsTimeGetCurrent(&start)==epicsTimeOK); + testOk(epicsTimeGetCurrent(&start)==epicsTimeOK, "Time-of-day clock Ok"); for (i = 0; i < NCALLBACKS ; i++) { callbackRequest(&pcbt[i]->cb1); @@ -147,28 +146,43 @@ MAIN(callbackParallelTest) testDiag("Waiting %.02f sec", pcbt[NCALLBACKS-1]->delay); epicsEventWait(finished); - + slowups = 0; + faults = 0; + for (i = 0; i < NCALLBACKS ; i++) { if(pcbt[i]->resultFail || pcbt[i]->pass!=2) - testFail("pass = %d for delay = %f", pcbt[i]->pass, pcbt[i]->delay); + testDiag("callback setup fault #%d: pass = %d for delay = %.02f", + ++faults, pcbt[i]->pass, pcbt[i]->delay); else { double delta = epicsTimeDiffInSeconds(&pcbt[i]->pass1Time, &start); - testOk(fabs(delta) < 0.05, "callback %.02f setup time |%f| < 0.05", + + if (fabs(delta) >= 0.05) { + slowups++; + testDiag("callback %.02f setup time |%f| >= 0.05 seconds", pcbt[i]->delay, delta); + } updateStats(setupError[i%NUM_CALLBACK_PRIORITIES], delta); } } + testOk(faults == 0, "%d faults during callback setup", faults); + testOk(slowups <= 1, "%d slowups during callback setup", slowups); + slowups = 0; for (i = 0; i < NCALLBACKS ; i++) { double delta, error; + if(pcbt[i]->resultFail || pcbt[i]->pass!=2) continue; delta = epicsTimeDiffInSeconds(&pcbt[i]->pass2Time, &pcbt[i]->pass1Time); error = delta - pcbt[i]->delay; - testOk(fabs(error) < 0.05, "delay %.02f seconds, callback time error |%.04f| < 0.05", + if (fabs(error) >= 0.05) { + slowups++; + testDiag("delay %.02f seconds, delay error |%.04f| >= 0.05", pcbt[i]->delay, error); + } updateStats(timeError[i%NUM_CALLBACK_PRIORITIES], error); } + testOk(slowups < 5, "%d slowups during callbacks", slowups); testDiag("Setup time statistics"); printStats(setupError[0], "LOW"); diff --git a/src/ioc/db/test/callbackTest.c b/src/ioc/db/test/callbackTest.c index d733f99d7..7032a7cd1 100644 --- a/src/ioc/db/test/callbackTest.c +++ b/src/ioc/db/test/callbackTest.c @@ -7,7 +7,6 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ */ /* Author: Marty Kraimer Date: 26JAN2000 */ @@ -99,7 +98,7 @@ MAIN(callbackTest) { myPvt *pcbt[NCALLBACKS]; epicsTimeStamp start; - int i, j; + int i, j, slowups, faults; /* Statistics: min/max/sum/sum^2/n for each priority */ double setupError[NUM_CALLBACK_PRIORITIES][5]; double timeError[NUM_CALLBACK_PRIORITIES][5]; @@ -109,7 +108,7 @@ MAIN(callbackTest) for (j = 0; j < 5; j++) setupError[i][j] = timeError[i][j] = defaultError[j]; - testPlan(NCALLBACKS * 2 + 1); + testPlan(4); callbackInit(); epicsThreadSleep(1.0); @@ -135,7 +134,7 @@ MAIN(callbackTest) pcbt[NCALLBACKS-1]->delay = TEST_DELAY(NCALLBACKS) + 1.0; pcbt[NCALLBACKS-1]->pass = 0; - testOk1(epicsTimeGetCurrent(&start)==epicsTimeOK); + testOk(epicsTimeGetCurrent(&start)==epicsTimeOK, "Time-of-day clock Ok"); for (i = 0; i < NCALLBACKS ; i++) { callbackRequest(&pcbt[i]->cb1); @@ -144,28 +143,43 @@ MAIN(callbackTest) testDiag("Waiting %.02f sec", pcbt[NCALLBACKS-1]->delay); epicsEventWait(finished); - + slowups = 0; + faults = 0; + for (i = 0; i < NCALLBACKS ; i++) { if(pcbt[i]->resultFail || pcbt[i]->pass!=2) - testFail("pass = %d for delay = %f", pcbt[i]->pass, pcbt[i]->delay); + testDiag("callback setup fault #%d: pass = %d for delay = %.02f", + ++faults, pcbt[i]->pass, pcbt[i]->delay); else { double delta = epicsTimeDiffInSeconds(&pcbt[i]->pass1Time, &start); - testOk(fabs(delta) < 0.05, "callback %.02f setup time |%f| < 0.05", + + if (fabs(delta) >= 0.05) { + slowups++; + testDiag("callback %.02f setup time |%f| >= 0.05 seconds", pcbt[i]->delay, delta); + } updateStats(setupError[i%NUM_CALLBACK_PRIORITIES], delta); } } + testOk(faults == 0, "%d faults during callback setup", faults); + testOk(slowups <= 1, "%d slowups during callback setup", slowups); + slowups = 0; for (i = 0; i < NCALLBACKS ; i++) { double delta, error; + if(pcbt[i]->resultFail || pcbt[i]->pass!=2) continue; delta = epicsTimeDiffInSeconds(&pcbt[i]->pass2Time, &pcbt[i]->pass1Time); error = delta - pcbt[i]->delay; - testOk(fabs(error) < 0.05, "delay %.02f seconds, callback time error |%.04f| < 0.05", + if (fabs(error) >= 0.05) { + slowups++; + testDiag("delay %.02f seconds, delay error |%.04f| >= 0.05", pcbt[i]->delay, error); + } updateStats(timeError[i%NUM_CALLBACK_PRIORITIES], error); } + testOk(slowups < 5, "%d slowups during callbacks", slowups); testDiag("Setup time statistics"); printStats(setupError[0], "LOW"); diff --git a/src/ioc/dbStatic/dbBase.h b/src/ioc/dbStatic/dbBase.h index adf5f1d60..55a06ebb8 100644 --- a/src/ioc/dbStatic/dbBase.h +++ b/src/ioc/dbStatic/dbBase.h @@ -6,8 +6,7 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ - * +/* * Current Author: Marty Kraimer * Date: 03-19-92 */ @@ -166,8 +165,9 @@ typedef struct dbBase { ELLLIST functionList; ELLLIST variableList; ELLLIST bptList; - ELLLIST filterList; - void *pathPvt; + ELLLIST filterList; + ELLLIST guiGroupList; + void *pathPvt; struct dbPvd *ppvd; struct gphPvt *pgpHash; short ignoreMissingMenus; diff --git a/src/ioc/dbStatic/dbFldTypes.h b/src/ioc/dbStatic/dbFldTypes.h index 39f17c8ed..0d2b9e1da 100644 --- a/src/ioc/dbStatic/dbFldTypes.h +++ b/src/ioc/dbStatic/dbFldTypes.h @@ -7,8 +7,7 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ - * +/* * Author: Marty Kraimer * Date: 6-1-90 */ diff --git a/src/ioc/dbStatic/dbLexRoutines.c b/src/ioc/dbStatic/dbLexRoutines.c index 2bbf272c1..c1444269c 100644 --- a/src/ioc/dbStatic/dbLexRoutines.c +++ b/src/ioc/dbStatic/dbLexRoutines.c @@ -6,7 +6,6 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ */ /* Author: Marty Kraimer Date: 13JUL95*/ @@ -34,7 +33,6 @@ #include "dbStaticLib.h" #include "dbStaticPvt.h" #include "epicsExport.h" -#include "guigroup.h" #include "link.h" #include "special.h" @@ -71,6 +69,7 @@ static void dbRecordtypeEmpty(void); static void dbRecordtypeBody(void); static void dbRecordtypeFieldHead(char *name,char *type); static void dbRecordtypeFieldItem(char *name,char *value); +static short findOrAddGuiGroup(const char *name); static void dbDevice(char *recordtype,char *linktype, char *dsetname,char *choicestring); @@ -502,7 +501,23 @@ static void dbRecordtypeFieldHead(char *name,char *type) yyerrorAbort("Illegal Field Type"); pdbFldDes->field_type = i; } - + +static short findOrAddGuiGroup(const char *name) +{ + dbGuiGroup *pdbGuiGroup; + GPHENTRY *pgphentry; + pgphentry = gphFind(pdbbase->pgpHash, name, &pdbbase->guiGroupList); + if (!pgphentry) { + pdbGuiGroup = dbCalloc(1,sizeof(dbGuiGroup)); + pdbGuiGroup->name = epicsStrDup(name); + ellAdd(&pdbbase->guiGroupList, &pdbGuiGroup->node); + pdbGuiGroup->key = ellCount(&pdbbase->guiGroupList); + pgphentry = gphAdd(pdbbase->pgpHash, pdbGuiGroup->name, &pdbbase->guiGroupList); + pgphentry->userPvt = pdbGuiGroup; + } + return ((dbGuiGroup *)pgphentry->userPvt)->key; +} + static void dbRecordtypeFieldItem(char *name,char *value) { dbFldDes *pdbFldDes; @@ -524,14 +539,7 @@ static void dbRecordtypeFieldItem(char *name,char *value) return; } if(strcmp(name,"promptgroup")==0) { - int i; - for(i=0; ipromptgroup = pamapguiGroup[i].value; - return; - } - } - yyerror("Illegal promptgroup. See guigroup.h for legal values"); + pdbFldDes->promptgroup = findOrAddGuiGroup(value); return; } if(strcmp(name,"prompt")==0) { diff --git a/src/ioc/dbStatic/dbStaticLib.c b/src/ioc/dbStatic/dbStaticLib.c index e0b514c81..f4e5b6317 100644 --- a/src/ioc/dbStatic/dbStaticLib.c +++ b/src/ioc/dbStatic/dbStaticLib.c @@ -6,7 +6,6 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ */ #include #include @@ -31,7 +30,6 @@ #include "postfix.h" #define DBFLDTYPES_GBLSOURCE -#define GUIGROUPS_GBLSOURCE #define SPECIAL_GBLSOURCE #define epicsExportSharedSymbols @@ -41,7 +39,6 @@ #include "dbStaticPvt.h" #include "devSup.h" #include "drvSup.h" -#include "guigroup.h" #include "link.h" #include "special.h" @@ -433,6 +430,7 @@ dbBase * dbAllocBase(void) ellInit(&pdbbase->variableList); ellInit(&pdbbase->bptList); ellInit(&pdbbase->filterList); + ellInit(&pdbbase->guiGroupList); gphInitPvt(&pdbbase->pgpHash,256); dbPvdInitPvt(pdbbase); return (pdbbase); @@ -458,8 +456,10 @@ void dbFreeBase(dbBase *pdbbase) drvSup *pdrvSupNext; brkTable *pbrkTable; brkTable *pbrkTableNext; - chFilterPlugin *pfilt; - chFilterPlugin *pfiltNext; + chFilterPlugin *pfilt; + chFilterPlugin *pfiltNext; + dbGuiGroup *pguiGroup; + dbGuiGroup *pguiGroupNext; int i; DBENTRY dbentry; @@ -600,6 +600,15 @@ void dbFreeBase(dbBase *pdbbase) free(pfilt); pfilt = pfiltNext; } + pguiGroup = (dbGuiGroup *)ellFirst(&pdbbase->guiGroupList); + while (pguiGroup) { + pguiGroupNext = (dbGuiGroup *)ellNext(&pguiGroup->node); + gphDelete(pdbbase->pgpHash, pguiGroup->name, &pdbbase->guiGroupList); + ellDelete(&pdbbase->guiGroupList, &pguiGroup->node); + free(pguiGroup->name); + free((void *)pguiGroup); + pguiGroup = pguiGroupNext; + } gphFreeMem(pdbbase->pgpHash); dbPvdFreeMem(pdbbase); dbFreePath(pdbbase); @@ -754,6 +763,31 @@ static long dbAddOnePath (DBBASE *pdbbase, const char *path, unsigned length) return 0; } +char *dbGetPromptGroupNameFromKey(DBBASE *pdbbase, const short key) +{ + dbGuiGroup *pdbGuiGroup; + + if (!pdbbase) return NULL; + for (pdbGuiGroup = (dbGuiGroup *)ellFirst(&pdbbase->guiGroupList); + pdbGuiGroup; pdbGuiGroup = (dbGuiGroup *)ellNext(&pdbGuiGroup->node)) { + if (pdbGuiGroup->key == key) return pdbGuiGroup->name; + } + return NULL; +} + +short dbGetPromptGroupKeyFromName(DBBASE *pdbbase, const char *name) +{ + GPHENTRY *pgphentry; + + if (!pdbbase) return 0; + pgphentry = gphFind(pdbbase->pgpHash, name, &pdbbase->guiGroupList); + if (!pgphentry) { + return 0; + } else { + return ((dbGuiGroup*)pgphentry->userPvt)->key; + } +} + long dbWriteRecord(DBBASE *ppdbbase,const char *filename, const char *precordTypename,int level) @@ -953,16 +987,11 @@ long dbWriteRecordTypeFP( fprintf(fp,"\t\tprompt(\"%s\")\n",pdbFldDes->prompt); if(pdbFldDes->initial) fprintf(fp,"\t\tinitial(\"%s\")\n",pdbFldDes->initial); - if(pdbFldDes->promptgroup) { - for(j=0; jpromptgroup) { - fprintf(fp,"\t\tpromptgroup(%s)\n", - pamapguiGroup[j].strvalue); - break; - } - } - } - if(pdbFldDes->special) { + if (pdbFldDes->promptgroup) { + fprintf(fp,"\t\tpromptgroup(\"%s\")\n", + dbGetPromptGroupNameFromKey(pdbbase, pdbFldDes->promptgroup)); + } + if(pdbFldDes->special) { if(pdbFldDes->special >= SPC_NTYPES) { fprintf(fp,"\t\tspecial(%d)\n",pdbFldDes->special); } else for(j=0; jpromptgroup) { printf("\t promptgroup: %d\n",pdbFldDes->promptgroup); } else { - for(j=0; jpromptgroup) { - printf("\t promptgroup: %s\n", - pamapguiGroup[j].strvalue); - break; - } - } - } + printf("\t promptgroup: %s\n", + dbGetPromptGroupNameFromKey(pdbbase, pdbFldDes->promptgroup)); + } printf("\t interest: %hd\n", pdbFldDes->interest); printf("\t as_level: %d\n",pdbFldDes->as_level); printf("\t initial: %s\n", diff --git a/src/ioc/dbStatic/dbStaticLib.h b/src/ioc/dbStatic/dbStaticLib.h index 93f7f27d2..de94dc674 100644 --- a/src/ioc/dbStatic/dbStaticLib.h +++ b/src/ioc/dbStatic/dbStaticLib.h @@ -6,8 +6,7 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ - * +/* * Author: Marty Kraimer * Date: 06-08-93 */ @@ -81,6 +80,10 @@ epicsShareFunc long dbReadDatabaseFP(DBBASE **ppdbbase, FILE *fp, const char *path, const char *substitutions); epicsShareFunc long dbPath(DBBASE *pdbbase, const char *path); epicsShareFunc long dbAddPath(DBBASE *pdbbase, const char *path); +epicsShareFunc char * dbGetPromptGroupNameFromKey(DBBASE *pdbbase, + const short key); +epicsShareFunc short dbGetPromptGroupKeyFromName(DBBASE *pdbbase, + const char *name); epicsShareFunc long dbWriteRecord(DBBASE *ppdbbase, const char *filename, const char *precordTypename, int level); epicsShareFunc long dbWriteRecordFP(DBBASE *ppdbbase, diff --git a/src/ioc/dbStatic/dbStaticPvt.h b/src/ioc/dbStatic/dbStaticPvt.h index 8e58e9535..ca6e51806 100644 --- a/src/ioc/dbStatic/dbStaticPvt.h +++ b/src/ioc/dbStatic/dbStaticPvt.h @@ -75,6 +75,13 @@ typedef struct dbPathNode { char *directory; } dbPathNode; +/* Element of the global gui group list */ +typedef struct dbGuiGroup { + ELLNODE node; + short key; + char *name; +} dbGuiGroup; + /*The following are in dbPvdLib.c*/ /*directory*/ typedef struct{ diff --git a/src/ioc/dbStatic/devSup.h b/src/ioc/dbStatic/devSup.h index 0f2fc339b..bd900cae4 100644 --- a/src/ioc/dbStatic/devSup.h +++ b/src/ioc/dbStatic/devSup.h @@ -7,7 +7,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* devSup.h Device Support */ -/* $Revision-Id$ */ /* * Author: Marty Kraimer * Date: 6-1-90 diff --git a/src/ioc/dbStatic/drvSup.h b/src/ioc/dbStatic/drvSup.h index 9f743ed6f..5778038e7 100644 --- a/src/ioc/dbStatic/drvSup.h +++ b/src/ioc/dbStatic/drvSup.h @@ -7,7 +7,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* drvSup.h Driver Support */ -/* share/epicsH $Revision-Id$ */ /* * Author: Marty Kraimer diff --git a/src/ioc/dbStatic/guigroup.h b/src/ioc/dbStatic/guigroup.h index 5d97a4f8c..4e2f2e1dd 100644 --- a/src/ioc/dbStatic/guigroup.h +++ b/src/ioc/dbStatic/guigroup.h @@ -8,7 +8,7 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ +/* these are used in the pmt (prompt) field of the record support ascii files. They represent field groupings for dct tools */ @@ -16,68 +16,11 @@ #ifndef __gui_group_h__ #define __gui_group_h__ -#define GUI_COMMON 1 -#define GUI_ALARMS 2 -#define GUI_BITS1 3 -#define GUI_BITS2 4 -#define GUI_CALC 5 -#define GUI_CLOCK 6 -#define GUI_COMPRESS 7 -#define GUI_CONVERT 8 -#define GUI_DISPLAY 9 -#define GUI_HIST 10 -#define GUI_INPUTS 11 -#define GUI_LINKS 12 -#define GUI_MBB 13 -#define GUI_MOTOR 14 -#define GUI_OUTPUT 15 -#define GUI_PID 16 -#define GUI_PULSE 17 -#define GUI_SELECT 18 -#define GUI_SEQ1 19 -#define GUI_SEQ2 20 -#define GUI_SEQ3 21 -#define GUI_SUB 22 -#define GUI_TIMER 23 -#define GUI_WAVE 24 -#define GUI_SCAN 25 -#define GUI_NTYPES 25 - -typedef struct mapguiGroup{ - char *strvalue; - int value; -}mapguiGroup; - -#ifndef GUIGROUPS_GBLSOURCE -extern mapguiGroup pamapguiGroup[]; -#else -mapguiGroup pamapguiGroup[GUI_NTYPES] = { - {"GUI_COMMON",GUI_COMMON}, - {"GUI_ALARMS",GUI_ALARMS}, - {"GUI_BITS1",GUI_BITS1}, - {"GUI_BITS2",GUI_BITS2}, - {"GUI_CALC",GUI_CALC}, - {"GUI_CLOCK",GUI_CLOCK}, - {"GUI_COMPRESS",GUI_COMPRESS}, - {"GUI_CONVERT",GUI_CONVERT}, - {"GUI_DISPLAY",GUI_DISPLAY}, - {"GUI_HIST",GUI_HIST}, - {"GUI_INPUTS",GUI_INPUTS}, - {"GUI_LINKS",GUI_LINKS}, - {"GUI_MBB",GUI_MBB}, - {"GUI_MOTOR",GUI_MOTOR}, - {"GUI_OUTPUT",GUI_OUTPUT}, - {"GUI_PID",GUI_PID}, - {"GUI_PULSE",GUI_PULSE}, - {"GUI_SELECT",GUI_SELECT}, - {"GUI_SEQ1",GUI_SEQ1}, - {"GUI_SEQ2",GUI_SEQ2}, - {"GUI_SEQ3",GUI_SEQ3}, - {"GUI_SUB",GUI_SUB}, - {"GUI_TIMER",GUI_TIMER}, - {"GUI_WAVE",GUI_WAVE}, - {"GUI_SCAN",GUI_SCAN} -}; -#endif /*GUIGROUPS_GBLSOURCE*/ +#error As of Base 3.15.4, the promptgroup implementation has changed. \ + This header file (guigroup.h) is invalid and will be removed shortly. \ + Instead, you should include dbStaticLib.h, parse the DBD, \ + and use dbGetPromptGroupNameFromKey() and dbGetPromptGroupKeyFromName() \ + that have been added to dbStaticLib. \ + More details in the 3.15.4 release notes and the AppDev Guide. #endif /*__gui_group_h__*/ diff --git a/src/ioc/dbStatic/link.h b/src/ioc/dbStatic/link.h index e0063a68b..efa065a58 100644 --- a/src/ioc/dbStatic/link.h +++ b/src/ioc/dbStatic/link.h @@ -7,7 +7,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* link.h */ -/* $Id$ */ /* * Original Authors: Bob Dalesio, Marty Kraimer diff --git a/src/ioc/dbStatic/special.h b/src/ioc/dbStatic/special.h index ca8c0eaeb..055287a64 100644 --- a/src/ioc/dbStatic/special.h +++ b/src/ioc/dbStatic/special.h @@ -8,7 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* special.h */ -/* share/epicsH $Revision-Id$ */ /* * Author: Marty Kraimer diff --git a/src/ioc/misc/dbCore.dbd b/src/ioc/misc/dbCore.dbd index 42e84c251..4b515141b 100644 --- a/src/ioc/misc/dbCore.dbd +++ b/src/ioc/misc/dbCore.dbd @@ -1,7 +1,5 @@ # dbCore.dbd # -# $Revision-Id$ -# # This file provides iocsh access to variables that control some lesser-used # and debugging features of the IOC database code. diff --git a/src/ioc/misc/epicsRelease.c b/src/ioc/misc/epicsRelease.c index d6e87cd35..7ee89fcda 100644 --- a/src/ioc/misc/epicsRelease.c +++ b/src/ioc/misc/epicsRelease.c @@ -6,9 +6,6 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* - * $Revision-Id$ - */ #include #include diff --git a/src/ioc/misc/iocInit.c b/src/ioc/misc/iocInit.c index ba0ea345d..9ff7f722f 100644 --- a/src/ioc/misc/iocInit.c +++ b/src/ioc/misc/iocInit.c @@ -8,7 +8,6 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ */ /* * Original Author: Marty Kraimer * Date: 06-01-91 @@ -23,10 +22,12 @@ #include #include +#include "dbBase.h" #include "dbDefs.h" #include "ellLib.h" #include "envDefs.h" #include "epicsExit.h" +#include "epicsGeneralTime.h" #include "epicsPrint.h" #include "epicsSignal.h" #include "epicsThread.h" @@ -78,6 +79,7 @@ static enum { /* define forward references*/ static int checkDatabase(dbBase *pdbbase); +static void checkGeneralTime(void); static void initDrvSup(void); static void initRecSup(void); static void initDevSup(void); @@ -129,6 +131,7 @@ static int iocBuild_1(void) coreRelease(); iocState = iocBuilding; + checkGeneralTime(); taskwdInit(); callbackInit(); initHookAnnounce(initHookAfterCallbackInit); @@ -354,6 +357,22 @@ static int checkDatabase(dbBase *pdbbase) return 0; } +static void checkGeneralTime(void) +{ + epicsTimeStamp ts; + + epicsTimeGetCurrent(&ts); + if (ts.secPastEpoch < 2*24*60*60) { + static const char * const tsfmt = "%Y-%m-%d %H:%M:%S.%09f"; + char buff[40]; + + epicsTimeToStrftime(buff, sizeof(buff), tsfmt, &ts); + errlogPrintf("iocInit: Time provider has not yet synchronized.\n"); + } + + epicsTimeGetEvent(&ts, 1); /* Prime gtPvt.lastEventProvider for ISRs */ +} + static void initDrvSup(void) /* Locate all driver support entry tables */ { diff --git a/src/ioc/misc/iocshRegisterCommon.c b/src/ioc/misc/iocshRegisterCommon.c index 0341dfbd6..fefa716b9 100644 --- a/src/ioc/misc/iocshRegisterCommon.c +++ b/src/ioc/misc/iocshRegisterCommon.c @@ -7,6 +7,8 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ +#include "envDefs.h" +#include "epicsVersion.h" #include "iocsh.h" #include "libComRegister.h" @@ -21,10 +23,29 @@ #include "registryIocRegister.h" #include "rsrvIocRegister.h" +#define quote(v) #v +#define str(v) quote(v) + void iocshRegisterCommon(void) { + const char *targetArch = envGetConfigParamPtr(&EPICS_BUILD_TARGET_ARCH); iocshPpdbbase = &pdbbase; + /* This uses a config param so the user can override it */ + if (targetArch) { + epicsEnvSet("ARCH", targetArch); + } + + /* Base build version variables */ + epicsEnvSet("EPICS_VERSION_MAJOR", str(EPICS_VERSION)); + epicsEnvSet("EPICS_VERSION_MIDDLE", str(EPICS_REVISION)); + epicsEnvSet("EPICS_VERSION_MINOR", str(EPICS_MODIFICATION)); + epicsEnvSet("EPICS_VERSION_PATCH", str(EPICS_PATCH_LEVEL)); + epicsEnvSet("EPICS_VERSION_SNAPSHOT", EPICS_DEV_SNAPSHOT); + epicsEnvSet("EPICS_VERSION_SITE", EPICS_SITE_VERSION); + epicsEnvSet("EPICS_VERSION_SHORT", EPICS_VERSION_SHORT); + epicsEnvSet("EPICS_VERSION_FULL", EPICS_VERSION_FULL); + dbStaticIocRegister(); registryIocRegister(); dbIocRegister(); diff --git a/src/ioc/rsrv/camessage.c b/src/ioc/rsrv/camessage.c index b992b46eb..b5c265ca6 100644 --- a/src/ioc/rsrv/camessage.c +++ b/src/ioc/rsrv/camessage.c @@ -1112,7 +1112,7 @@ unsigned cid * casAccessRightsCB() * * If access right state changes then inform the client. - * + * asLock is held */ static void casAccessRightsCB(ASCLIENTPVT ascpvt, asClientStatus type) { @@ -1568,6 +1568,9 @@ static void sendAllUpdateAS ( struct client *client ) else if ( pciu->state == rsrvCS_inServiceUpdatePendAR ) { access_rights_reply ( pciu ); } + else if ( pciu->state == rsrvCS_shutdown ) { + /* no-op */ + } else { errlogPrintf ( "%s at %d: corrupt channel state detected durring AR update\n", @@ -2047,10 +2050,15 @@ static int clear_channel_reply ( caHdrLargeArray *mp, if ( pciu->state == rsrvCS_inService || pciu->state == rsrvCS_pendConnectResp ) { ellDelete ( &client->chanList, &pciu->node ); + pciu->state = rsrvCS_shutdown; } else if ( pciu->state == rsrvCS_inServiceUpdatePendAR || pciu->state == rsrvCS_pendConnectRespUpdatePendAR ) { ellDelete ( &client->chanPendingUpdateARList, &pciu->node ); + pciu->state = rsrvCS_shutdown; + } + else if ( pciu->state == rsrvCS_shutdown ) { + /* no-op */ } else { epicsMutexUnlock( client->chanListLock ); diff --git a/src/ioc/rsrv/caservertask.c b/src/ioc/rsrv/caservertask.c index 310cabb29..a8c590452 100644 --- a/src/ioc/rsrv/caservertask.c +++ b/src/ioc/rsrv/caservertask.c @@ -11,10 +11,7 @@ \*************************************************************************/ /* - * $Revision-Id$ - * * Author: Jeffrey O. Hill - * */ #include @@ -1134,6 +1131,7 @@ static void destroyAllChannels ( epicsMutexMustLock ( client->chanListLock ); pciu = (struct channel_in_use *) ellGet ( pList ); + if(pciu) pciu->state = rsrvCS_shutdown; epicsMutexUnlock ( client->chanListLock ); if ( ! pciu ) { diff --git a/src/ioc/rsrv/online_notify.c b/src/ioc/rsrv/online_notify.c index 619fdc4e5..d1d557943 100644 --- a/src/ioc/rsrv/online_notify.c +++ b/src/ioc/rsrv/online_notify.c @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * tell CA clients this a server has joined the network * * Author: Jeffrey O. Hill diff --git a/src/ioc/rsrv/rsrv.h b/src/ioc/rsrv/rsrv.h index 84414fc8d..10947cdf0 100644 --- a/src/ioc/rsrv/rsrv.h +++ b/src/ioc/rsrv/rsrv.h @@ -8,8 +8,6 @@ \*************************************************************************/ /* - * $Revision-Id$ - * * Author: Jeffrey O. Hill * hill@luke.lanl.gov * (505) 665 1831 diff --git a/src/ioc/rsrv/server.h b/src/ioc/rsrv/server.h index a1094c2eb..d2a1cf3f4 100644 --- a/src/ioc/rsrv/server.h +++ b/src/ioc/rsrv/server.h @@ -99,12 +99,25 @@ typedef struct client { char disconnect; /* disconnect detected */ } client; +/* Channel state shows which struct client list a + * channel_in_us::node is in. + * + * client::chanList + * rsrvCS_pendConnectResp, rsrvCS_inService + * client::chanPendingUpdateARList + * rsrvCS_pendConnectRespUpdatePendAR, rsrvCS_inServiceUpdatePendAR + * Not in any list + * rsrvCS_shutdown + * + * rsrvCS_invalid is not used + */ enum rsrvChanState { rsrvCS_invalid, rsrvCS_pendConnectResp, rsrvCS_inService, rsrvCS_pendConnectRespUpdatePendAR, - rsrvCS_inServiceUpdatePendAR + rsrvCS_inServiceUpdatePendAR, + rsrvCS_shutdown }; /* diff --git a/src/libCom/Makefile b/src/libCom/Makefile index 43aef2d46..ee93ada0a 100644 --- a/src/libCom/Makefile +++ b/src/libCom/Makefile @@ -50,13 +50,17 @@ Com_SYS_LIBS_WIN32 = ws2_32 advapi32 user32 Com_RCS = Com.rc +ifeq ($(T_A),$(EPICS_HOST_ARCH)) + # Antelope & flex are needed to finish libCom + DELAY_INSTALL_LIBS = YES +endif + include $(TOP)/configure/RULES include $(LIBCOM)/as/RULES include $(LIBCOM)/env/RULES include $(LIBCOM)/error/RULES include $(LIBCOM)/flex/RULES -include $(LIBCOM)/log/RULES include $(LIBCOM)/misc/RULES include $(LIBCOM)/osi/RULES diff --git a/src/libCom/RTEMS/epicsRtemsInitHookPost.c b/src/libCom/RTEMS/epicsRtemsInitHookPost.c index da2fbeab4..f589eb9cf 100644 --- a/src/libCom/RTEMS/epicsRtemsInitHookPost.c +++ b/src/libCom/RTEMS/epicsRtemsInitHookPost.c @@ -8,7 +8,6 @@ /* * Dummy version -- use if application does not provide its own version - * $Revision-Id$ */ #include "epicsRtemsInitHooks.h" diff --git a/src/libCom/RTEMS/epicsRtemsInitHookPre.c b/src/libCom/RTEMS/epicsRtemsInitHookPre.c index 357952007..08efe1fe2 100644 --- a/src/libCom/RTEMS/epicsRtemsInitHookPre.c +++ b/src/libCom/RTEMS/epicsRtemsInitHookPre.c @@ -8,7 +8,6 @@ /* * Dummy version -- use if application does not provide its own version - * $Revision-Id$ */ #include "epicsRtemsInitHooks.h" diff --git a/src/libCom/RTEMS/epicsRtemsInitHooks.h b/src/libCom/RTEMS/epicsRtemsInitHooks.h index fac577a06..b7f09c100 100644 --- a/src/libCom/RTEMS/epicsRtemsInitHooks.h +++ b/src/libCom/RTEMS/epicsRtemsInitHooks.h @@ -8,7 +8,6 @@ /* * Hooks into RTEMS startup code - * $Revision-Id$ */ #include #include diff --git a/src/libCom/RTEMS/rtems_config.c b/src/libCom/RTEMS/rtems_config.c index ff5fb8128..147c08b10 100644 --- a/src/libCom/RTEMS/rtems_config.c +++ b/src/libCom/RTEMS/rtems_config.c @@ -6,7 +6,6 @@ \*************************************************************************/ /* * RTEMS configuration for EPICS - * $Revision-Id$ * Author: W. Eric Norum * norume@aps.anl.gov * (630) 252-4793 diff --git a/src/libCom/RTEMS/rtems_init.c b/src/libCom/RTEMS/rtems_init.c index f990523e3..84634672b 100644 --- a/src/libCom/RTEMS/rtems_init.c +++ b/src/libCom/RTEMS/rtems_init.c @@ -6,7 +6,6 @@ \*************************************************************************/ /* * RTEMS startup task for EPICS - * $Revision-Id$ * Author: W. Eric Norum * eric.norum@usask.ca * (306) 966-5394 diff --git a/src/libCom/RTEMS/rtems_netconfig.c b/src/libCom/RTEMS/rtems_netconfig.c index 910961153..832a6646b 100644 --- a/src/libCom/RTEMS/rtems_netconfig.c +++ b/src/libCom/RTEMS/rtems_netconfig.c @@ -5,7 +5,6 @@ \*************************************************************************/ /* * RTEMS network configuration for EPICS - * $Revision-Id$ * Author: W. Eric Norum * eric.norum@usask.ca * (306) 966-5394 diff --git a/src/libCom/RTEMS/rtems_util.c b/src/libCom/RTEMS/rtems_util.c index 82e405027..ca64f9650 100644 --- a/src/libCom/RTEMS/rtems_util.c +++ b/src/libCom/RTEMS/rtems_util.c @@ -6,7 +6,6 @@ \*************************************************************************/ /* * RTEMS utilitiy routines for EPICS - * $Revision-Id$ * Author: W. Eric Norum * eric@cls.usask.ca * (306) 966-6055 diff --git a/src/libCom/bucketLib/bucketLib.h b/src/libCom/bucketLib/bucketLib.h index e232d706e..60d73b459 100644 --- a/src/libCom/bucketLib/bucketLib.h +++ b/src/libCom/bucketLib/bucketLib.h @@ -7,8 +7,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author: Jeffrey O. Hill * hill@luke.lanl.gov * (505) 665 1831 diff --git a/src/libCom/calc/calcPerform.c b/src/libCom/calc/calcPerform.c index e53d860e2..c0f4aebb8 100644 --- a/src/libCom/calc/calcPerform.c +++ b/src/libCom/calc/calcPerform.c @@ -6,7 +6,6 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ */ /* * Author: Julie Sander and Bob Dalesio * Date: 07-27-87 @@ -155,7 +154,7 @@ epicsShareFunc long break; case ABS_VAL: - if (*ptop < 0.0) *ptop = - *ptop; + *ptop = fabs(*ptop); break; case EXP: diff --git a/src/libCom/calc/postfix.c b/src/libCom/calc/postfix.c index 2f51549d0..463ceea82 100644 --- a/src/libCom/calc/postfix.c +++ b/src/libCom/calc/postfix.c @@ -6,8 +6,7 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ - * +/* * Subroutines used to convert an infix expression to a postfix expression * * Original Author: Bob Dalesio diff --git a/src/libCom/cppStd/epicsExcept.h b/src/libCom/cppStd/epicsExcept.h index 50245ecea..e68999735 100644 --- a/src/libCom/cppStd/epicsExcept.h +++ b/src/libCom/cppStd/epicsExcept.h @@ -7,7 +7,6 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -// $Revision-Id$ // Author: Andrew Johnson & Jeff Hill // Date: December 2000 diff --git a/src/libCom/cvtFast/cvtFast.c b/src/libCom/cvtFast/cvtFast.c index 5fef677a2..2f29dd51f 100644 --- a/src/libCom/cvtFast/cvtFast.c +++ b/src/libCom/cvtFast/cvtFast.c @@ -7,7 +7,6 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$*/ /* Very efficient routines to convert numbers to strings * Author: Bob Dalesio wrote cvtFloatToString (called FF_TO_STR) * Code is same for cvtDoubleToString diff --git a/src/libCom/cvtFast/cvtFast.h b/src/libCom/cvtFast/cvtFast.h index fb1971b96..d2eb86ddf 100644 --- a/src/libCom/cvtFast/cvtFast.h +++ b/src/libCom/cvtFast/cvtFast.h @@ -7,7 +7,7 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ +/* * Very efficient routines to convert numbers to strings * * Author: Bob Dalesio wrote cvtFloatToString (called FF_TO_STR) diff --git a/src/libCom/cxxTemplates/epicsGuard.h b/src/libCom/cxxTemplates/epicsGuard.h index acb80b084..f0aa401a5 100644 --- a/src/libCom/cxxTemplates/epicsGuard.h +++ b/src/libCom/cxxTemplates/epicsGuard.h @@ -16,10 +16,7 @@ #endif /* - * $Revision-Id$ - * * Author: Jeffrey O. Hill - * */ template < class T > class epicsGuardRelease; diff --git a/src/libCom/cxxTemplates/epicsSingleton.h b/src/libCom/cxxTemplates/epicsSingleton.h index cece8007c..2c63d3ff7 100644 --- a/src/libCom/cxxTemplates/epicsSingleton.h +++ b/src/libCom/cxxTemplates/epicsSingleton.h @@ -9,10 +9,7 @@ \*************************************************************************/ /* - * $Revision-Id$ - * * Author: Jeffrey O. Hill - * */ #ifndef epicsSingleton_h diff --git a/src/libCom/cxxTemplates/epicsSingletonBase.cpp b/src/libCom/cxxTemplates/epicsSingletonBase.cpp index 438f093c3..bf9a466d4 100644 --- a/src/libCom/cxxTemplates/epicsSingletonBase.cpp +++ b/src/libCom/cxxTemplates/epicsSingletonBase.cpp @@ -8,10 +8,7 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * Author: Jeffrey O. Hill - * */ #include diff --git a/src/libCom/cxxTemplates/epicsSingletonMutex.cpp b/src/libCom/cxxTemplates/epicsSingletonMutex.cpp index 02d5d63c1..8cd69d969 100644 --- a/src/libCom/cxxTemplates/epicsSingletonMutex.cpp +++ b/src/libCom/cxxTemplates/epicsSingletonMutex.cpp @@ -9,10 +9,7 @@ \*************************************************************************/ /* - * $Revision-Id$ - * * Author: Jeff O. Hill - * */ #include diff --git a/src/libCom/cxxTemplates/resourceLib.cpp b/src/libCom/cxxTemplates/resourceLib.cpp index e86f0ed19..f3a9a9993 100644 --- a/src/libCom/cxxTemplates/resourceLib.cpp +++ b/src/libCom/cxxTemplates/resourceLib.cpp @@ -8,14 +8,6 @@ \*************************************************************************/ /* - * $Revision-Id$ - * - * L O S A L A M O S - * Los Alamos National Laboratory - * Los Alamos, New Mexico 87545 - * - * Copyright, 1986, The Regents of the University of California. - * * Author: Jeff Hill */ diff --git a/src/libCom/cxxTemplates/resourceLib.h b/src/libCom/cxxTemplates/resourceLib.h index 4c79f6cca..7b61e238d 100644 --- a/src/libCom/cxxTemplates/resourceLib.h +++ b/src/libCom/cxxTemplates/resourceLib.h @@ -7,8 +7,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * General hash table templates for fast indexing of resources * of any base resource type and any resource identifier type. Fast * indexing is implemented with a hash lookup. The identifier type diff --git a/src/libCom/cxxTemplates/tsDLList.h b/src/libCom/cxxTemplates/tsDLList.h index 96d9dd2fa..a315ecaab 100644 --- a/src/libCom/cxxTemplates/tsDLList.h +++ b/src/libCom/cxxTemplates/tsDLList.h @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * type safe doubly linked list templates * * Author Jeffrey O. Hill diff --git a/src/libCom/cxxTemplates/tsFreeList.h b/src/libCom/cxxTemplates/tsFreeList.h index 70485c5ab..55787ac6b 100644 --- a/src/libCom/cxxTemplates/tsFreeList.h +++ b/src/libCom/cxxTemplates/tsFreeList.h @@ -11,14 +11,7 @@ #ifndef tsFreeList_h #define tsFreeList_h -/* $Revision-Id$ - * - * L O S A L A M O S - * Los Alamos National Laboratory - * Los Alamos, New Mexico 87545 - * - * Copyright, 1986, The Regents of the University of California. - * +/* * Author: Jeff Hill */ diff --git a/src/libCom/cxxTemplates/tsSLList.h b/src/libCom/cxxTemplates/tsSLList.h index acfd4bc8c..ce29a6f5c 100644 --- a/src/libCom/cxxTemplates/tsSLList.h +++ b/src/libCom/cxxTemplates/tsSLList.h @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * type safe singly linked list templates * * Author Jeffrey O. Hill diff --git a/src/libCom/ellLib/ellLib.c b/src/libCom/ellLib/ellLib.c index be1632079..c539a843f 100644 --- a/src/libCom/ellLib/ellLib.c +++ b/src/libCom/ellLib/ellLib.c @@ -6,8 +6,7 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ - * +/* * Author: John Winans (ANL) * Date: 07-02-92 */ diff --git a/src/libCom/ellLib/ellLib.h b/src/libCom/ellLib/ellLib.h index ea90774cf..f99859f3d 100644 --- a/src/libCom/ellLib/ellLib.h +++ b/src/libCom/ellLib/ellLib.h @@ -6,9 +6,7 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ - /* - * * Author: John Winans (ANL) * Andrew Johnson */ diff --git a/src/libCom/env/RULES b/src/libCom/env/RULES index 88d29be17..2737d5d4a 100644 --- a/src/libCom/env/RULES +++ b/src/libCom/env/RULES @@ -8,5 +8,7 @@ # This is a Makefile fragment, see src/libCom/Makefile. envData.c: $(LIBCOM)/env/envDefs.h $(LIBCOM)/env/bldEnvData.pl \ - $(CONFIG)/CONFIG_ENV $(CONFIG)/CONFIG_SITE_ENV - $(PERL) $(LIBCOM)/env/bldEnvData.pl $(QUIET_FLAG) $(CONFIG) + $(CONFIG)/CONFIG_ENV $(CONFIG)/CONFIG_SITE_ENV \ + $(wildcard $(CONFIG)/os/CONFIG_SITE_ENV.$(T_A)) + $(PERL) $(LIBCOM)/env/bldEnvData.pl $(QUIET_FLAG) -t $(T_A) \ + -c $(CMPLR_CLASS) -s $(OS_CLASS) $(CONFIG) diff --git a/src/libCom/env/bldEnvData.pl b/src/libCom/env/bldEnvData.pl index 08d65467e..9df15a535 100644 --- a/src/libCom/env/bldEnvData.pl +++ b/src/libCom/env/bldEnvData.pl @@ -26,13 +26,13 @@ use Text::Wrap; my $tool = basename($0); -our ($opt_h, $opt_q); +our ($opt_h, $opt_q, $opt_t, $opt_s, $opt_c); our $opt_o = 'envData.c'; $Getopt::Std::OUTPUT_HELP_VERSION = 1; $Text::Wrap::columns = 75; -HELP_MESSAGE() unless getopts('ho:q') && @ARGV == 1; +HELP_MESSAGE() unless getopts('ho:qt:s:c:') && @ARGV == 1; HELP_MESSAGE() if $opt_h; my $config = AbsPath(shift); @@ -52,16 +52,31 @@ while () { } close SRC; -# Read the values from the CONFIG_ENV and CONFIG_SITE_ENV files +# A list of configure/CONFIG_* files to read # -my $config_env = "$config/CONFIG_ENV"; -my $config_site_env = "$config/CONFIG_SITE_ENV"; +my @configs = ("$config/CONFIG_ENV", "$config/CONFIG_SITE_ENV"); -my %values; -readReleaseFiles($config_env, \%values); -readReleaseFiles($config_site_env, \%values); +if ($opt_t) { + my $config_arch_env = "$config/os/CONFIG_SITE_ENV.$opt_t"; + push @configs, $config_arch_env + if -f $config_arch_env; +} -# Warn about any vars with no value +my @sources = ($env_defs, @configs); + +# Get values from the config files +# +my (%values, @dummy); +readRelease($_, \%values, \@dummy) foreach @configs; +expandRelease(\%values); + +# Get values from the command-line +# +$values{EPICS_BUILD_COMPILER_CLASS} = $opt_c if $opt_c; +$values{EPICS_BUILD_OS_CLASS} = $opt_s if $opt_s; +$values{EPICS_BUILD_TARGET_ARCH} = $opt_t if $opt_t; + +# Warn about vars with no configured value # my @undefs = grep {!exists $values{$_}} @vars; warn "$tool: No value given for $_\n" foreach @undefs; @@ -73,13 +88,13 @@ print "Generating $opt_o\n" unless $opt_q; open OUT, '>', $opt_o or die "$tool: Cannot create $opt_o: $!\n"; +my $sources = join "\n", map {" * $_"} @sources; + print OUT << "END"; /* Generated file $opt_o * * Created from - * $env_defs - * $config_env - * $config_site_env +$sources */ #include @@ -88,18 +103,23 @@ print OUT << "END"; END -# Define all parameters, giving variable name and default value +# Define a default value for each named parameter # foreach my $var (@vars) { - my $default = $values{$var} || ''; - $default =~ s/^"//; - $default =~ s/"$//; + my $default = $values{$var}; + if (defined $default) { + $default =~ s/^"//; + $default =~ s/"$//; + } + else { + $default = ''; + } print OUT "epicsShareDef const ENV_PARAM $var =\n", " {\"$var\", \"$default\"};\n"; } -# Now create a list of all those parameters +# Also provide a list of all defined parameters # print OUT "\n", "epicsShareDef const ENV_PARAM* env_param_list[] = {\n", @@ -112,6 +132,9 @@ sub HELP_MESSAGE { " -h Help: Print this message\n", " -q Quiet: Only print errors\n", " -o file Output filename, default is $opt_o\n", + " -t arch Target architecture \$(T_A) name\n", + " -s os Operating system \$(OS_CLASS)\n", + " -c comp Compiler class \$(CMPLR_CLASS)\n", "\n"; exit 1; diff --git a/src/libCom/env/envDefs.h b/src/libCom/env/envDefs.h index 01ae5e040..536e63635 100644 --- a/src/libCom/env/envDefs.h +++ b/src/libCom/env/envDefs.h @@ -6,7 +6,7 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ +/* * Author: Roger A. Cole * Date: 07-20-91 * @@ -40,7 +40,7 @@ typedef struct envParam { } ENV_PARAM; /* - * bldEnvData looks for "epicsShareExtern const ENV_PARAM" + * bldEnvData.pl looks for "epicsShareExtern const ENV_PARAM ;" */ epicsShareExtern const ENV_PARAM EPICS_CA_ADDR_LIST; epicsShareExtern const ENV_PARAM EPICS_CA_CONN_TMO; @@ -58,6 +58,9 @@ epicsShareExtern const ENV_PARAM EPICS_CAS_SERVER_PORT; epicsShareExtern const ENV_PARAM EPICS_CA_BEACON_PERIOD; /* deprecated */ epicsShareExtern const ENV_PARAM EPICS_CAS_BEACON_PERIOD; epicsShareExtern const ENV_PARAM EPICS_CAS_BEACON_PORT; +epicsShareExtern const ENV_PARAM EPICS_BUILD_COMPILER_CLASS; +epicsShareExtern const ENV_PARAM EPICS_BUILD_OS_CLASS; +epicsShareExtern const ENV_PARAM EPICS_BUILD_TARGET_ARCH; epicsShareExtern const ENV_PARAM EPICS_TIMEZONE; epicsShareExtern const ENV_PARAM EPICS_TS_NTP_INET; epicsShareExtern const ENV_PARAM EPICS_IOC_LOG_PORT; diff --git a/src/libCom/env/envSubr.c b/src/libCom/env/envSubr.c index 7eb7ed397..283b13290 100644 --- a/src/libCom/env/envSubr.c +++ b/src/libCom/env/envSubr.c @@ -7,7 +7,7 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ +/* * Author: Roger A. Cole * Date: 07-20-91 */ diff --git a/src/libCom/error/errMdef.h b/src/libCom/error/errMdef.h index e511d912b..1df63ad74 100644 --- a/src/libCom/error/errMdef.h +++ b/src/libCom/error/errMdef.h @@ -7,7 +7,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* Error Handling definitions */ -/* $Revision-Id$ */ /* * Author: Marty Kraimer * Date: 6-1-90 diff --git a/src/libCom/error/errSymLib.c b/src/libCom/error/errSymLib.c index f75577b23..84c093c9b 100644 --- a/src/libCom/error/errSymLib.c +++ b/src/libCom/error/errSymLib.c @@ -7,11 +7,11 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ +/* * errSymLib.c * Author: Marty Kraimer * Date: 6-1-90 - * errMessage.c - Handle error messages + * *************************************************************************** * This must ultimately be replaced by a facility that allows remote * nodes access to the error messages. A message handling communication diff --git a/src/libCom/error/error.h b/src/libCom/error/error.h index e951a042d..18cf7eebd 100644 --- a/src/libCom/error/error.h +++ b/src/libCom/error/error.h @@ -8,7 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* error.h - errMessage symbol table header */ -/* share/epicsH $Revision-Id$ */ /* * Author: Marty Kraimer diff --git a/src/libCom/fdmgr/fdManager.cpp b/src/libCom/fdmgr/fdManager.cpp index 8beafe8db..ff5022d81 100644 --- a/src/libCom/fdmgr/fdManager.cpp +++ b/src/libCom/fdmgr/fdManager.cpp @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ // -// $Revision-Id$ -// // File descriptor management C++ class library // (for multiplexing IO in a single threaded environment) // diff --git a/src/libCom/fdmgr/fdManager.h b/src/libCom/fdmgr/fdManager.h index 621a004bc..59a2f355f 100644 --- a/src/libCom/fdmgr/fdManager.h +++ b/src/libCom/fdmgr/fdManager.h @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* - * $Revision-Id$ - * * File descriptor management C++ class library * (for multiplexing IO in a single threaded environment) * diff --git a/src/libCom/fdmgr/fdmgr.cpp b/src/libCom/fdmgr/fdmgr.cpp index 54c0f809c..342bae862 100644 --- a/src/libCom/fdmgr/fdmgr.cpp +++ b/src/libCom/fdmgr/fdmgr.cpp @@ -8,7 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ // -// // File descriptor management C++ class library // (for multiplexing IO in a single threaded environment) // diff --git a/src/libCom/fdmgr/fdmgr.h b/src/libCom/fdmgr/fdmgr.h index 07294c5cc..a227335e7 100644 --- a/src/libCom/fdmgr/fdmgr.h +++ b/src/libCom/fdmgr/fdmgr.h @@ -8,8 +8,6 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ /* fdmgr.h - * - * share/epicsH/$Revision-Id$ * * Header file associated with a file descriptor manager * for use with the UNIX system call select diff --git a/src/libCom/flex/README b/src/libCom/flex/README index 27ef4909c..210290892 100644 --- a/src/libCom/flex/README +++ b/src/libCom/flex/README @@ -1,5 +1,3 @@ -// $Revision-Id$ - This is release 2.3 of flex - a full release. The flex distribution consists of the following files: diff --git a/src/libCom/flex/flex.c b/src/libCom/flex/flex.c index eb966b8e5..196f4e4cc 100644 --- a/src/libCom/flex/flex.c +++ b/src/libCom/flex/flex.c @@ -42,14 +42,6 @@ char copyright[] = All rights reserved.\n"; #endif /* not lint */ -/* -#ifndef lint -static char rcsid[] = - "@(#) $Revision-Id$ (LBL)"; -#endif - -#include "flexdef.h" -*/ #define epicsExportSharedSymbols #include "epicsTempFile.h" diff --git a/src/libCom/flex/flex.html b/src/libCom/flex/flex.html index bb8c240a3..3b6ae9b80 100644 --- a/src/libCom/flex/flex.html +++ b/src/libCom/flex/flex.html @@ -1,12 +1,3 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ 
diff --git a/src/libCom/flex/flex.skel b/src/libCom/flex/flex.skel
index b8fb64090..6b9805b04 100644
--- a/src/libCom/flex/flex.skel
+++ b/src/libCom/flex/flex.skel
@@ -1,8 +1,6 @@
 /* A lexical scanner generated by flex */
 
-/* scanner skeleton version:
- * $Revision-Id$
- */
+/* scanner skeleton */
 
 #define FLEX_SCANNER
 
diff --git a/src/libCom/flex/flex.skel.static b/src/libCom/flex/flex.skel.static
index e4fa7deb1..5e8bf2810 100644
--- a/src/libCom/flex/flex.skel.static
+++ b/src/libCom/flex/flex.skel.static
@@ -1,8 +1,6 @@
 /* A lexical scanner generated by flex */
 
-/* scanner skeleton version:
- * $Revision-Id$
- */
+/* scanner skeleton */
 
 /* modified by Jim Kowalkowski to have everything declared static */
 
diff --git a/src/libCom/flex/flexdef.h b/src/libCom/flex/flexdef.h
index f05694a1c..79cfa9427 100644
--- a/src/libCom/flex/flexdef.h
+++ b/src/libCom/flex/flexdef.h
@@ -34,8 +34,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* @(#) $Revision-Id$ (LBL) */
-
 #ifndef INC_flexdef_H
 #define INC_flexdef_H
 
diff --git a/src/libCom/flex/flexdoc.html b/src/libCom/flex/flexdoc.html
index 0a3b59510..30ed69521 100644
--- a/src/libCom/flex/flexdoc.html
+++ b/src/libCom/flex/flexdoc.html
@@ -1,12 +1,3 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     National Laboratory.
-* Copyright (c) 2002 The Regents of the University of California, as
-*     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
-\*************************************************************************/
 
 
 
diff --git a/src/libCom/flex/libmain.c b/src/libCom/flex/libmain.c
index 70a10af06..878aa21dc 100644
--- a/src/libCom/flex/libmain.c
+++ b/src/libCom/flex/libmain.c
@@ -8,8 +8,6 @@
 \*************************************************************************/
 /* libmain - flex run-time support library "main" function */
 
-/* $Revision-Id$ */
-
 extern int yylex();
 
 int main(int argc, char *argv[])
diff --git a/src/libCom/flex/scan.c b/src/libCom/flex/scan.c
index 1c34ee1e9..a12c020bf 100644
--- a/src/libCom/flex/scan.c
+++ b/src/libCom/flex/scan.c
@@ -1,8 +1,6 @@
 /* A lexical scanner generated by flex */
 
-/* scanner skeleton version:
- * $Revision-Id$
- */
+/* scanner skeleton */
 
 #define FLEX_SCANNER
 
diff --git a/src/libCom/flex/yylex.c b/src/libCom/flex/yylex.c
index 3fb51dcfa..28f487d6b 100644
--- a/src/libCom/flex/yylex.c
+++ b/src/libCom/flex/yylex.c
@@ -34,10 +34,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/*
- * $Revision-Id$
- */
-
 #include 
 #include "flexdef.h"
 #include "parse.h"
diff --git a/src/libCom/freeList/freeList.h b/src/libCom/freeList/freeList.h
index c7ca84efc..77ebfb82e 100644
--- a/src/libCom/freeList/freeList.h
+++ b/src/libCom/freeList/freeList.h
@@ -7,10 +7,8 @@
 * and higher are distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* share/epicsH/freeList.h	*/
-/* share/epicsH $Revision-Id$ */
 /* Author:  Marty Kraimer Date:    04-19-94	*/
-
+
 #ifndef INCfreeListh
 #define INCfreeListh
 
diff --git a/src/libCom/freeList/freeListLib.c b/src/libCom/freeList/freeListLib.c
index b8e8e6f23..b489a476d 100755
--- a/src/libCom/freeList/freeListLib.c
+++ b/src/libCom/freeList/freeListLib.c
@@ -7,9 +7,7 @@
 * and higher are distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 /* Author:  Marty Kraimer Date:    04-19-94 */
-
 
 #include 
 #include 
diff --git a/src/libCom/gpHash/gpHash.h b/src/libCom/gpHash/gpHash.h
index ce6ec5f4a..d9c0dd204 100644
--- a/src/libCom/gpHash/gpHash.h
+++ b/src/libCom/gpHash/gpHash.h
@@ -7,7 +7,6 @@
 * and higher are distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
-/* $Revision-Id$ */
 /* Author:  Marty Kraimer Date:    04-07-94 */
 
 /* gph provides a general purpose directory accessed via a hash table*/
diff --git a/src/libCom/gpHash/gpHashLib.c b/src/libCom/gpHash/gpHashLib.c
index 3b680a2fc..a56f00a0c 100644
--- a/src/libCom/gpHash/gpHashLib.c
+++ b/src/libCom/gpHash/gpHashLib.c
@@ -6,7 +6,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
-/* $Revision-Id$ */
 
 /* Author:  Marty Kraimer Date:    04-07-94 */
 
diff --git a/src/libCom/log/Makefile b/src/libCom/log/Makefile
index 5b0f23cea..7d7a6b620 100644
--- a/src/libCom/log/Makefile
+++ b/src/libCom/log/Makefile
@@ -21,6 +21,8 @@ iocLogServer_LIBS = Com
 iocLogServer_SYS_LIBS_solaris += socket
 iocLogServer_SYS_LIBS_WIN32   += user32 ws2_32
 
-SCRIPTS_solaris := S99logServer
-SCRIPTS_Linux := S99logServer
+SCRIPTS_HOST = S99logServer
+
+EXPAND += S99logServer@
+EXPAND_VARS = INSTALL_BIN=$(abspath $(INSTALL_BIN))
 
diff --git a/src/libCom/log/RULES b/src/libCom/log/RULES
deleted file mode 100644
index 0483b0518..000000000
--- a/src/libCom/log/RULES
+++ /dev/null
@@ -1,12 +0,0 @@
-#*************************************************************************
-# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
-#     National Laboratory.
-# EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
-#*************************************************************************
-
-# This is a Makefile fragment, see src/libCom/Makefile.
-
-S99%: ../log/rc2.%
-	sed -e s%:INSTALL_BIN:%`cd $(INSTALL_BIN); pwd`% $< >$@
-
diff --git a/src/libCom/log/rc2.logServer b/src/libCom/log/S99logServer@
similarity index 96%
rename from src/libCom/log/rc2.logServer
rename to src/libCom/log/S99logServer@
index 407227d91..294b2ec01 100644
--- a/src/libCom/log/rc2.logServer
+++ b/src/libCom/log/S99logServer@
@@ -3,7 +3,7 @@
 # System-V init script for the EPICS IOC Log Server.
 #
 
-INSTALL_BIN=:INSTALL_BIN:
+INSTALL_BIN=@INSTALL_BIN@
 
 # To change the default values for the EPICS Environment parameters,
 # uncomment and modify the relevant lines below.
diff --git a/src/libCom/log/iocLogServer.c b/src/libCom/log/iocLogServer.c
index 3040c9cc8..f9deb06e5 100644
--- a/src/libCom/log/iocLogServer.c
+++ b/src/libCom/log/iocLogServer.c
@@ -7,7 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* iocLogServer.c */
-/* $Revision-Id$ */
 
 /*
  *	archive logMsg() from several IOC's to a common rotating file
diff --git a/src/libCom/macLib/macCore.c b/src/libCom/macLib/macCore.c
index dea4a061b..3d024ad76 100644
--- a/src/libCom/macLib/macCore.c
+++ b/src/libCom/macLib/macCore.c
@@ -6,8 +6,7 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$
- *
+/*
  * Implementation of core macro substitution library (macLib)
  *
  * The implementation is fairly unsophisticated and linked lists are
diff --git a/src/libCom/macLib/macEnv.c b/src/libCom/macLib/macEnv.c
index 8cdf8bd94..f102748a8 100644
--- a/src/libCom/macLib/macEnv.c
+++ b/src/libCom/macLib/macEnv.c
@@ -4,8 +4,7 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$
- *
+/*
  * Macro expansion of environment variables
  */
 
diff --git a/src/libCom/macLib/macLib.h b/src/libCom/macLib/macLib.h
index c06e67d9e..14ecdaa3f 100644
--- a/src/libCom/macLib/macLib.h
+++ b/src/libCom/macLib/macLib.h
@@ -6,8 +6,7 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$
- *
+/*
  * Definitions for macro substitution library (macLib)
  *
  * William Lupton, W. M. Keck Observatory
diff --git a/src/libCom/macLib/macLibNOTES b/src/libCom/macLib/macLibNOTES
index d079a3282..fc3606254 100644
--- a/src/libCom/macLib/macLibNOTES
+++ b/src/libCom/macLib/macLibNOTES
@@ -1,5 +1,3 @@
-# $Revision-Id$
-#
 # Test input file for macTest filter, doubling as notes on usage of the
 # macro library. Some special strings at start of line are supported:
 #
diff --git a/src/libCom/macLib/macUtil.c b/src/libCom/macLib/macUtil.c
index ee7b53f7f..7bf73542e 100644
--- a/src/libCom/macLib/macUtil.c
+++ b/src/libCom/macLib/macUtil.c
@@ -6,8 +6,7 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$
- *
+/*
  * Implementation of utility macro substitution library (macLib)
  *
  * William Lupton, W. M. Keck Observatory
diff --git a/src/libCom/misc/alarm.h b/src/libCom/misc/alarm.h
index 5158206f7..58e2b7313 100644
--- a/src/libCom/misc/alarm.h
+++ b/src/libCom/misc/alarm.h
@@ -7,7 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* Alarm definitions, must match menuAlarmSevr.dbd and menuAlarmStat.dbd */
-/* $Revision-Id$ */
 
 /*
  *      Authors: Bob Dalesio and Marty Kraimer
diff --git a/src/libCom/misc/alarmString.c b/src/libCom/misc/alarmString.c
index b8c72451c..4db179dcb 100644
--- a/src/libCom/misc/alarmString.c
+++ b/src/libCom/misc/alarmString.c
@@ -6,7 +6,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 
 /* String names for alarm status and severity values */
 
diff --git a/src/libCom/misc/alarmString.h b/src/libCom/misc/alarmString.h
index 75fe2317c..ab320f058 100644
--- a/src/libCom/misc/alarmString.h
+++ b/src/libCom/misc/alarmString.h
@@ -6,7 +6,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 
 /*
  * This file is deprecated, use alarm.h instead.
diff --git a/src/libCom/misc/cantProceed.c b/src/libCom/misc/cantProceed.c
index cbd7e87af..6c35796fd 100644
--- a/src/libCom/misc/cantProceed.c
+++ b/src/libCom/misc/cantProceed.c
@@ -7,7 +7,6 @@
 * and higher are distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 
 /* Author:  Marty Kraimer Date:    04JAN99 */
 
diff --git a/src/libCom/misc/dbDefs.h b/src/libCom/misc/dbDefs.h
index 069d55c1a..94e05e8a4 100644
--- a/src/libCom/misc/dbDefs.h
+++ b/src/libCom/misc/dbDefs.h
@@ -6,8 +6,7 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$
- *
+/*
  *      Author:          Marty Kraimer
  *      Date:            6-1-90
  */
diff --git a/src/libCom/misc/epicsStdlib.c b/src/libCom/misc/epicsStdlib.c
index b2d441274..865c8069d 100644
--- a/src/libCom/misc/epicsStdlib.c
+++ b/src/libCom/misc/epicsStdlib.c
@@ -6,7 +6,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 /* Authors: Eric Norum & Andrew Johnson */
 
 #include 
diff --git a/src/libCom/misc/epicsString.c b/src/libCom/misc/epicsString.c
index 7a63580a2..f3cf828f4 100644
--- a/src/libCom/misc/epicsString.c
+++ b/src/libCom/misc/epicsString.c
@@ -7,7 +7,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 
 /* Authors: Jun-ichi Odagiri, Marty Kraimer, Eric Norum,
  *          Mark Rivers, Andrew Johnson, Ralph Lange
diff --git a/src/libCom/misc/epicsString.h b/src/libCom/misc/epicsString.h
index c264ebb27..5d53957a1 100644
--- a/src/libCom/misc/epicsString.h
+++ b/src/libCom/misc/epicsString.h
@@ -7,7 +7,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 
 /* Authors: Jun-ichi Odagiri, Marty Kraimer, Eric Norum,
  *          Mark Rivers, Andrew Johnson, Ralph Lange
diff --git a/src/libCom/misc/epicsTypes.h b/src/libCom/misc/epicsTypes.h
index 5421c99c3..b5a947b43 100644
--- a/src/libCom/misc/epicsTypes.h
+++ b/src/libCom/misc/epicsTypes.h
@@ -6,7 +6,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
-/* $Revision-Id$  */
 
 /*
  *      Author:     Jeff Hill
diff --git a/src/libCom/misc/epicsUnitTest.c b/src/libCom/misc/epicsUnitTest.c
index 773b7b004..4ac18ea1c 100644
--- a/src/libCom/misc/epicsUnitTest.c
+++ b/src/libCom/misc/epicsUnitTest.c
@@ -5,7 +5,7 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
-/* $Revision-Id$
+/*
  * Author: Andrew Johnson
  *
  * Unit test module which generates output in the Test Anything Protocol
diff --git a/src/libCom/misc/epicsUnitTest.h b/src/libCom/misc/epicsUnitTest.h
index 8a3bd6e17..9a119ad22 100644
--- a/src/libCom/misc/epicsUnitTest.h
+++ b/src/libCom/misc/epicsUnitTest.h
@@ -5,7 +5,7 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
-/* $Revision-Id$
+/*
  * Author: Andrew Johnson
  */
 
diff --git a/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp b/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp
index cef728f2a..f4a1c31be 100644
--- a/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp
+++ b/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp
@@ -9,15 +9,6 @@
 \*************************************************************************/
 
 /*  
- *
- *                              
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *                                  
- *  Copyright, 1986, The Regents of the University of California.
- *                                  
- *           
  *	Author Jeffrey O. Hill
  *	johill@lanl.gov
  */
@@ -265,12 +256,16 @@ void ipAddrToAsciiEnginePrivate::run ()
                 continue;
             }
 
+            // fix for lp:1580623
+            // a destructing cac sets pCurrent to NULL, so
+            // make local copy to avoid race when releasing the guard
+            ipAddrToAsciiTransactionPrivate *pCur = this->pCurrent;
             this->callbackInProgress = true;
 
             {
                 epicsGuardRelease < epicsMutex > unguard ( guard );
                 // dont call callback with lock applied
-                this->pCurrent->pCB->transactionComplete ( this->nameTmp );
+                pCur->pCB->transactionComplete ( this->nameTmp );
             }
 
             this->callbackInProgress = false;
diff --git a/src/libCom/misc/ipAddrToAsciiAsynchronous.h b/src/libCom/misc/ipAddrToAsciiAsynchronous.h
index 95b853994..0068f6e50 100644
--- a/src/libCom/misc/ipAddrToAsciiAsynchronous.h
+++ b/src/libCom/misc/ipAddrToAsciiAsynchronous.h
@@ -9,16 +9,6 @@
 \*************************************************************************/
 
 /*  
- *  $Revision-Id$
- *
- *                              
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *                                  
- *  Copyright, 1986, The Regents of the University of California.
- *                                  
- *           
  *	Author Jeffrey O. Hill
  *	johill@lanl.gov
  */
diff --git a/src/libCom/misc/locationException.h b/src/libCom/misc/locationException.h
index 4a5a279a9..30b187208 100644
--- a/src/libCom/misc/locationException.h
+++ b/src/libCom/misc/locationException.h
@@ -8,8 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-//
-// $Revision-Id$
 //
 // Author: Jeff Hill
 //
diff --git a/src/libCom/misc/makeEpicsVersion.pl b/src/libCom/misc/makeEpicsVersion.pl
index 08f5aa3c0..c7c9acc39 100644
--- a/src/libCom/misc/makeEpicsVersion.pl
+++ b/src/libCom/misc/makeEpicsVersion.pl
@@ -30,7 +30,7 @@ print "Building $opt_o from $infile\n" unless $opt_q;
 open my $VARS, '<', $infile
     or die "$tool: Can't open $infile: $!\n";
 
-my ($ver, $rev, $mod, $patch, $snapshot, $commit_date);
+my ($ver, $rev, $mod, $patch, $snapshot);
 while (<$VARS>) {
     chomp;
     next if m/^\s*#/;   # Skip comments
@@ -39,16 +39,16 @@ while (<$VARS>) {
     if (m/^EPICS_MODIFICATION\s*=\s*(\d+)/)         { $mod = $1; }
     if (m/^EPICS_PATCH_LEVEL\s*=\s*(\d+)/)          { $patch = $1; }
     if (m/^EPICS_DEV_SNAPSHOT\s*=\s*([-\w]*)/)      { $snapshot = $1; }
-    if (m/^COMMIT_DATE\s*=\s*"\\(.*)"/)             { $commit_date = $1; }
 }
 close $VARS;
 
 map {
     die "$tool: Variable missing from $infile" unless defined $_;
-} $ver, $rev, $mod, $patch, $snapshot, $commit_date;
+} $ver, $rev, $mod, $patch, $snapshot;
 
 my $ver_str = "$ver.$rev.$mod";
 $ver_str .= ".$patch" if $patch > 0;
+my $ver_short = $ver_str;
 $ver_str .= $snapshot if $snapshot ne '';
 $ver_str .= "-$opt_v" if $opt_v;
 
@@ -71,10 +71,15 @@ print $OUT <<"END";
 #define EPICS_PATCH_LEVEL    $patch
 #define EPICS_DEV_SNAPSHOT   "$snapshot"
 #define EPICS_SITE_VERSION   "$opt_v"
-#define EPICS_VERSION_STRING "EPICS $ver_str"
-#define epicsReleaseVersion  "EPICS R$ver_str $commit_date"
 
-#define VERSION_INT(V,R,M,P) ( ((V)<<24) | ((R)<<16) | ((M)<<8) | (P))
+#define EPICS_VERSION_SHORT  "$ver_short"
+#define EPICS_VERSION_FULL   "$ver_str"
+#define EPICS_VERSION_STRING "EPICS $ver_str"
+#define epicsReleaseVersion  "EPICS R$ver_str"
+
+#ifndef VERSION_INT
+#  define VERSION_INT(V,R,M,P) ( ((V)<<24) | ((R)<<16) | ((M)<<8) | (P))
+#endif
 #define EPICS_VERSION_INT VERSION_INT($ver, $rev, $mod, $patch)
 
 #endif /* INC_${obase}_H */
diff --git a/src/libCom/misc/testMain.h b/src/libCom/misc/testMain.h
index 655503881..4db72c39e 100644
--- a/src/libCom/misc/testMain.h
+++ b/src/libCom/misc/testMain.h
@@ -4,7 +4,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
-/* $Revision-Id$ */
 
 #ifndef INC_testMain_H
 #define INC_testMain_H
diff --git a/src/libCom/misc/unixFileName.h b/src/libCom/misc/unixFileName.h
index faeed9d8e..36e818c8f 100644
--- a/src/libCom/misc/unixFileName.h
+++ b/src/libCom/misc/unixFileName.h
@@ -10,8 +10,6 @@
 /*
  * unixFileName.h
  * Author: Jeff Hill
- *
- *
  */
 #ifndef unixFileNameH
 #define unixFileNameH
diff --git a/src/libCom/osi/devLib.h b/src/libCom/osi/devLib.h
index b78f94907..729f9b932 100644
--- a/src/libCom/osi/devLib.h
+++ b/src/libCom/osi/devLib.h
@@ -9,7 +9,6 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /* devLib.h */
-/* $Revision-Id$ */
 
 /*
  * Original Author: Marty Kraimer
diff --git a/src/libCom/osi/devLibVME.c b/src/libCom/osi/devLibVME.c
index a935e4857..6c7d93f99 100644
--- a/src/libCom/osi/devLibVME.c
+++ b/src/libCom/osi/devLibVME.c
@@ -9,7 +9,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* devLib.c - support for allocation of common device resources */
-/* $Revision-Id$ */
 
 /*
  *  Original Author: Marty Kraimer
diff --git a/src/libCom/osi/devLibVME.h b/src/libCom/osi/devLibVME.h
index 8e526a139..4fb17f0c2 100644
--- a/src/libCom/osi/devLibVME.h
+++ b/src/libCom/osi/devLibVME.h
@@ -7,7 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* devLib.h */
-/* devLib.h,v 1.1.2.8 2009/07/09 15:27:43 anj Exp */
 
 /*
  * Original Author: Marty Kraimer 
diff --git a/src/libCom/osi/devLibVMEImpl.h b/src/libCom/osi/devLibVMEImpl.h
index e695edeb9..e479d869c 100644
--- a/src/libCom/osi/devLibVMEImpl.h
+++ b/src/libCom/osi/devLibVMEImpl.h
@@ -9,7 +9,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* devLibImpl.h */
-/*  */
 
 /*
  * Original Author: Marty Kraimer 
diff --git a/src/libCom/osi/epicsAssert.h b/src/libCom/osi/epicsAssert.h
index a16c036ec..60dc130c8 100644
--- a/src/libCom/osi/epicsAssert.h
+++ b/src/libCom/osi/epicsAssert.h
@@ -6,7 +6,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 /*
  * EPICS assert
  *
diff --git a/src/libCom/osi/epicsGeneralTime.c b/src/libCom/osi/epicsGeneralTime.c
index 7f8e1b66f..cd5cc437e 100644
--- a/src/libCom/osi/epicsGeneralTime.c
+++ b/src/libCom/osi/epicsGeneralTime.c
@@ -1,5 +1,5 @@
 /*************************************************************************\
-* Copyright (c) 2009 UChicago Argonne LLC, as Operator of Argonne
+* Copyright (c) 2016 UChicago Argonne LLC, as Operator of Argonne
 *     National Laboratory.
 * Copyright (c) 2008 Diamond Light Source Ltd
 * Copyright (c) 2004 Oak Ridge National Laboratory
@@ -31,6 +31,17 @@
 #include "generalTimeSup.h"
 #include "epicsGeneralTime.h"
 
+/* Change 'undef' to 'define' to turn on debug statements: */
+#undef DEBUG_GENERAL_TIME
+
+#ifdef DEBUG_GENERAL_TIME
+    int generalTimeDebug = 10;
+#   define IFDEBUG(n) \
+        if (generalTimeDebug >= n) /* block or statement */
+#else
+#   define IFDEBUG(n) \
+        if(0) /* Compiler will elide the block or statement */
+#endif
 
 /* Declarations */
 
@@ -65,6 +76,7 @@ static struct {
 
 static epicsThreadOnceId onceId = EPICS_THREAD_ONCE_INIT;
 
+static const char * const tsfmt = "%Y-%m-%d %H:%M:%S.%09f";
 
 /* Implementation */
 
@@ -75,6 +87,9 @@ static void generalTime_InitOnce(void *dummy)
 
     ellInit(>Pvt.eventProviders);
     gtPvt.eventListLock = epicsMutexMustCreate();
+
+    IFDEBUG(1)
+        printf("General Time Initialized\n");
 }
 
 void generalTime_Init(void)
@@ -90,44 +105,103 @@ int generalTimeGetExceptPriority(epicsTimeStamp *pDest, int *pPrio, int ignore)
 
     generalTime_Init();
 
+    IFDEBUG(2)
+        printf("generalTimeGetExceptPriority(ignore=%d)\n", ignore);
+
     epicsMutexMustLock(gtPvt.timeListLock);
     for (ptp = (gtProvider *)ellFirst(>Pvt.timeProviders);
          ptp; ptp = (gtProvider *)ellNext(&ptp->node)) {
-        if (ptp->priority == ignore)
+        if ((ignore > 0 && ptp->priority == ignore) ||
+            (ignore < 0 && ptp->priority != -ignore))
             continue;
 
         status = ptp->get.Time(pDest);
         if (status == epicsTimeOK) {
-            /* check time is monotonic */
-            if (epicsTimeGreaterThanEqual(pDest, >Pvt.lastProvidedTime)) {
-                gtPvt.lastProvidedTime = *pDest;
-                if (ignore == 0)
-                    gtPvt.lastTimeProvider = ptp;
-                if (pPrio)
-                    *pPrio = ptp->priority;
-            } else {
-                int key;
-
-                *pDest = gtPvt.lastProvidedTime;
-                if (pPrio)
-                    *pPrio = gtPvt.lastTimeProvider->priority;
-                key = epicsInterruptLock();
-                gtPvt.ErrorCounts++;
-                epicsInterruptUnlock(key);
-            }
+            /* No ratchet, time from this routine may go backwards */
+            if (pPrio)
+                *pPrio = ptp->priority;
             break;
         }
+        else IFDEBUG(2)
+            printf("gTGExP provider '%s' returned error\n", ptp->name);
     }
-    if (status && ignore == 0)
-        gtPvt.lastTimeProvider = NULL;
     epicsMutexUnlock(gtPvt.timeListLock);
 
+    IFDEBUG(2) {
+        if (ptp && status == epicsTimeOK) {
+            char buff[40];
+
+            epicsTimeToStrftime(buff, sizeof(buff), tsfmt, pDest);
+            printf("gTGExP returning %s from provider '%s'\n",
+                buff, ptp->name);
+        }
+        else
+            printf("gTGExP returning error\n");
+    }
+
     return status;
 }
 
 int epicsShareAPI epicsTimeGetCurrent(epicsTimeStamp *pDest)
 {
-    return generalTimeGetExceptPriority(pDest, NULL, 0);
+    gtProvider *ptp;
+    int status = S_time_noProvider;
+    epicsTimeStamp ts;
+
+    generalTime_Init();
+
+    IFDEBUG(20)
+        printf("epicsTimeGetCurrent()\n");
+
+    epicsMutexMustLock(gtPvt.timeListLock);
+    for (ptp = (gtProvider *)ellFirst(>Pvt.timeProviders);
+         ptp; ptp = (gtProvider *)ellNext(&ptp->node)) {
+
+        status = ptp->get.Time(&ts);
+        if (status == epicsTimeOK) {
+            /* check time is monotonic */
+            if (epicsTimeGreaterThanEqual(&ts, >Pvt.lastProvidedTime)) {
+                *pDest = ts;
+                gtPvt.lastProvidedTime = ts;
+                gtPvt.lastTimeProvider = ptp;
+            } else {
+                int key;
+
+                *pDest = gtPvt.lastProvidedTime;
+                key = epicsInterruptLock();
+                gtPvt.ErrorCounts++;
+                epicsInterruptUnlock(key);
+
+                IFDEBUG(10) {
+                    char last[40], buff[40];
+
+                    epicsTimeToStrftime(last, sizeof(last), tsfmt,
+                        >Pvt.lastProvidedTime);
+                    epicsTimeToStrftime(buff, sizeof(buff), tsfmt, &ts);
+                    printf("eTGC provider '%s' returned older time\n"
+                        "    %s, using %s instead\n", ptp->name, buff, last);
+                }
+            }
+            break;
+        }
+    }
+    if (status)
+        gtPvt.lastTimeProvider = NULL;
+    epicsMutexUnlock(gtPvt.timeListLock);
+
+    IFDEBUG(20) {
+        if (ptp && status == epicsTimeOK) {
+            char buff[40];
+
+            epicsTimeToStrftime(buff, sizeof(buff), tsfmt, &ts);
+            printf("eTGC returning %s from provider '%s'\n",
+                buff, ptp->name);
+        }
+        else
+            printf("eTGC returning error\n");
+    }
+
+    return status;
 }
 
 int epicsTimeGetCurrentInt(epicsTimeStamp *pDest)
@@ -135,8 +209,11 @@ int epicsTimeGetCurrentInt(epicsTimeStamp *pDest)
     gtProvider *ptp = gtPvt.lastTimeProvider;
 
     if (ptp == NULL ||
-        ptp->getInt.Time == NULL)
-	return S_time_noProvider;
+        ptp->getInt.Time == NULL) {
+        IFDEBUG(20)
+            epicsInterruptContextMessage("eTGCInt: No support\n");
+        return S_time_noProvider;
+    }
 
     return ptp->getInt.Time(pDest);
 }
@@ -147,9 +224,13 @@ static int generalTimeGetEventPriority(epicsTimeStamp *pDest, int eventNumber,
 {
     gtProvider *ptp;
     int status = S_time_noProvider;
+    epicsTimeStamp ts;
 
     generalTime_Init();
 
+    IFDEBUG(2)
+        printf("generalTimeGetEventPriority(eventNum=%d)\n", eventNumber);
+
     if ((eventNumber < 0 || eventNumber >= NUM_TIME_EVENTS) &&
         (eventNumber != epicsTimeEventBestTime))
         return S_time_badEvent;
@@ -158,16 +239,17 @@ static int generalTimeGetEventPriority(epicsTimeStamp *pDest, int eventNumber,
     for (ptp = (gtProvider *)ellFirst(>Pvt.eventProviders);
          ptp; ptp = (gtProvider *)ellNext(&ptp->node)) {
 
-        status = ptp->get.Event(pDest, eventNumber);
+        status = ptp->get.Event(&ts, eventNumber);
         if (status == epicsTimeOK) {
             gtPvt.lastEventProvider = ptp;
             if (pPrio)
                 *pPrio = ptp->priority;
 
             if (eventNumber == epicsTimeEventBestTime) {
-                if (epicsTimeGreaterThanEqual(pDest,
+                if (epicsTimeGreaterThanEqual(&ts,
                         >Pvt.lastProvidedBestTime)) {
-                    gtPvt.lastProvidedBestTime = *pDest;
+                    *pDest = ts;
+                    gtPvt.lastProvidedBestTime = ts;
                 } else {
                     int key;
 
@@ -175,11 +257,23 @@ static int generalTimeGetEventPriority(epicsTimeStamp *pDest, int eventNumber,
                     key = epicsInterruptLock();
                     gtPvt.ErrorCounts++;
                     epicsInterruptUnlock(key);
+
+                    IFDEBUG(10) {
+                        char last[40], buff[40];
+
+                        epicsTimeToStrftime(last, sizeof(last), tsfmt,
+                            >Pvt.lastProvidedBestTime);
+                        epicsTimeToStrftime(buff, sizeof(buff), tsfmt, &ts);
+                        printf("gTGEvP provider '%s' returned older time\n"
+                            "    %s, using %s instead\n",
+                            ptp->name, buff, last);
+                    }
                 }
             } else {
                 if (epicsTimeGreaterThanEqual(pDest,
                         >Pvt.eventTime[eventNumber])) {
-                    gtPvt.eventTime[eventNumber] = *pDest;
+                    *pDest = ts;
+                    gtPvt.eventTime[eventNumber] = ts;
                 } else {
                     int key;
 
@@ -188,14 +282,39 @@ static int generalTimeGetEventPriority(epicsTimeStamp *pDest, int eventNumber,
                     gtPvt.ErrorCounts++;
                     epicsInterruptUnlock(key);
                 }
+
+                    IFDEBUG(10) {
+                        char last[40], buff[40];
+
+                        epicsTimeToStrftime(last, sizeof(last), tsfmt,
+                            >Pvt.lastProvidedBestTime);
+                        epicsTimeToStrftime(buff, sizeof(buff), tsfmt, &ts);
+                        printf("gTGEvP provider '%s' returned older time\n"
+                            "    %s, using %s instead\n",
+                            ptp->name, buff, last);
+                    }
             }
             break;
         }
+        else IFDEBUG(2)
+            printf("gTGEvP provider '%s' returned error\n", ptp->name);
     }
     if (status)
         gtPvt.lastEventProvider = NULL;
     epicsMutexUnlock(gtPvt.eventListLock);
 
+    IFDEBUG(10) {
+        if (ptp && status == epicsTimeOK) {
+            char buff[40];
+
+            epicsTimeToStrftime(buff, sizeof(buff), tsfmt, &ts);
+            printf("gTGEvP returning %s from provider '%s'\n",
+                buff, ptp->name);
+        }
+        else
+            printf("gTGEvP returning error\n");
+    }
+
     return status;
 }
 
@@ -216,8 +335,11 @@ int epicsTimeGetEventInt(epicsTimeStamp *pDest, int eventNumber)
         gtProvider *ptp = gtPvt.lastEventProvider;
 
         if (ptp == NULL ||
-            ptp->getInt.Event == NULL)
-	    return S_time_noProvider;
+            ptp->getInt.Event == NULL) {
+            IFDEBUG(20)
+                epicsInterruptContextMessage("eTGEvInt: No support\n");
+            return S_time_noProvider;
+        }
 
         return ptp->getInt.Event(pDest, eventNumber);
     }
@@ -288,6 +410,9 @@ int generalTimeRegisterEventProvider(const char *name, int priority,
 
     insertProvider(ptp, >Pvt.eventProviders, gtPvt.eventListLock);
 
+    IFDEBUG(1)
+        printf("Registered event provider '%s' at %d\n", name, priority);
+
     return epicsTimeOK;
 }
 
@@ -301,6 +426,9 @@ int generalTimeAddIntEventProvider(const char *name, int priority,
 
     ptp->getInt.Event = getEvent;
 
+    IFDEBUG(1)
+        printf("Event provider '%s' is interrupt-callable\n", name);
+
     return epicsTimeOK;
 }
 
@@ -325,6 +453,9 @@ int generalTimeRegisterCurrentProvider(const char *name, int priority,
 
     insertProvider(ptp, >Pvt.timeProviders, gtPvt.timeListLock);
 
+    IFDEBUG(1)
+        printf("Registered time provider '%s' at %d\n", name, priority);
+
     return epicsTimeOK;
 }
 
@@ -338,6 +469,9 @@ int generalTimeAddIntCurrentProvider(const char *name, int priority,
 
     ptp->getInt.Time = getTime;
 
+    IFDEBUG(1)
+        printf("Time provider '%s' is interrupt-callable\n", name);
+
     return epicsTimeOK;
 }
 
diff --git a/src/libCom/osi/epicsMessageQueue.cpp b/src/libCom/osi/epicsMessageQueue.cpp
index 1561fbf7d..1527b3d3a 100644
--- a/src/libCom/osi/epicsMessageQueue.cpp
+++ b/src/libCom/osi/epicsMessageQueue.cpp
@@ -8,8 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *      $Revision-Id$
- *
  *      Author  W. Eric Norum
  *              norume@aps.anl.gov
  *              630 252 4793
diff --git a/src/libCom/osi/epicsMessageQueue.h b/src/libCom/osi/epicsMessageQueue.h
index 3137b3cf8..c6a98fd47 100644
--- a/src/libCom/osi/epicsMessageQueue.h
+++ b/src/libCom/osi/epicsMessageQueue.h
@@ -8,8 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *      $Revision-Id$
- *
  *      Author  W. Eric Norum
  *              norume@aps.anl.gov
  *              630 252 4793
diff --git a/src/libCom/osi/epicsMutex.cpp b/src/libCom/osi/epicsMutex.cpp
index 8580af204..7c8d05056 100644
--- a/src/libCom/osi/epicsMutex.cpp
+++ b/src/libCom/osi/epicsMutex.cpp
@@ -7,7 +7,7 @@
 * and higher are distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* epicsMutex.c */
+/* epicsMutex.cpp */
 /*	Author: Marty Kraimer and Jeff Hill	Date: 03APR01	*/
 
 /*
diff --git a/src/libCom/osi/epicsReadline.c b/src/libCom/osi/epicsReadline.c
index d410ac91e..936cbce99 100644
--- a/src/libCom/osi/epicsReadline.c
+++ b/src/libCom/osi/epicsReadline.c
@@ -5,7 +5,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
-/* $Revision-Id$ */
 /* Author:  Eric Norum Date: 12DEC2001 */
 
 #include 
diff --git a/src/libCom/osi/epicsThread.cpp b/src/libCom/osi/epicsThread.cpp
index f59c0bd1a..892d73de0 100644
--- a/src/libCom/osi/epicsThread.cpp
+++ b/src/libCom/osi/epicsThread.cpp
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 //
-// $Revision-Id$
-//
 // Author: Jeff Hill
 //
 
diff --git a/src/libCom/osi/os/Darwin/osdEnv.c b/src/libCom/osi/os/Darwin/osdEnv.c
index 35517c1e9..ab3f93644 100644
--- a/src/libCom/osi/os/Darwin/osdEnv.c
+++ b/src/libCom/osi/os/Darwin/osdEnv.c
@@ -5,8 +5,6 @@
 \*************************************************************************/
 /* osdEnv.c */
 /*
- * $Revision-Id$
- *
  * Author: Eric Norum
  *   Date: May 7, 2001
  *
diff --git a/src/libCom/osi/os/Darwin/osdSock.h b/src/libCom/osi/os/Darwin/osdSock.h
index dc0dcee91..e9426a79f 100644
--- a/src/libCom/osi/os/Darwin/osdSock.h
+++ b/src/libCom/osi/os/Darwin/osdSock.h
@@ -4,8 +4,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- * $Revision-Id$
- *
  * Author: Eric Norum
  */
 
diff --git a/src/libCom/osi/os/Darwin/osdSockAddrReuse.cpp b/src/libCom/osi/os/Darwin/osdSockAddrReuse.cpp
index a7bb3615c..869514160 100644
--- a/src/libCom/osi/os/Darwin/osdSockAddrReuse.cpp
+++ b/src/libCom/osi/os/Darwin/osdSockAddrReuse.cpp
@@ -1,4 +1,3 @@
-
 /*************************************************************************\
 * Copyright (c) 2002 The University of Chicago, as Operator of Argonne
 *     National Laboratory.
@@ -10,7 +9,6 @@
 \*************************************************************************/
 
 /*
- * $Revision-Id$
  * Author: Jeff Hill
  */
 
diff --git a/src/libCom/osi/os/Darwin/osdTime.h b/src/libCom/osi/os/Darwin/osdTime.h
index 3abea1f14..d0c361404 100644
--- a/src/libCom/osi/os/Darwin/osdTime.h
+++ b/src/libCom/osi/os/Darwin/osdTime.h
@@ -4,8 +4,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- * $Revision-Id$
- *
  * Author: Eric Norum
  */
 
diff --git a/src/libCom/osi/os/Darwin/osiFileName.h b/src/libCom/osi/os/Darwin/osiFileName.h
index 4004e82a4..a78118679 100644
--- a/src/libCom/osi/os/Darwin/osiFileName.h
+++ b/src/libCom/osi/os/Darwin/osiFileName.h
@@ -5,8 +5,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- * $Revision-Id$
- *
  * Author: Eric Norum
  */
 
diff --git a/src/libCom/osi/os/Linux/osdTime.h b/src/libCom/osi/os/Linux/osdTime.h
index 50788a025..988f8747f 100644
--- a/src/libCom/osi/os/Linux/osdTime.h
+++ b/src/libCom/osi/os/Linux/osdTime.h
@@ -6,8 +6,6 @@
 \*************************************************************************/
 
 /*
- * $Revision-Id$
- *
  * Author: Eric Norum
  */
 
diff --git a/src/libCom/osi/os/Linux/osiFileName.h b/src/libCom/osi/os/Linux/osiFileName.h
index b79203992..3a6448d54 100644
--- a/src/libCom/osi/os/Linux/osiFileName.h
+++ b/src/libCom/osi/os/Linux/osiFileName.h
@@ -10,8 +10,6 @@
 /*
  * osiFileName.h
  * Author: Jeff Hill
- *
- *
  */
 #ifndef osiFileNameH
 #define osiFileNameH
diff --git a/src/libCom/osi/os/Linux/osiUnistd.h b/src/libCom/osi/os/Linux/osiUnistd.h
index fc58f0b59..336a9a802 100644
--- a/src/libCom/osi/os/Linux/osiUnistd.h
+++ b/src/libCom/osi/os/Linux/osiUnistd.h
@@ -8,16 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Revision-Id$
- *
- *                              
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *                                  
- *  Copyright, 1986, The Regents of the University of California.
- *                                  
- *           
  *	Author Jeffrey O. Hill
  *	johill@lanl.gov
  *	505 665 1831
diff --git a/src/libCom/osi/os/RTEMS/devLibVMEOSD.c b/src/libCom/osi/os/RTEMS/devLibVMEOSD.c
index dfc5fcaf1..0a96bad1a 100644
--- a/src/libCom/osi/os/RTEMS/devLibVMEOSD.c
+++ b/src/libCom/osi/os/RTEMS/devLibVMEOSD.c
@@ -6,7 +6,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 
 /*      RTEMS port by Till Straumann, 
  *            3/2002
diff --git a/src/libCom/osi/os/RTEMS/epicsMMIO.h b/src/libCom/osi/os/RTEMS/epicsMMIO.h
index 7db66704f..293886b78 100644
--- a/src/libCom/osi/os/RTEMS/epicsMMIO.h
+++ b/src/libCom/osi/os/RTEMS/epicsMMIO.h
@@ -12,6 +12,8 @@
 #define EPICSMMIO_H
 
 #include 
+#include 
+#include 
 
 #if defined(_ARCH_PPC) || defined(__PPC__) || defined(__PPC)
 #  include 
@@ -39,6 +41,24 @@
 #  define nat_iowrite16 be_iowrite16
 #  define nat_iowrite32 be_iowrite32
 
+static EPICS_ALWAYS_INLINE
+epicsUInt16
+bswap16(epicsUInt16 value)
+{
+    return (((epicsUInt16)(value) & 0x00ff) << 8)    |
+           (((epicsUInt16)(value) & 0xff00) >> 8);
+}
+
+static EPICS_ALWAYS_INLINE
+epicsUInt32
+bswap32(epicsUInt32 value)
+{
+    return (((epicsUInt32)(value) & 0x000000ff) << 24)   |
+           (((epicsUInt32)(value) & 0x0000ff00) << 8)    |
+           (((epicsUInt32)(value) & 0x00ff0000) >> 8)    |
+           (((epicsUInt32)(value) & 0xff000000) >> 24);
+}
+
 #elif defined(i386) || defined(__i386__) || defined(__i386) || defined(__m68k__)
 
 /* X86 does not need special handling for read/write width.
diff --git a/src/libCom/osi/os/RTEMS/osdEvent.c b/src/libCom/osi/os/RTEMS/osdEvent.c
index ce21506c7..455413870 100644
--- a/src/libCom/osi/os/RTEMS/osdEvent.c
+++ b/src/libCom/osi/os/RTEMS/osdEvent.c
@@ -7,7 +7,6 @@
 \*************************************************************************/
 /*
  * RTEMS osdEvent.c
- *	$Revision-Id$
  *      Author: W. Eric Norum
  *              eric@cls.usask.ca
  *              (306) 966-6055
diff --git a/src/libCom/osi/os/RTEMS/osdEvent.h b/src/libCom/osi/os/RTEMS/osdEvent.h
index 506f3d65d..6c53aada7 100644
--- a/src/libCom/osi/os/RTEMS/osdEvent.h
+++ b/src/libCom/osi/os/RTEMS/osdEvent.h
@@ -6,7 +6,6 @@
 \*************************************************************************/
 /*
  * RTEMS osdEvent.h
- *	$Revision-Id$
  *      Author: W. Eric Norum
  *              eric@cls.usask.ca
  *              (306) 966-6055
diff --git a/src/libCom/osi/os/RTEMS/osdInterrupt.c b/src/libCom/osi/os/RTEMS/osdInterrupt.c
index 8f029112e..88ce664e5 100644
--- a/src/libCom/osi/os/RTEMS/osdInterrupt.c
+++ b/src/libCom/osi/os/RTEMS/osdInterrupt.c
@@ -6,7 +6,6 @@
 \*************************************************************************/
 /*
  * RTEMS osdInterrupt.c
- *	$Revision-Id$
  *      Author: W. Eric Norum
  *              eric@cls.usask.ca
  *              (306) 966-6055
diff --git a/src/libCom/osi/os/RTEMS/osdMessageQueue.c b/src/libCom/osi/os/RTEMS/osdMessageQueue.c
index 1ac2cb221..ff7728fb2 100644
--- a/src/libCom/osi/os/RTEMS/osdMessageQueue.c
+++ b/src/libCom/osi/os/RTEMS/osdMessageQueue.c
@@ -8,8 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *      $Revision-Id$
- *
  *      Author  W. Eric Norum
  *              norume@aps.anl.gov
  *              630 252 4793
diff --git a/src/libCom/osi/os/RTEMS/osdMessageQueue.h b/src/libCom/osi/os/RTEMS/osdMessageQueue.h
index c0631b72a..0244a1f0b 100644
--- a/src/libCom/osi/os/RTEMS/osdMessageQueue.h
+++ b/src/libCom/osi/os/RTEMS/osdMessageQueue.h
@@ -8,8 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *      $Revision-Id$
- *
  *      Author  W. Eric Norum
  *              norume@aps.anl.gov
  *              630 252 4793
diff --git a/src/libCom/osi/os/RTEMS/osdMutex.c b/src/libCom/osi/os/RTEMS/osdMutex.c
index eb02b86ff..96fde6ea0 100644
--- a/src/libCom/osi/os/RTEMS/osdMutex.c
+++ b/src/libCom/osi/os/RTEMS/osdMutex.c
@@ -6,7 +6,6 @@
 \*************************************************************************/
 /*
  * RTEMS osdMutex.c
- *	$Revision-Id$
  *      Author: W. Eric Norum
  *              eric@cls.usask.ca
  *              (306) 966-6055
diff --git a/src/libCom/osi/os/RTEMS/osdMutex.h b/src/libCom/osi/os/RTEMS/osdMutex.h
index edf630f78..7e2ecc77d 100644
--- a/src/libCom/osi/os/RTEMS/osdMutex.h
+++ b/src/libCom/osi/os/RTEMS/osdMutex.h
@@ -6,7 +6,6 @@
 \*************************************************************************/
 /*
  * RTEMS osdMutex.h
- *	$Revision-Id$
  *      Author: W. Eric Norum
  *              eric@cls.usask.ca
  *              (306) 966-6055
diff --git a/src/libCom/osi/os/RTEMS/osdProcess.c b/src/libCom/osi/os/RTEMS/osdProcess.c
index ce788bf99..2768dbb0d 100644
--- a/src/libCom/osi/os/RTEMS/osdProcess.c
+++ b/src/libCom/osi/os/RTEMS/osdProcess.c
@@ -9,8 +9,6 @@
 \*************************************************************************/
 
 /* 
- * $Revision-Id$
- * 
  * Operating System Dependent Implementation of osiProcess.h
  *
  * Author: Jeff Hill
diff --git a/src/libCom/osi/os/RTEMS/osdSock.h b/src/libCom/osi/os/RTEMS/osdSock.h
index a97241126..dce24645f 100644
--- a/src/libCom/osi/os/RTEMS/osdSock.h
+++ b/src/libCom/osi/os/RTEMS/osdSock.h
@@ -5,7 +5,6 @@
 \*************************************************************************/
 /*
  * RTEMS osdSock.h
- *	$Revision-Id$
  *      Author: W. Eric Norum
  *              eric@cls.usask.ca
  *              (306) 966-6055
diff --git a/src/libCom/osi/os/RTEMS/osdThread.c b/src/libCom/osi/os/RTEMS/osdThread.c
index ed6e73368..d177cf3f2 100644
--- a/src/libCom/osi/os/RTEMS/osdThread.c
+++ b/src/libCom/osi/os/RTEMS/osdThread.c
@@ -5,7 +5,6 @@
 \*************************************************************************/
 /*
  * RTEMS osdThread.c
- *      $Revision-Id$
  *      Author: W. Eric Norum
  */
 
diff --git a/src/libCom/osi/os/RTEMS/osdTime.cpp b/src/libCom/osi/os/RTEMS/osdTime.cpp
index 5e21f3087..4947c568e 100644
--- a/src/libCom/osi/os/RTEMS/osdTime.cpp
+++ b/src/libCom/osi/os/RTEMS/osdTime.cpp
@@ -6,8 +6,6 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
- * $Revision-Id$
- *
  * Author: W. Eric Norum
  */
 #define __BSD_VISIBLE 1
diff --git a/src/libCom/osi/os/RTEMS/osdTime.h b/src/libCom/osi/os/RTEMS/osdTime.h
index 5790ec3b6..55e3bc2b0 100644
--- a/src/libCom/osi/os/RTEMS/osdTime.h
+++ b/src/libCom/osi/os/RTEMS/osdTime.h
@@ -7,11 +7,6 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
-/*
- * $Revision-Id$
- *
- */
-
 #ifndef INC_osdTime_H
 #define INC_osdTime_H
 
diff --git a/src/libCom/osi/os/RTEMS/osdVME.h b/src/libCom/osi/os/RTEMS/osdVME.h
index 5e8c5f984..65548abcb 100644
--- a/src/libCom/osi/os/RTEMS/osdVME.h
+++ b/src/libCom/osi/os/RTEMS/osdVME.h
@@ -7,7 +7,6 @@
 * and higher are distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 
 /*
  * OS-dependent VME support
diff --git a/src/libCom/osi/os/RTEMS/osiFileName.h b/src/libCom/osi/os/RTEMS/osiFileName.h
index 5cd57e52c..8c9226898 100644
--- a/src/libCom/osi/os/RTEMS/osiFileName.h
+++ b/src/libCom/osi/os/RTEMS/osiFileName.h
@@ -6,7 +6,6 @@
 \*************************************************************************/
 /*
  * RTEMS osiFileName.h
- *	$Revision-Id$
  *      Author: W. Eric Norum
  *              eric@cls.usask.ca
  *              (306) 966-6055
diff --git a/src/libCom/osi/os/RTEMS/osiUnistd.h b/src/libCom/osi/os/RTEMS/osiUnistd.h
index e5264267c..c0a6e222d 100644
--- a/src/libCom/osi/os/RTEMS/osiUnistd.h
+++ b/src/libCom/osi/os/RTEMS/osiUnistd.h
@@ -8,16 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Revision-Id$
- *
- *                              
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *                                  
- *  Copyright, 1986, The Regents of the University of California.
- *                                  
- *           
  *	Author Jeffrey O. Hill
  *	johill@lanl.gov
  *	505 665 1831
diff --git a/src/libCom/osi/os/WIN32/epicsSocketConvertErrnoToString.cpp b/src/libCom/osi/os/WIN32/epicsSocketConvertErrnoToString.cpp
index 5ab809cde..3db87ac84 100644
--- a/src/libCom/osi/os/WIN32/epicsSocketConvertErrnoToString.cpp
+++ b/src/libCom/osi/os/WIN32/epicsSocketConvertErrnoToString.cpp
@@ -7,10 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/*
- * $Revision-Id$
- */
-
 #include 
 
 #define epicsExportSharedSymbols
diff --git a/src/libCom/osi/os/WIN32/epicsTempFile.cpp b/src/libCom/osi/os/WIN32/epicsTempFile.cpp
index dc90ec9b9..11b835134 100644
--- a/src/libCom/osi/os/WIN32/epicsTempFile.cpp
+++ b/src/libCom/osi/os/WIN32/epicsTempFile.cpp
@@ -9,7 +9,6 @@
 \*************************************************************************/
 
 /*
- *  $Revision-Id$
  *  Author: Jeff Hill 
  */
 
diff --git a/src/libCom/osi/os/WIN32/osdEvent.c b/src/libCom/osi/os/WIN32/osdEvent.c
index a57d43608..314138b27 100644
--- a/src/libCom/osi/os/WIN32/osdEvent.c
+++ b/src/libCom/osi/os/WIN32/osdEvent.c
@@ -8,7 +8,6 @@
 \*************************************************************************/
 /* osdEvent.c */
 /*
- *      $Revision-Id$
  *      WIN32 version
  *
  *      Author  Jeffrey O. Hill
diff --git a/src/libCom/osi/os/WIN32/osdEvent.h b/src/libCom/osi/os/WIN32/osdEvent.h
index b5dd115bf..f57f2cc49 100644
--- a/src/libCom/osi/os/WIN32/osdEvent.h
+++ b/src/libCom/osi/os/WIN32/osdEvent.h
@@ -9,7 +9,6 @@
 \*************************************************************************/
 /* osdEvent.c */
 /*
- *      $Revision-Id$
  *      WIN32 version
  *
  *      Author  Jeffrey O. Hill
diff --git a/src/libCom/osi/os/WIN32/osdMutex.c b/src/libCom/osi/os/WIN32/osdMutex.c
index 0104ac566..63a51efd5 100644
--- a/src/libCom/osi/os/WIN32/osdMutex.c
+++ b/src/libCom/osi/os/WIN32/osdMutex.c
@@ -9,7 +9,6 @@
 \*************************************************************************/
 /* osdMutex.c */
 /*
- *      $Revision-Id$
  *      WIN32 version
  *
  *      Author  Jeffrey O. Hill
diff --git a/src/libCom/osi/os/WIN32/osdMutex.h b/src/libCom/osi/os/WIN32/osdMutex.h
index e531f792d..d8f3f78bd 100644
--- a/src/libCom/osi/os/WIN32/osdMutex.h
+++ b/src/libCom/osi/os/WIN32/osdMutex.h
@@ -10,7 +10,6 @@
 
 /* osdMutex.h */
 /*
- *      $Revision-Id$
  *      WIN32 version
  *
  *      Author  Jeffrey O. Hill
diff --git a/src/libCom/osi/os/WIN32/osdNetIntf.c b/src/libCom/osi/os/WIN32/osdNetIntf.c
index c508bfdfd..db445d494 100644
--- a/src/libCom/osi/os/WIN32/osdNetIntf.c
+++ b/src/libCom/osi/os/WIN32/osdNetIntf.c
@@ -3,18 +3,15 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*
- *	    $Revision-Id$
- *
- *	    WIN32 specific initialisation for bsd sockets,
- *	    based on Chris Timossi's base/src/ca/windows_depend.c,
+ *      WIN32 specific initialisation for bsd sockets,
+ *      based on Chris Timossi's base/src/ca/windows_depend.c,
  *      and also further additions by Kay Kasemir when this was in
- *	    dllmain.cc
+ *      dllmain.cc
  *
  *      7-1-97  -joh-
  *
@@ -51,14 +48,14 @@ static epicsThreadOnceId osiLocalAddrId = EPICS_THREAD_ONCE_INIT;
  */
 static void osiLocalAddrOnce ( void *raw )
 {
-    SOCKET *psocket = raw;
+    SOCKET              *psocket = raw;
     osiSockAddr         addr;
-    int             	status;
-    INTERFACE_INFO		*pIfinfo;
+    int                 status;
+    INTERFACE_INFO      *pIfinfo;
     INTERFACE_INFO      *pIfinfoList = NULL;
-    unsigned			nelem;
-    DWORD				numifs;
-    DWORD				cbBytesReturned;
+    unsigned            nelem;
+    DWORD               numifs;
+    DWORD               cbBytesReturned;
 
     memset ( (void *) &addr, '\0', sizeof ( addr ) );
     addr.sa.sa_family = AF_UNSPEC;
@@ -68,7 +65,7 @@ static void osiLocalAddrOnce ( void *raw )
         goto fail;
     }
 
-    nelem = 10;
+    nelem = 100;
     pIfinfoList = (INTERFACE_INFO *) calloc ( nelem, sizeof (INTERFACE_INFO) );
     if (!pIfinfoList) {
         errlogPrintf ("calloc failed\n");
@@ -137,12 +134,12 @@ epicsShareFunc osiSockAddr epicsShareAPI osiLocalAddr (SOCKET socket)
 epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
      (ELLLIST *pList, SOCKET socket, const osiSockAddr *pMatchAddr)
 {
-    int             	status;
+    int                 status;
     INTERFACE_INFO      *pIfinfo;
     INTERFACE_INFO      *pIfinfoList;
-    unsigned			nelem;
-    int					numifs;
-    DWORD				cbBytesReturned;
+    unsigned            nelem;
+    int                 numifs;
+    DWORD               cbBytesReturned;
     osiSockAddrNode     *pNewNode;
 
     if ( pMatchAddr->sa.sa_family == AF_INET  ) {
@@ -165,7 +162,7 @@ epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
         return;
     }
 
-    nelem = 10;
+    nelem = 100;
     pIfinfoList = (INTERFACE_INFO *) calloc(nelem, sizeof(INTERFACE_INFO));
     if(!pIfinfoList){
         return;
diff --git a/src/libCom/osi/os/WIN32/osdProcess.c b/src/libCom/osi/os/WIN32/osdProcess.c
index fcf1e2feb..6e69c0485 100644
--- a/src/libCom/osi/os/WIN32/osdProcess.c
+++ b/src/libCom/osi/os/WIN32/osdProcess.c
@@ -8,8 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* 
- * $Revision-Id$
- * 
  * Operating System Dependent Implementation of osiProcess.h
  *
  * Author: Jeff Hill
diff --git a/src/libCom/osi/os/WIN32/osdSock.c b/src/libCom/osi/os/WIN32/osdSock.c
index 564fe431c..b8c8363fb 100644
--- a/src/libCom/osi/os/WIN32/osdSock.c
+++ b/src/libCom/osi/os/WIN32/osdSock.c
@@ -9,8 +9,6 @@
 \*************************************************************************/
 
 /*
- *	    $Revision-Id$
- *
  *	    WIN32 specific initialisation for bsd sockets,
  *	    based on Chris Timossi's base/src/ca/windows_depend.c,
  *      and also further additions by Kay Kasemir when this was in
diff --git a/src/libCom/osi/os/WIN32/osdSockAddrReuse.cpp b/src/libCom/osi/os/WIN32/osdSockAddrReuse.cpp
index e8de4d4b7..d441d7511 100644
--- a/src/libCom/osi/os/WIN32/osdSockAddrReuse.cpp
+++ b/src/libCom/osi/os/WIN32/osdSockAddrReuse.cpp
@@ -10,7 +10,6 @@
 \*************************************************************************/
 
 /*
- * $Revision-Id$
  * Author: Jeff Hill
  */
 
diff --git a/src/libCom/osi/os/WIN32/osdThread.c b/src/libCom/osi/os/WIN32/osdThread.c
index 9d45e28e0..b8590086a 100644
--- a/src/libCom/osi/os/WIN32/osdThread.c
+++ b/src/libCom/osi/os/WIN32/osdThread.c
@@ -8,11 +8,7 @@
 \*************************************************************************/
 
 /*
- * $Revision-Id$
- *
  * Author: Jeff Hill
- * 
- *
  */
 
 #include 
diff --git a/src/libCom/osi/os/WIN32/osdTime.cpp b/src/libCom/osi/os/WIN32/osdTime.cpp
index 99f75c195..2ee0d3066 100644
--- a/src/libCom/osi/os/WIN32/osdTime.cpp
+++ b/src/libCom/osi/os/WIN32/osdTime.cpp
@@ -7,12 +7,9 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
-//
-// $Revision-Id$
 //
 // Author: Jeff Hill
 //
-//
 
 //
 // ANSI C
diff --git a/src/libCom/osi/os/WIN32/osdTime.h b/src/libCom/osi/os/WIN32/osdTime.h
index abd150c4b..35848f6dc 100644
--- a/src/libCom/osi/os/WIN32/osdTime.h
+++ b/src/libCom/osi/os/WIN32/osdTime.h
@@ -8,8 +8,6 @@
 \*************************************************************************/
 
 /*
- * $Revision-Id$
- *
  * Author: Jeff Hill
  */
 
diff --git a/src/libCom/osi/os/WIN32/osiFileName.h b/src/libCom/osi/os/WIN32/osiFileName.h
index 658975d89..6ff0308b2 100644
--- a/src/libCom/osi/os/WIN32/osiFileName.h
+++ b/src/libCom/osi/os/WIN32/osiFileName.h
@@ -11,7 +11,6 @@
  * osiFileName.h
  * Author: Jeff Hill
  *
- *
  */
 #ifndef osiFileNameH
 #define osiFileNameH
diff --git a/src/libCom/osi/os/WIN32/osiUnistd.h b/src/libCom/osi/os/WIN32/osiUnistd.h
index c8c744f6f..3f34e74cc 100644
--- a/src/libCom/osi/os/WIN32/osiUnistd.h
+++ b/src/libCom/osi/os/WIN32/osiUnistd.h
@@ -8,16 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Revision-Id$
- *
- *                              
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *                                  
- *  Copyright, 1986, The Regents of the University of California.
- *                                  
- *           
  *	Author Jeffrey O. Hill
  *	johill@lanl.gov
  *	505 665 1831
diff --git a/src/libCom/osi/os/WIN32/systemCallIntMech.cpp b/src/libCom/osi/os/WIN32/systemCallIntMech.cpp
index be18c02a1..5e13299c0 100644
--- a/src/libCom/osi/os/WIN32/systemCallIntMech.cpp
+++ b/src/libCom/osi/os/WIN32/systemCallIntMech.cpp
@@ -8,7 +8,6 @@
 * and higher are distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 /*
  *      Author:		Jeff Hill 
  */
diff --git a/src/libCom/osi/os/cygwin32/devLibVMEOSD.c b/src/libCom/osi/os/cygwin32/devLibVMEOSD.c
index bc1ec80cf..53cbd58cd 100644
--- a/src/libCom/osi/os/cygwin32/devLibVMEOSD.c
+++ b/src/libCom/osi/os/cygwin32/devLibVMEOSD.c
@@ -5,8 +5,6 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 #include 
 
 #define epicsExportSharedSymbols
diff --git a/src/libCom/osi/os/cygwin32/osdSockAddrReuse.cpp b/src/libCom/osi/os/cygwin32/osdSockAddrReuse.cpp
index e8de4d4b7..d441d7511 100644
--- a/src/libCom/osi/os/cygwin32/osdSockAddrReuse.cpp
+++ b/src/libCom/osi/os/cygwin32/osdSockAddrReuse.cpp
@@ -10,7 +10,6 @@
 \*************************************************************************/
 
 /*
- * $Revision-Id$
  * Author: Jeff Hill
  */
 
diff --git a/src/libCom/osi/os/cygwin32/osiFileName.h b/src/libCom/osi/os/cygwin32/osiFileName.h
index 658975d89..6d7fd6eb9 100644
--- a/src/libCom/osi/os/cygwin32/osiFileName.h
+++ b/src/libCom/osi/os/cygwin32/osiFileName.h
@@ -10,8 +10,6 @@
 /*
  * osiFileName.h
  * Author: Jeff Hill
- *
- *
  */
 #ifndef osiFileNameH
 #define osiFileNameH
diff --git a/src/libCom/osi/os/cygwin32/systemCallIntMech.cpp b/src/libCom/osi/os/cygwin32/systemCallIntMech.cpp
index 93da75ea6..9c0df3293 100644
--- a/src/libCom/osi/os/cygwin32/systemCallIntMech.cpp
+++ b/src/libCom/osi/os/cygwin32/systemCallIntMech.cpp
@@ -6,7 +6,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
-/* $Revision-Id$ */
 /*
  *      Author:		Jeff Hill 
  */
diff --git a/src/libCom/osi/os/default/devLibVMEOSD.c b/src/libCom/osi/os/default/devLibVMEOSD.c
index 218f5f6ed..b8b1d5047 100644
--- a/src/libCom/osi/os/default/devLibVMEOSD.c
+++ b/src/libCom/osi/os/default/devLibVMEOSD.c
@@ -5,8 +5,6 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 #include 
 
 #define epicsExportSharedSymbols
diff --git a/src/libCom/osi/os/default/epicsMMIODef.h b/src/libCom/osi/os/default/epicsMMIODef.h
index a306f8339..dc4bb4cb7 100644
--- a/src/libCom/osi/os/default/epicsMMIODef.h
+++ b/src/libCom/osi/os/default/epicsMMIODef.h
@@ -90,15 +90,23 @@ nat_iowrite32(volatile void* addr, epicsUInt32 val)
  *@{
  */
 
-#define bswap16(value) ((epicsUInt16) (  \
-        (((epicsUInt16)(value) & 0x00ff) << 8)    |       \
-        (((epicsUInt16)(value) & 0xff00) >> 8)))
+static EPICS_ALWAYS_INLINE
+epicsUInt16
+bswap16(epicsUInt16 value)
+{
+    return (((epicsUInt16)(value) & 0x00ff) << 8)    |
+           (((epicsUInt16)(value) & 0xff00) >> 8);
+}
 
-#define bswap32(value) (  \
-        (((epicsUInt32)(value) & 0x000000ff) << 24)   |                \
-        (((epicsUInt32)(value) & 0x0000ff00) << 8)    |                \
-        (((epicsUInt32)(value) & 0x00ff0000) >> 8)    |                \
-        (((epicsUInt32)(value) & 0xff000000) >> 24))
+static EPICS_ALWAYS_INLINE
+epicsUInt32
+bswap32(epicsUInt32 value)
+{
+    return (((epicsUInt32)(value) & 0x000000ff) << 24)   |
+           (((epicsUInt32)(value) & 0x0000ff00) << 8)    |
+           (((epicsUInt32)(value) & 0x00ff0000) >> 8)    |
+           (((epicsUInt32)(value) & 0xff000000) >> 24);
+}
 
 #  define be_ioread16(A)    nat_ioread16(A)
 #  define be_ioread32(A)    nat_ioread32(A)
diff --git a/src/libCom/osi/os/default/epicsSocketConvertErrnoToString.cpp b/src/libCom/osi/os/default/epicsSocketConvertErrnoToString.cpp
index 0e0ef94f0..3cbfce60d 100644
--- a/src/libCom/osi/os/default/epicsSocketConvertErrnoToString.cpp
+++ b/src/libCom/osi/os/default/epicsSocketConvertErrnoToString.cpp
@@ -7,7 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* osdSock.c */
-/* $Revision-Id$ */
 /*
  *      Author:		Jeff Hill 
  *      Date:          	04-05-94 
diff --git a/src/libCom/osi/os/default/osdAssert.c b/src/libCom/osi/os/default/osdAssert.c
index 1bd8e7f65..14d548c3d 100644
--- a/src/libCom/osi/os/default/osdAssert.c
+++ b/src/libCom/osi/os/default/osdAssert.c
@@ -6,7 +6,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 /*
  *      Author:         Jeffrey Hill
  *      Date:           02-27-95
diff --git a/src/libCom/osi/os/default/osdEnv.c b/src/libCom/osi/os/default/osdEnv.c
index 6c67a6999..682bcc934 100644
--- a/src/libCom/osi/os/default/osdEnv.c
+++ b/src/libCom/osi/os/default/osdEnv.c
@@ -5,8 +5,6 @@
 \*************************************************************************/
 /* osdEnv.c */
 /*
- * $Revision-Id$
- *
  * Author: Eric Norum
  *   Date: May 7, 2001
  *
diff --git a/src/libCom/osi/os/default/osdMessageQueue.cpp b/src/libCom/osi/os/default/osdMessageQueue.cpp
index ed599d62d..c86d8cc2b 100644
--- a/src/libCom/osi/os/default/osdMessageQueue.cpp
+++ b/src/libCom/osi/os/default/osdMessageQueue.cpp
@@ -8,8 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *      $Revision-Id$
- *
  *      Author  W. Eric Norum
  *              norume@aps.anl.gov
  *              630 252 4793
diff --git a/src/libCom/osi/os/default/osdNetIntf.c b/src/libCom/osi/os/default/osdNetIntf.c
index c3f1a89cb..62247bc5d 100644
--- a/src/libCom/osi/os/default/osdNetIntf.c
+++ b/src/libCom/osi/os/default/osdNetIntf.c
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
 /*
  *      Author:		Jeff Hill 
  *      Date:       04-05-94 
@@ -77,6 +76,21 @@ epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
     struct ifreq                    *pifreq;
     struct ifreq                    *pnextifreq;
     osiSockAddrNode                 *pNewNode;
+
+    if ( pMatchAddr->sa.sa_family == AF_INET  ) {
+        if ( pMatchAddr->ia.sin_addr.s_addr == htonl (INADDR_LOOPBACK) ) {
+            pNewNode = (osiSockAddrNode *) calloc (1, sizeof (*pNewNode) );
+            if ( pNewNode == NULL ) {
+                errlogPrintf ( "osiSockDiscoverBroadcastAddresses(): no memory available for configuration\n" );
+                return;
+            }
+            pNewNode->addr.ia.sin_family = AF_INET;
+            pNewNode->addr.ia.sin_port = htons ( 0 );
+            pNewNode->addr.ia.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
+            ellAdd ( pList, &pNewNode->node );
+            return;
+        }
+    }
      
     /*
      * use pool so that we avoid using too much stack space
@@ -104,7 +118,6 @@ epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
 
     for ( pifreq = pIfreqList; pifreq <= pIfreqListEnd; pifreq = pnextifreq ) {
         uint32_t  current_ifreqsize;
-        struct sockaddr_in if_addr;
 
         /*
          * find the next ifreq
@@ -128,7 +141,6 @@ epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
              ifDepenDebugPrintf ( ("osiSockDiscoverBroadcastAddresses(): interface \"%s\" was not AF_INET\n", pIfreqList->ifr_name) );
              continue;
         }
-        if_addr = *(struct sockaddr_in *)&pIfreqList->ifr_addr;
 
         /*
          * if it isnt a wildcarded interface then look for
@@ -139,7 +151,8 @@ epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
                 continue;
             }
             if ( pMatchAddr->ia.sin_addr.s_addr != htonl (INADDR_ANY) ) {
-                 if ( if_addr.sin_addr.s_addr != pMatchAddr->ia.sin_addr.s_addr ) {
+                 struct sockaddr_in *pInetAddr = (struct sockaddr_in *) &pIfreqList->ifr_addr;
+                 if ( pInetAddr->sin_addr.s_addr != pMatchAddr->ia.sin_addr.s_addr ) {
                      ifDepenDebugPrintf ( ("osiSockDiscoverBroadcastAddresses(): net intf \"%s\" didnt match\n", pIfreqList->ifr_name) );
                      continue;
                  }
@@ -161,6 +174,14 @@ epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
              continue;
         }
 
+        /*
+         * dont use the loop back interface 
+         */
+        if ( pIfreqList->ifr_flags & IFF_LOOPBACK ) {
+             ifDepenDebugPrintf ( ("osiSockDiscoverBroadcastAddresses(): ignoring loopback interface: \"%s\"\n", pIfreqList->ifr_name) );
+             continue;
+        }
+
         pNewNode = (osiSockAddrNode *) calloc (1, sizeof (*pNewNode) );
         if ( pNewNode == NULL ) {
             errlogPrintf ( "osiSockDiscoverBroadcastAddresses(): no memory available for configuration\n" );
@@ -179,14 +200,22 @@ epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
          * interface.
          */
         if ( pIfreqList->ifr_flags & IFF_BROADCAST ) {
+            osiSockAddr baddr;
             status = socket_ioctl (socket, SIOCGIFBRDADDR, pIfreqList);
             if ( status ) {
                 errlogPrintf ("osiSockDiscoverBroadcastAddresses(): net intf \"%s\": bcast addr fetch fail\n", pIfreqList->ifr_name);
                 free ( pNewNode );
                 continue;
             }
-            pNewNode->addr.sa = pIfreqList->ifr_broadaddr;
-            ifDepenDebugPrintf ( ( "found broadcast addr = %x\n", ntohl ( pNewNode->addr.ia.sin_addr.s_addr ) ) );
+            baddr.sa = pIfreqList->ifr_broadaddr;
+            if (baddr.ia.sin_family==AF_INET && baddr.ia.sin_addr.s_addr != INADDR_ANY) {
+                pNewNode->addr.sa = pIfreqList->ifr_broadaddr;
+                ifDepenDebugPrintf ( ( "found broadcast addr = %x\n", ntohl ( baddr.ia.sin_addr.s_addr ) ) );
+            } else {
+                ifDepenDebugPrintf ( ( "Ignoring broadcast addr = \n", ntohl ( baddr.ia.sin_addr.s_addr ) ) );
+                free ( pNewNode );
+                continue;
+            }
         }
 #if defined (IFF_POINTOPOINT)
         else if ( pIfreqList->ifr_flags & IFF_POINTOPOINT ) {
@@ -198,22 +227,6 @@ epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
             }
             pNewNode->addr.sa = pIfreqList->ifr_dstaddr;
         }
-#endif
-#if defined(__linux__)
-        /* On Linux, even though the 'lo' interface doesn't set IFF_BROADCAST
-         * a broadcast route often exists.  Assume that sending to 127.255.255.255
-         * reaches all local listeners.
-         *
-         *   $ ip route show table local scope link dev lo
-         *   broadcast 127.0.0.0  proto kernel  src 127.0.0.1
-         *   broadcast 127.255.255.255  proto kernel  src 127.0.0.1
-         */
-        else if ( pIfreqList->ifr_flags & IFF_LOOPBACK && if_addr.sin_addr.s_addr == htonl(INADDR_LOOPBACK) ) {
-            memset(&pNewNode->addr.ia, 0, sizeof(pNewNode->addr.ia));
-            pNewNode->addr.ia.sin_family = AF_INET;
-            pNewNode->addr.ia.sin_addr.s_addr = htonl(0x7fffffff);
-            ifDepenDebugPrintf ( ( "assume loopback broadcast addr = %x\n", ntohl ( pNewNode->addr.ia.sin_addr.s_addr ) ) );
-        }
 #endif
         else {
             ifDepenDebugPrintf ( ( "osiSockDiscoverBroadcastAddresses(): net intf \"%s\": not point to point or bcast?\n", pIfreqList->ifr_name ) );
diff --git a/src/libCom/osi/os/default/osdVME.h b/src/libCom/osi/os/default/osdVME.h
index 37ac6a30a..1b65b3184 100644
--- a/src/libCom/osi/os/default/osdVME.h
+++ b/src/libCom/osi/os/default/osdVME.h
@@ -7,7 +7,6 @@
 * and higher are distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 
 /*
  * OS-dependent VME support
diff --git a/src/libCom/osi/os/default/osdWireFormat.h b/src/libCom/osi/os/default/osdWireFormat.h
index 6db3e20ab..385c9bd69 100644
--- a/src/libCom/osi/os/default/osdWireFormat.h
+++ b/src/libCom/osi/os/default/osdWireFormat.h
@@ -8,13 +8,6 @@
 \*************************************************************************/
 
 /*
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *
- *  Copyright, 2000, The Regents of the University of California.
- *
- *
  *  Author Jeffrey O. Hill
  *  johill@lanl.gov
  */
diff --git a/src/libCom/osi/os/freebsd/osdTime.h b/src/libCom/osi/os/freebsd/osdTime.h
index d0a61c9e0..941426c72 100644
--- a/src/libCom/osi/os/freebsd/osdTime.h
+++ b/src/libCom/osi/os/freebsd/osdTime.h
@@ -5,8 +5,6 @@
 \*************************************************************************/
 
 /*
- * $Revision-Id$
- *
  * Author: Eric Norum
  */
 
diff --git a/src/libCom/osi/os/freebsd/osiFileName.h b/src/libCom/osi/os/freebsd/osiFileName.h
index a64c19ad8..83204c70f 100644
--- a/src/libCom/osi/os/freebsd/osiFileName.h
+++ b/src/libCom/osi/os/freebsd/osiFileName.h
@@ -9,8 +9,6 @@
 /*
  * osiFileName.h
  * Author: Jeff Hill
- *
- *
  */
 #ifndef osiFileNameH
 #define osiFileNameH
diff --git a/src/libCom/osi/os/freebsd/osiUnistd.h b/src/libCom/osi/os/freebsd/osiUnistd.h
index b96f87b5f..c64e57a6c 100644
--- a/src/libCom/osi/os/freebsd/osiUnistd.h
+++ b/src/libCom/osi/os/freebsd/osiUnistd.h
@@ -7,16 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Revision-Id$
- *
- *                              
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *                                  
- *  Copyright, 1986, The Regents of the University of California.
- *                                  
- *           
  *	Author Jeffrey O. Hill
  *	johill@lanl.gov
  *	505 665 1831
diff --git a/src/libCom/osi/os/iOS/osdEnv.c b/src/libCom/osi/os/iOS/osdEnv.c
index c631ec4f8..a32cce5ef 100644
--- a/src/libCom/osi/os/iOS/osdEnv.c
+++ b/src/libCom/osi/os/iOS/osdEnv.c
@@ -6,13 +6,10 @@
 
 /* osdEnv.c */
 /*
- * $Revision-Id$
- *
  * Author: Eric Norum
  *   Date: May 7, 2001
  *
  * Routines to modify/display environment variables and EPICS parameters
- *
  */
 
 #include 
diff --git a/src/libCom/osi/os/iOS/osdSock.h b/src/libCom/osi/os/iOS/osdSock.h
index 149c4021c..f3a15c88d 100644
--- a/src/libCom/osi/os/iOS/osdSock.h
+++ b/src/libCom/osi/os/iOS/osdSock.h
@@ -5,8 +5,6 @@
 \*************************************************************************/
 
 /*
- * $Revision-Id$
- *
  * Author: Eric Norum
  */
 
diff --git a/src/libCom/osi/os/iOS/osdSockAddrReuse.cpp b/src/libCom/osi/os/iOS/osdSockAddrReuse.cpp
index f5aa99f31..9f64e331a 100644
--- a/src/libCom/osi/os/iOS/osdSockAddrReuse.cpp
+++ b/src/libCom/osi/os/iOS/osdSockAddrReuse.cpp
@@ -8,7 +8,6 @@
 \*************************************************************************/
 
 /*
- * $Revision-Id$
  * Author: Jeff Hill
  */
 
diff --git a/src/libCom/osi/os/iOS/osdTime.h b/src/libCom/osi/os/iOS/osdTime.h
index 554999779..953ec31b8 100644
--- a/src/libCom/osi/os/iOS/osdTime.h
+++ b/src/libCom/osi/os/iOS/osdTime.h
@@ -5,8 +5,6 @@
 \*************************************************************************/
 
 /*
- * $Revision-Id$
- *
  * Author: Eric Norum
  */
 
diff --git a/src/libCom/osi/os/iOS/osiFileName.h b/src/libCom/osi/os/iOS/osiFileName.h
index b88bfe35a..f7dd62878 100644
--- a/src/libCom/osi/os/iOS/osiFileName.h
+++ b/src/libCom/osi/os/iOS/osiFileName.h
@@ -5,8 +5,6 @@
 \*************************************************************************/
 
 /*
- * $Revision-Id$
- *
  * Author: Eric Norum
  */
 
diff --git a/src/libCom/osi/os/posix/epicsMath.h b/src/libCom/osi/os/posix/epicsMath.h
index 4ed0fdc51..4e558676c 100644
--- a/src/libCom/osi/os/posix/epicsMath.h
+++ b/src/libCom/osi/os/posix/epicsMath.h
@@ -19,7 +19,7 @@ extern "C" {
 
 #ifdef isfinite
 #  undef finite
-#  define finite(x) isfinite(x)
+#  define finite(x) isfinite((double)(x))
 #endif
 
 epicsShareExtern float epicsNAN;
diff --git a/src/libCom/osi/os/posix/osdProcess.c b/src/libCom/osi/os/posix/osdProcess.c
index 847caa4ad..a08871465 100644
--- a/src/libCom/osi/os/posix/osdProcess.c
+++ b/src/libCom/osi/os/posix/osdProcess.c
@@ -9,8 +9,6 @@
 \*************************************************************************/
 
 /* 
- * $Revision-Id$
- * 
  * Operating System Dependent Implementation of osiProcess.h
  *
  * Author: Jeff Hill
diff --git a/src/libCom/osi/os/posix/osdSock.c b/src/libCom/osi/os/posix/osdSock.c
index 4cd776c92..9f8146142 100644
--- a/src/libCom/osi/os/posix/osdSock.c
+++ b/src/libCom/osi/os/posix/osdSock.c
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* osdSock.c */
-/* $Revision-Id$ */
 /*
  *      Author:		Jeff Hill 
  *      Date:          	04-05-94 
diff --git a/src/libCom/osi/os/posix/osdSockAddrReuse.cpp b/src/libCom/osi/os/posix/osdSockAddrReuse.cpp
index 7ee0c64d2..3a3f78ebd 100644
--- a/src/libCom/osi/os/posix/osdSockAddrReuse.cpp
+++ b/src/libCom/osi/os/posix/osdSockAddrReuse.cpp
@@ -10,7 +10,6 @@
 \*************************************************************************/
 
 /*
- * $Revision-Id$
  * Author: Jeff Hill
  */
 
diff --git a/src/libCom/osi/os/posix/osdTime.h b/src/libCom/osi/os/posix/osdTime.h
index 12ff42a12..d1da77696 100644
--- a/src/libCom/osi/os/posix/osdTime.h
+++ b/src/libCom/osi/os/posix/osdTime.h
@@ -9,8 +9,6 @@
 \*************************************************************************/
 
 /*
- * $Revision-Id$
- *
  * Author: Jeff Hill
  */
 
diff --git a/src/libCom/osi/os/posix/osiUnistd.h b/src/libCom/osi/os/posix/osiUnistd.h
index 5d2bb5e6f..5121261b6 100644
--- a/src/libCom/osi/os/posix/osiUnistd.h
+++ b/src/libCom/osi/os/posix/osiUnistd.h
@@ -8,16 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Revision-Id$
- *
- *                              
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *                                  
- *  Copyright, 1986, The Regents of the University of California.
- *                                  
- *           
  *	Author Jeffrey O. Hill
  *	johill@lanl.gov
  *	505 665 1831
diff --git a/src/libCom/osi/os/posix/systemCallIntMech.cpp b/src/libCom/osi/os/posix/systemCallIntMech.cpp
index 9eb77a1b6..cdac1d0cb 100644
--- a/src/libCom/osi/os/posix/systemCallIntMech.cpp
+++ b/src/libCom/osi/os/posix/systemCallIntMech.cpp
@@ -8,7 +8,6 @@
 * and higher are distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 /*
  *      Author:		Jeff Hill 
  */
diff --git a/src/libCom/osi/os/vxWorks/camacLib.h b/src/libCom/osi/os/vxWorks/camacLib.h
index eb2456b1a..a30ab5659 100644
--- a/src/libCom/osi/os/vxWorks/camacLib.h
+++ b/src/libCom/osi/os/vxWorks/camacLib.h
@@ -14,8 +14,6 @@
  *
  */
 
-static char ht2992_h_RCSID[] = "$Revision-Id$";
-
 /********************************/
 /* GLOBAL DATA			*/
 /********************************/
diff --git a/src/libCom/osi/os/vxWorks/devLibVMEOSD.c b/src/libCom/osi/os/vxWorks/devLibVMEOSD.c
index 22cd177ea..82bec603d 100644
--- a/src/libCom/osi/os/vxWorks/devLibVMEOSD.c
+++ b/src/libCom/osi/os/vxWorks/devLibVMEOSD.c
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* 
- * $Revision-Id$
- *
  * Archictecture dependent support for common device driver resources 
  *
  *      Author: Jeff Hill 
diff --git a/src/libCom/osi/os/vxWorks/epicsDynLink.c b/src/libCom/osi/os/vxWorks/epicsDynLink.c
index ba0fde277..df954782a 100644
--- a/src/libCom/osi/os/vxWorks/epicsDynLink.c
+++ b/src/libCom/osi/os/vxWorks/epicsDynLink.c
@@ -6,8 +6,7 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
-/* $Id $
- *
+/*
  * On 68K targets, all symbols have an underscore prepended to their name.
  * This code permits both standards to work, as long as you're not looking
  * for a symbol name that actually begins with an underscore.
diff --git a/src/libCom/osi/os/vxWorks/epicsMMIO.h b/src/libCom/osi/os/vxWorks/epicsMMIO.h
index dd8abe95a..b12c71ad9 100644
--- a/src/libCom/osi/os/vxWorks/epicsMMIO.h
+++ b/src/libCom/osi/os/vxWorks/epicsMMIO.h
@@ -37,6 +37,7 @@
 
 #include                          /* EPICS Common Type Definitions                  */
 #include                         /* EPICS Byte Order Definitions                   */
+#include  
 
 /*=====================
  * vxAtomicLib.h (which defines the memory barrier macros)
@@ -49,15 +50,23 @@
 #  include  
 #endif
 
-#define bswap16(value) ((epicsUInt16) (  \
-        (((epicsUInt16)(value) & 0x00ff) << 8)    |       \
-        (((epicsUInt16)(value) & 0xff00) >> 8)))
+static EPICS_ALWAYS_INLINE
+epicsUInt16
+bswap16(epicsUInt16 value)
+{
+    return (((epicsUInt16)(value) & 0x00ff) << 8)    |
+           (((epicsUInt16)(value) & 0xff00) >> 8);
+}
 
-#define bswap32(value) (  \
-        (((epicsUInt32)(value) & 0x000000ff) << 24)   |                \
-        (((epicsUInt32)(value) & 0x0000ff00) << 8)    |                \
-        (((epicsUInt32)(value) & 0x00ff0000) >> 8)    |                \
-        (((epicsUInt32)(value) & 0xff000000) >> 24))
+static EPICS_ALWAYS_INLINE
+epicsUInt32
+bswap32(epicsUInt32 value)
+{
+    return (((epicsUInt32)(value) & 0x000000ff) << 24)   |
+           (((epicsUInt32)(value) & 0x0000ff00) << 8)    |
+           (((epicsUInt32)(value) & 0x00ff0000) >> 8)    |
+           (((epicsUInt32)(value) & 0xff000000) >> 24);
+}
 
 #if EPICS_BYTE_ORDER == EPICS_ENDIAN_BIG
 #  define be16_to_cpu(X) (epicsUInt16)(X)
diff --git a/src/libCom/osi/os/vxWorks/logMsgToErrlog.cpp b/src/libCom/osi/os/vxWorks/logMsgToErrlog.cpp
index fade9ffea..b44881cd0 100644
--- a/src/libCom/osi/os/vxWorks/logMsgToErrlog.cpp
+++ b/src/libCom/osi/os/vxWorks/logMsgToErrlog.cpp
@@ -9,8 +9,6 @@
 \*************************************************************************/
 
 /* 
- * $Revision-Id$
- *
  * route vxWorks logMsg messages into the EPICS logging system
  *
  * Author: Jeff Hill
diff --git a/src/libCom/osi/os/vxWorks/module_types.h b/src/libCom/osi/os/vxWorks/module_types.h
index af3dd122f..07372c37a 100644
--- a/src/libCom/osi/os/vxWorks/module_types.h
+++ b/src/libCom/osi/os/vxWorks/module_types.h
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* module_types.h */
-/* base/include $Revision-Id$ */
 /*
  * 	Author:      Bob Dalesio
  * 	Date:        12-07-88
diff --git a/src/libCom/osi/os/vxWorks/osdEnv.c b/src/libCom/osi/os/vxWorks/osdEnv.c
index 085611935..c81f49316 100644
--- a/src/libCom/osi/os/vxWorks/osdEnv.c
+++ b/src/libCom/osi/os/vxWorks/osdEnv.c
@@ -5,8 +5,6 @@
 \*************************************************************************/
 /* osdEnv.c */
 /*
- * $Revision-Id$
- *
  * Author: Eric Norum
  *   Date: May 7, 2001
  *
diff --git a/src/libCom/osi/os/vxWorks/osdMessageQueue.cpp b/src/libCom/osi/os/vxWorks/osdMessageQueue.cpp
index 206d6def4..89c2745ed 100644
--- a/src/libCom/osi/os/vxWorks/osdMessageQueue.cpp
+++ b/src/libCom/osi/os/vxWorks/osdMessageQueue.cpp
@@ -8,8 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *      $Revision-Id$
- *
  *      Author  W. Eric Norum
  *              norume@aps.anl.gov
  *              630 252 4793
diff --git a/src/libCom/osi/os/vxWorks/osdMessageQueue.h b/src/libCom/osi/os/vxWorks/osdMessageQueue.h
index 3ae77b514..87b35bd38 100644
--- a/src/libCom/osi/os/vxWorks/osdMessageQueue.h
+++ b/src/libCom/osi/os/vxWorks/osdMessageQueue.h
@@ -8,8 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *      $Revision-Id$
- *
  *      Author  W. Eric Norum
  *              norume@aps.anl.gov
  *              630 252 4793
diff --git a/src/libCom/osi/os/vxWorks/osdProcess.c b/src/libCom/osi/os/vxWorks/osdProcess.c
index 27f5b71e9..2347a407c 100644
--- a/src/libCom/osi/os/vxWorks/osdProcess.c
+++ b/src/libCom/osi/os/vxWorks/osdProcess.c
@@ -8,8 +8,6 @@
 \*************************************************************************/
 
 /* 
- * $Revision-Id$
- * 
  * Operating System Dependent Implementation of osiProcess.h
  *
  * Author: Jeff Hill
diff --git a/src/libCom/osi/os/vxWorks/osdVME.h b/src/libCom/osi/os/vxWorks/osdVME.h
index a5e3bb346..b9d031a04 100644
--- a/src/libCom/osi/os/vxWorks/osdVME.h
+++ b/src/libCom/osi/os/vxWorks/osdVME.h
@@ -7,7 +7,6 @@
 * and higher are distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 
 /*
  * OS-dependent VME support
diff --git a/src/libCom/osi/os/vxWorks/osiFileName.h b/src/libCom/osi/os/vxWorks/osiFileName.h
index b79203992..3a6448d54 100644
--- a/src/libCom/osi/os/vxWorks/osiFileName.h
+++ b/src/libCom/osi/os/vxWorks/osiFileName.h
@@ -10,8 +10,6 @@
 /*
  * osiFileName.h
  * Author: Jeff Hill
- *
- *
  */
 #ifndef osiFileNameH
 #define osiFileNameH
diff --git a/src/libCom/osi/os/vxWorks/task_params.h b/src/libCom/osi/os/vxWorks/task_params.h
index 455e8ceb2..7b2055157 100644
--- a/src/libCom/osi/os/vxWorks/task_params.h
+++ b/src/libCom/osi/os/vxWorks/task_params.h
@@ -7,7 +7,6 @@
 * and higher are distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 
 /*  Parameters for tasks on IOC  */
 /*
diff --git a/src/libCom/osi/os/vxWorks/veclist.c b/src/libCom/osi/os/vxWorks/veclist.c
index 63aea6618..2a4e617ef 100644
--- a/src/libCom/osi/os/vxWorks/veclist.c
+++ b/src/libCom/osi/os/vxWorks/veclist.c
@@ -8,9 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *	$Revision-Id$
- *	@(#)veclist.c	1.10
- *
  *	list fuctions attached to the interrupt vector table
  *
  *	Created 28Mar89	Jeffrey O. Hill
@@ -19,19 +16,6 @@
  *
  */
 
-/*
- * 
- *	makefile
- *
- *
- * V5VW = /.../vx/v502b
- *
- * veclist.o:
- *	cc68k -c -DCPU_FAMILY=MC680X0 -I$(V5VW)/h veclist.c
- * 
- *
- */
-
 #include "vxWorks.h"
 #include "stdio.h"
 #include "string.h"
@@ -41,9 +25,6 @@
 #include "ctype.h"
 #include "sysSymTbl.h"
 
-static const char sccsID[] = 
-	"@(#) $Revision-Id$";
-
 /*
  *
  * VME bus dependent
diff --git a/src/libCom/osi/osiClockTime.c b/src/libCom/osi/osiClockTime.c
index efe25f8b8..408a93fc0 100644
--- a/src/libCom/osi/osiClockTime.c
+++ b/src/libCom/osi/osiClockTime.c
@@ -23,7 +23,7 @@
 #include "taskwd.h"
 
 #define NSEC_PER_SEC 1000000000
-#define ClockTimeSyncInterval 60.0
+#define ClockTimeSyncInterval_value 60.0
 
 
 static struct {
@@ -32,6 +32,7 @@ static struct {
     epicsEventId    loopEvent;
     epicsTimeStamp  startTime;
     epicsTimeStamp  syncTime;
+    double          ClockTimeSyncInterval;
     int             syncFromPriority;
     epicsMutexId    lock;
 } ClockTimePvt;
@@ -76,6 +77,7 @@ static void ClockTime_InitOnce(void *pfirst)
 
     ClockTimePvt.loopEvent   = epicsEventMustCreate(epicsEventEmpty);
     ClockTimePvt.lock        = epicsMutexCreate();
+    ClockTimePvt.ClockTimeSyncInterval = 1.0;   /* First sync */
 
     epicsAtExit(ClockTime_Shutdown, NULL);
 
@@ -142,10 +144,10 @@ static void ClockTimeSync(void *dummy)
     taskwdInsert(0, NULL, NULL);
 
     for (epicsEventWaitWithTimeout(ClockTimePvt.loopEvent,
-             ClockTimeSyncInterval);
+             ClockTimePvt.ClockTimeSyncInterval);
          ClockTimePvt.synchronize == CLOCKTIME_SYNC;
          epicsEventWaitWithTimeout(ClockTimePvt.loopEvent,
-             ClockTimeSyncInterval)) {
+             ClockTimePvt.ClockTimeSyncInterval)) {
         epicsTimeStamp timeNow;
         int priority;
 
@@ -167,6 +169,8 @@ static void ClockTimeSync(void *dummy)
             ClockTimePvt.syncFromPriority = priority;
             ClockTimePvt.syncTime         = timeNow;
             epicsMutexUnlock(ClockTimePvt.lock);
+
+            ClockTimePvt.ClockTimeSyncInterval = ClockTimeSyncInterval_value;
         }
     }
 
@@ -244,7 +248,7 @@ int ClockTime_Report(int level)
                 printf("Last successful sync was at %s\n", timebuf);
             }
             printf("Syncronization interval = %.0f seconds\n",
-                ClockTimeSyncInterval);
+                ClockTimePvt.ClockTimeSyncInterval);
         }
         else
             printf("OS Clock driver is *not* synchronized\n");
diff --git a/src/libCom/osi/osiPoolStatus.h b/src/libCom/osi/osiPoolStatus.h
index 20f1b7339..b0207f185 100644
--- a/src/libCom/osi/osiPoolStatus.h
+++ b/src/libCom/osi/osiPoolStatus.h
@@ -11,8 +11,6 @@
 #define INC_osiPoolStatus_H
 
 /*
- * $Revision-Id$
- *
  * Author: Jeff Hill
  *
  * Functions which interrogate the state of the system wide pool
diff --git a/src/libCom/osi/osiProcess.h b/src/libCom/osi/osiProcess.h
index b954c4019..eabff1e72 100644
--- a/src/libCom/osi/osiProcess.h
+++ b/src/libCom/osi/osiProcess.h
@@ -11,8 +11,6 @@
 #define INC_osiProcess_H
 
 /* 
- * $Revision-Id$
- * 
  * Operating System Independent Interface to Process Environment
  *
  * Author: Jeff Hill
diff --git a/src/libCom/osi/osiSock.c b/src/libCom/osi/osiSock.c
index e030f5ab2..8b4634caf 100644
--- a/src/libCom/osi/osiSock.c
+++ b/src/libCom/osi/osiSock.c
@@ -9,8 +9,6 @@
 \*************************************************************************/
 
 /*
- *	    $Revision-Id$
- *
  *      socket support library generic code
  *
  *      7-1-97  -joh-
diff --git a/src/libCom/osi/osiSock.h b/src/libCom/osi/osiSock.h
index 1b52c7993..061619e89 100644
--- a/src/libCom/osi/osiSock.h
+++ b/src/libCom/osi/osiSock.h
@@ -8,8 +8,6 @@
 \*************************************************************************/
 
 /*
- *	    $Revision-Id$
- *
  *      socket support library API def
  *
  *      7-1-97  -joh-
diff --git a/src/libCom/osi/osiWireFormat.h b/src/libCom/osi/osiWireFormat.h
index 1ba8b905d..4d7e6717f 100644
--- a/src/libCom/osi/osiWireFormat.h
+++ b/src/libCom/osi/osiWireFormat.h
@@ -8,13 +8,6 @@
 \*************************************************************************/
 
 /*
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *
- *  Copyright, 2000, The Regents of the University of California.
- *
- *
  *  Author Jeffrey O. Hill
  *  johill@lanl.gov
  */
diff --git a/src/libCom/taskwd/taskwd.h b/src/libCom/taskwd/taskwd.h
index 2d66be950..4d5274d56 100644
--- a/src/libCom/taskwd/taskwd.h
+++ b/src/libCom/taskwd/taskwd.h
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* General purpose task watchdog */
 /*
  *      Original Author:        Marty Kraimer
diff --git a/src/libCom/test/Makefile b/src/libCom/test/Makefile
index f0359420d..6de92321e 100755
--- a/src/libCom/test/Makefile
+++ b/src/libCom/test/Makefile
@@ -98,6 +98,7 @@ TESTS += epicsTimeTest
 
 TESTPROD_HOST += epicsTimeZoneTest
 epicsTimeZoneTest_SRCS += epicsTimeZoneTest.c
+libComTestHarness_SRCS_RTEMS += epicsTimeZoneTest.c
 TESTS += epicsTimeZoneTest
 
 TESTPROD_HOST += epicsThreadTest
@@ -170,11 +171,6 @@ epicsAtomicTest_SRCS += epicsAtomicTest.cpp
 testHarness_SRCS += epicsAtomicTest.cpp
 TESTS += epicsAtomicTest
 
-TESTPROD_HOST += epicsExceptionTest
-epicsExceptionTest_SRCS += epicsExceptionTest.cpp
-testHarness_SRCS += epicsExceptionTest.cpp
-TESTS += epicsExceptionTest
-
 TESTPROD_HOST += macDefExpandTest
 macDefExpandTest_SRCS += macDefExpandTest.c
 testHarness_SRCS += macDefExpandTest.c
diff --git a/src/libCom/test/epicsCalcTest.cpp b/src/libCom/test/epicsCalcTest.cpp
index 24e30d417..1bd046d37 100644
--- a/src/libCom/test/epicsCalcTest.cpp
+++ b/src/libCom/test/epicsCalcTest.cpp
@@ -4,7 +4,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
-// $Revision-Id$
 //	Author: Andrew Johnson
 
 #include "epicsUnitTest.h"
diff --git a/src/libCom/test/epicsExceptionTest.cpp b/src/libCom/test/epicsExceptionTest.cpp
deleted file mode 100644
index d6c3ecd9b..000000000
--- a/src/libCom/test/epicsExceptionTest.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
-*     National Laboratory.
-* Copyright (c) 2002 The Regents of the University of California, as
-*     Operator of Los Alamos National Laboratory.
-* EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
-\*************************************************************************/
-
-//
-// Verify that the local c++ exception mechanism matches the ANSI/ISO standard.
-// Author: Jeff Hill
-//
-
-#include 
-#include 
-#include 
-#if defined(__GNUC__) && (__GNUC__<2 || (__GNUC__==2 && __GNUC_MINOR__<=96))
-#include 
-#else
-#include 
-#endif
-
-#include "epicsUnitTest.h"
-#include "epicsThread.h"
-#include "testMain.h"
-
-using namespace std;
-
-#if defined ( _MSC_VER )
-    // some interesting bugs found in the MS implementation of new
-#   if _MSC_VER >= 1900
-        static size_t unsuccessfulNewSize = numeric_limits < size_t > :: max ();
-#   elif _MSC_VER > 1310  /* this gets fixed some release after visual studio 7 we hope */
-        static const size_t unsuccessfulNewSize = numeric_limits < size_t > :: max ();
-#   else
-        static const size_t unsuccessfulNewSize = numeric_limits < size_t > :: max () - 100;
-#   endif
-    // passing a size_t to printf() needs "%zu" on some platforms
-#elif defined(vxWorks)
-    // Neither vxWorks 5 or 6 supply true ANSI C++
-    static const size_t unsuccessfulNewSize = UINT_MAX - 15u;
-#else
-    static const size_t unsuccessfulNewSize = numeric_limits < size_t > :: max ();
-#endif
-
-class exThread : public epicsThreadRunable {
-public:
-    exThread ();
-    void waitForCompletion ();
-    ~exThread() {};
-private:
-    epicsThread thread;
-    bool done;
-    void run ();
-};
-
-static void epicsExceptionTestPrivate ()
-{
-    try {
-        char * p = new char [unsuccessfulNewSize];
-        testFail("new char[%lu] returned %p",
-            (unsigned long) unsuccessfulNewSize, p);
-    }
-    catch ( const bad_alloc & ) {
-        testPass("new char[%lu] threw",
-            (unsigned long) unsuccessfulNewSize);
-    }
-    catch ( ... ) {
-        testFail("new: threw wrong type");
-    }
-    try {
-        char * p = new ( nothrow ) 
-            char [unsuccessfulNewSize];
-        testOk(p == 0, "new (nothrow) returned %p", p);
-    }
-    catch( ... ) {
-        testFail("new (nothrow): threw");
-    }
-}
-
-exThread::exThread () :
-    thread ( *this, "testExceptions", epicsThreadGetStackSize(epicsThreadStackSmall) ),
-        done ( false )
-{
-    this->thread.start ();
-}
-
-void exThread::run ()
-{
-    epicsExceptionTestPrivate ();
-    this->done = true;
-}
-
-void exThread::waitForCompletion ()
-{
-    while ( ! this->done ) {
-        epicsThreadSleep ( 0.1 );
-    }
-}
-
-MAIN(epicsExceptionTest)
-{
-    testPlan(4);
-    epicsExceptionTestPrivate ();
-    
-    exThread athread;
-    athread.waitForCompletion ();
-    return testDone();
-}
diff --git a/src/libCom/test/epicsMessageQueueTest.cpp b/src/libCom/test/epicsMessageQueueTest.cpp
index e4216c291..ae090fc47 100644
--- a/src/libCom/test/epicsMessageQueueTest.cpp
+++ b/src/libCom/test/epicsMessageQueueTest.cpp
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
- *      $Revision-Id$
- *
  *      Author  W. Eric Norum
  */
 #include 
diff --git a/src/libCom/test/epicsRunLibComTests.c b/src/libCom/test/epicsRunLibComTests.c
index 5022fef69..389d7e305 100644
--- a/src/libCom/test/epicsRunLibComTests.c
+++ b/src/libCom/test/epicsRunLibComTests.c
@@ -24,7 +24,6 @@ int epicsEllTest(void);
 int epicsEnvTest(void);
 int epicsErrlogTest(void);
 int epicsEventTest(void);
-int epicsExceptionTest(void);
 int epicsExitTest(void);
 int epicsMathTest(void);
 int epicsMessageQueueTest(void);
@@ -47,6 +46,9 @@ int epicsTimeTest(void);
 int epicsTypesTest(void);
 int epicsInlineTest(void);
 int macDefExpandTest(void);
+#ifdef __rtems__
+int epicsTimeZoneTest(void);
+#endif
 int macLibTest(void);
 int ringBytesTest(void);
 int ringPointerTest(void);
@@ -77,7 +79,6 @@ void epicsRunLibComTests(void)
     runTest(epicsEnvTest);
     runTest(epicsErrlogTest);
     runTest(epicsEventTest);
-    runTest(epicsExceptionTest);
     runTest(epicsMathTest);
     runTest(epicsMessageQueueTest);
     runTest(epicsMMIOTest);
@@ -97,6 +98,11 @@ void epicsRunLibComTests(void)
     runTest(epicsTypesTest);
     runTest(epicsInlineTest);
     runTest(macDefExpandTest);
+
+#ifdef __rtems__
+    runTest(epicsTimeZoneTest);
+#endif
+
     runTest(macLibTest);
     runTest(ringBytesTest);
     runTest(ringPointerTest);
diff --git a/src/libCom/test/epicsStringTest.c b/src/libCom/test/epicsStringTest.c
index a5fffaf49..9c50d3c82 100644
--- a/src/libCom/test/epicsStringTest.c
+++ b/src/libCom/test/epicsStringTest.c
@@ -6,8 +6,7 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
-/* $Revision-Id$
- *
+/*
  *      Author  Marty Kraimer
  */
 
diff --git a/src/libCom/test/epicsThreadOnceTest.c b/src/libCom/test/epicsThreadOnceTest.c
index 0939a2aae..2ecdf3a68 100644
--- a/src/libCom/test/epicsThreadOnceTest.c
+++ b/src/libCom/test/epicsThreadOnceTest.c
@@ -4,7 +4,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
-/* $Revision-Id$ */
 
 #include 
 #include 
diff --git a/src/libCom/test/epicsThreadPrivateTest.cpp b/src/libCom/test/epicsThreadPrivateTest.cpp
index 582611ad8..7ce28f4fd 100644
--- a/src/libCom/test/epicsThreadPrivateTest.cpp
+++ b/src/libCom/test/epicsThreadPrivateTest.cpp
@@ -6,7 +6,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
-/* $Revision-Id$ */
 
 /* Author: Jeff Hill Date:    March 28 2001 */
 
diff --git a/src/libCom/test/epicsTimeZoneTest.c b/src/libCom/test/epicsTimeZoneTest.c
index dd12b1acf..685295fc4 100644
--- a/src/libCom/test/epicsTimeZoneTest.c
+++ b/src/libCom/test/epicsTimeZoneTest.c
@@ -17,15 +17,9 @@
 #endif
 
 static
-void setTZ(const char *base, const char *dst, int offset)
+void setTZ(const char *tz)
 {
-    char tz[20];
-    if(offset!=0 || dst)
-        sprintf(tz, "%s%d%s", base, offset/3600, dst);
-    else
-        sprintf(tz, "%s", base);
-    testDiag("TZ=\"%s\"", tz);
-
+    testDiag("TZ = \"%s\"", tz);
     epicsEnvSet("TZ", tz);
     tzset();
 }
@@ -86,32 +80,52 @@ void test_gmtime(time_t T, int sec, int min, int hour,
 
 MAIN(epicsTimeZoneTest)
 {
-    testPlan(80);
+    testPlan(160);
     /* 1445259616
      *  Mon Oct 19 09:00:16 2015 EDT
      *  Mon Oct 19 08:00:16 2015 CDT
+     *  Mon Oct 19 03:00:16 2015 HST  (no dst)
      *  Mon Oct 19 13:00:16 2015 UTC
      */
     testDiag("POSIX 1445259616");
-    setTZ("EST", "EDT", 5*3600);
-    test_localtime(1445259616ul, 16, 0, 9, 19, 9, 2015, 1, 291, 1);
-    setTZ("CST", "CDT", 6*3600);
-    test_localtime(1445259616ul, 16, 0, 8, 19, 9, 2015, 1, 291, 1);
-    setTZ("UTC", NULL, 0);
+    setTZ("EST5EDT");
+    test_localtime(1445259616ul, 16, 0, 9,  19, 9, 2015, 1, 291, 1);
+    test_gmtime   (1445259616ul, 16, 0, 13, 19, 9, 2015, 1, 291, 0);
+    setTZ("CST6CDT");
+    test_localtime(1445259616ul, 16, 0, 8,  19, 9, 2015, 1, 291, 1);
+    test_gmtime   (1445259616ul, 16, 0, 13, 19, 9, 2015, 1, 291, 0);
+#if defined(__rtems__)
+    setTZ("HST10HST10");
+#else
+    setTZ("HST10");
+#endif
+    test_localtime(1445259616ul, 16, 0, 3,  19, 9, 2015, 1, 291, 0);
+    test_gmtime   (1445259616ul, 16, 0, 13, 19, 9, 2015, 1, 291, 0);
+    setTZ("UTC0");
     test_localtime(1445259616ul, 16, 0, 13, 19, 9, 2015, 1, 291, 0);
-    test_gmtime(1445259616ul, 16, 0, 13, 19, 9, 2015, 1, 291, 0);
+    test_gmtime   (1445259616ul, 16, 0, 13, 19, 9, 2015, 1, 291, 0);
     /* 1421244931
      *  Wed Jan 14 09:15:31 2015 EST
      *  Wed Jan 14 08:15:31 2015 CST
+     *  Wed Jan 14 04:15:31 2015 HST
      *  Wed Jan 14 14:15:31 2015 UTC
      */
     testDiag("POSIX 1421244931");
-    setTZ("EST", "EDT", 5*3600);
-    test_localtime(1421244931ul, 31, 15, 9, 14, 0, 2015, 3, 13, 0);
-    setTZ("CST", "CDT", 6*3600);
-    test_localtime(1421244931ul, 31, 15, 8, 14, 0, 2015, 3, 13, 0);
-    setTZ("UTC", NULL, 0);
+    setTZ("EST5EDT");
+    test_localtime(1421244931ul, 31, 15,  9, 14, 0, 2015, 3, 13, 0);
+    test_gmtime   (1421244931ul, 31, 15, 14, 14, 0, 2015, 3, 13, 0);
+    setTZ("CST6CDT");
+    test_localtime(1421244931ul, 31, 15,  8, 14, 0, 2015, 3, 13, 0);
+    test_gmtime   (1421244931ul, 31, 15, 14, 14, 0, 2015, 3, 13, 0);
+#if defined(__rtems__)
+    setTZ("HST10HST10");
+#else
+    setTZ("HST10");
+#endif
+    test_localtime(1421244931ul, 31, 15,  4, 14, 0, 2015, 3, 13, 0);
+    test_gmtime   (1421244931ul, 31, 15, 14, 14, 0, 2015, 3, 13, 0);
+    setTZ("UTC0");
     test_localtime(1421244931ul, 31, 15, 14, 14, 0, 2015, 3, 13, 0);
-    test_gmtime(1421244931ul, 31, 15, 14, 14, 0, 2015, 3, 13, 0);
+    test_gmtime   (1421244931ul, 31, 15, 14, 14, 0, 2015, 3, 13, 0);
     return testDone();
 }
diff --git a/src/libCom/test/epicsTimerTest.cpp b/src/libCom/test/epicsTimerTest.cpp
index 96f1a78cd..f2a510819 100644
--- a/src/libCom/test/epicsTimerTest.cpp
+++ b/src/libCom/test/epicsTimerTest.cpp
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
- *      $Revision-Id$
- *
  *      Author  Jeffrey O. Hill
  *              johill@lanl.gov
  *              505 665 1831
diff --git a/src/libCom/test/epicsUnitTestTest.c b/src/libCom/test/epicsUnitTestTest.c
index 688049c05..b16bad52a 100644
--- a/src/libCom/test/epicsUnitTestTest.c
+++ b/src/libCom/test/epicsUnitTestTest.c
@@ -5,7 +5,7 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
-/* $Revision-Id$
+/*
  * Author: Andrew Johnson
  *
  * Test for the unit test module...
diff --git a/src/libCom/test/macDefExpandTest.c b/src/libCom/test/macDefExpandTest.c
index 8e651efbe..a5e45a420 100644
--- a/src/libCom/test/macDefExpandTest.c
+++ b/src/libCom/test/macDefExpandTest.c
@@ -6,9 +6,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
-/*
- * $Revision-Id$
- */
 
 #include 
 #include 
diff --git a/src/libCom/test/macLibTest.c b/src/libCom/test/macLibTest.c
index 1b79ad012..1f00a6ac7 100644
--- a/src/libCom/test/macLibTest.c
+++ b/src/libCom/test/macLibTest.c
@@ -6,9 +6,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
-/*
- * $Revision-Id$
- */
 
 #include 
 #include 
diff --git a/src/libCom/test/taskwdTest.c b/src/libCom/test/taskwdTest.c
index 3fb2319fe..6cec429d2 100644
--- a/src/libCom/test/taskwdTest.c
+++ b/src/libCom/test/taskwdTest.c
@@ -4,7 +4,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
-/* $Revision-Id$ */
 
 /* Author: Andrew Johnson
  * Date:    May 21, 2008
diff --git a/src/libCom/timer/epicsTimer.cpp b/src/libCom/timer/epicsTimer.cpp
index 35fdaf9db..e55280e7e 100644
--- a/src/libCom/timer/epicsTimer.cpp
+++ b/src/libCom/timer/epicsTimer.cpp
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
- *      $Revision-Id$
- *
  *      Author  Jeffrey O. Hill
  *              johill@lanl.gov
  *              505 665 1831
diff --git a/src/libCom/timer/timer.cpp b/src/libCom/timer/timer.cpp
index 3f4b2aff6..35d6e47bf 100644
--- a/src/libCom/timer/timer.cpp
+++ b/src/libCom/timer/timer.cpp
@@ -9,11 +9,9 @@
 \*************************************************************************/
 
 /*
- *
  *      Author  Jeffrey O. Hill
  *              johill@lanl.gov
  *              505 665 1831
- *
  */
 
 #include 
diff --git a/src/libCom/timer/timerPrivate.h b/src/libCom/timer/timerPrivate.h
index 186b799e6..c60939851 100644
--- a/src/libCom/timer/timerPrivate.h
+++ b/src/libCom/timer/timerPrivate.h
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
- *      $Revision-Id$
- *
  *      Author  Jeffrey O. Hill
  *              johill@lanl.gov
  *              505 665 1831
diff --git a/src/libCom/timer/timerQueue.cpp b/src/libCom/timer/timerQueue.cpp
index cbccd8ffa..5a798d4d4 100644
--- a/src/libCom/timer/timerQueue.cpp
+++ b/src/libCom/timer/timerQueue.cpp
@@ -7,7 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *
  *      Author  Jeffrey O. Hill
  *              johill@lanl.gov
  *              505 665 1831
diff --git a/src/libCom/timer/timerQueueActive.cpp b/src/libCom/timer/timerQueueActive.cpp
index 6225b11a0..5d8b72951 100644
--- a/src/libCom/timer/timerQueueActive.cpp
+++ b/src/libCom/timer/timerQueueActive.cpp
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
- *      $Revision-Id$
- *
  *      Author  Jeffrey O. Hill
  *              johill@lanl.gov
  *              505 665 1831
diff --git a/src/libCom/timer/timerQueueActiveMgr.cpp b/src/libCom/timer/timerQueueActiveMgr.cpp
index 803b96bba..d6349a84c 100644
--- a/src/libCom/timer/timerQueueActiveMgr.cpp
+++ b/src/libCom/timer/timerQueueActiveMgr.cpp
@@ -8,8 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *      $Revision-Id$
- *
  *      Author  Jeffrey O. Hill
  *              johill@lanl.gov
  *              505 665 1831
diff --git a/src/libCom/timer/timerQueuePassive.cpp b/src/libCom/timer/timerQueuePassive.cpp
index 192f2bbe5..a352c5672 100644
--- a/src/libCom/timer/timerQueuePassive.cpp
+++ b/src/libCom/timer/timerQueuePassive.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *
  *      Author  Jeffrey O. Hill
  *              johill@lanl.gov
  *              505 665 1831
diff --git a/src/std/dev/Makefile b/src/std/dev/Makefile
index 6bdbbd997..8e4e242f9 100644
--- a/src/std/dev/Makefile
+++ b/src/std/dev/Makefile
@@ -66,6 +66,7 @@ dbRecStd_SRCS += devSoSoftCallback.c
 
 dbRecStd_SRCS += devTimestamp.c
 dbRecStd_SRCS += devStdio.c
+dbRecStd_SRCS += devEnviron.c
 
 dbRecStd_SRCS += asSubRecordFunctions.c
 
diff --git a/src/std/dev/devAaiSoft.c b/src/std/dev/devAaiSoft.c
index caaaa50ff..586483c92 100644
--- a/src/std/dev/devAaiSoft.c
+++ b/src/std/dev/devAaiSoft.c
@@ -7,7 +7,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$
+/*
  * devAaiSoft.c - Device Support Routines for soft Waveform Records
  *
  *      Original Author: Bob Dalesio
diff --git a/src/std/dev/devAaoSoft.c b/src/std/dev/devAaoSoft.c
index 61eeb9cdd..6925b1ba1 100644
--- a/src/std/dev/devAaoSoft.c
+++ b/src/std/dev/devAaoSoft.c
@@ -7,7 +7,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$
+/*
  * devAaoSoft.c - Device Support Routines for soft Waveform Records
  * 
  *      Original Author: Bob Dalesio
diff --git a/src/std/dev/devAiSoft.c b/src/std/dev/devAiSoft.c
index 77ee6dbed..2f6445f2b 100644
--- a/src/std/dev/devAiSoft.c
+++ b/src/std/dev/devAiSoft.c
@@ -7,8 +7,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$
- *
+/*
  *      Original Authors: Bob Dalesio and Marty Kraimer
  *      Date: 3/6/91
  */
diff --git a/src/std/dev/devAiSoftRaw.c b/src/std/dev/devAiSoftRaw.c
index 0cf5e40f0..ee697ff57 100644
--- a/src/std/dev/devAiSoftRaw.c
+++ b/src/std/dev/devAiSoftRaw.c
@@ -7,8 +7,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$
- *
+/*
  *      Original Authors: Bob Dalesio and Marty Kraimer
  *      Date: 6-1-90
  */
diff --git a/src/std/dev/devAoSoft.c b/src/std/dev/devAoSoft.c
index ce63a57b3..56bd05620 100644
--- a/src/std/dev/devAoSoft.c
+++ b/src/std/dev/devAoSoft.c
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* devAoSoft.c */
-/* base/src/dev $Revision-Id$ */
 
 /* Device Support Routines for soft Analog Output Records*/
 /*
diff --git a/src/std/dev/devAoSoftRaw.c b/src/std/dev/devAoSoftRaw.c
index 400e8f9a3..05aed035e 100644
--- a/src/std/dev/devAoSoftRaw.c
+++ b/src/std/dev/devAoSoftRaw.c
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* devAoSoftRaw.c */
-/* base/src/dev $Revision-Id$ */
 
 /* Device Support Routines for soft raw Analog Output Records*/
 /*
diff --git a/src/std/dev/devBiSoft.c b/src/std/dev/devBiSoft.c
index 6c2740693..27e8d7c20 100644
--- a/src/std/dev/devBiSoft.c
+++ b/src/std/dev/devBiSoft.c
@@ -7,8 +7,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$
- *
+/*
  *      Original Authors: Bob Dalesio and Marty Kraimer
  *      Date: 6-1-90
  */
diff --git a/src/std/dev/devBiSoftRaw.c b/src/std/dev/devBiSoftRaw.c
index 2afef6356..47d2d8007 100644
--- a/src/std/dev/devBiSoftRaw.c
+++ b/src/std/dev/devBiSoftRaw.c
@@ -7,8 +7,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$
- *
+/*
  *      Original Authors: Bob Dalesio and Marty Kraimer
  *      Date: 6-1-90
  */
diff --git a/src/std/dev/devBoSoft.c b/src/std/dev/devBoSoft.c
index 65bb4f505..ba6ff14a7 100644
--- a/src/std/dev/devBoSoft.c
+++ b/src/std/dev/devBoSoft.c
@@ -7,8 +7,6 @@
 * and higher are distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* devBoSoft.c */
-/* base/src/dev $Revision-Id$ */
 
 /* devBoSoft.c - Device Support Routines for  Soft Binary Output*/
 /*
diff --git a/src/std/dev/devBoSoftRaw.c b/src/std/dev/devBoSoftRaw.c
index ef812d51b..df1ba5b4e 100644
--- a/src/std/dev/devBoSoftRaw.c
+++ b/src/std/dev/devBoSoftRaw.c
@@ -7,8 +7,6 @@
 * and higher are distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* devBoSoftRaw.c */
-/* base/src/dev $Revision-Id$ */
 
 /* devBoSoftRaw.c - Device Support Routines for  SoftRaw Binary Output*/
 /*
diff --git a/src/std/dev/devEnviron.c b/src/std/dev/devEnviron.c
new file mode 100644
index 000000000..9672d6ce5
--- /dev/null
+++ b/src/std/dev/devEnviron.c
@@ -0,0 +1,128 @@
+/*************************************************************************\
+* Copyright (c) 2016 UChicago Argonne LLC, as Operator of Argonne
+*     National Laboratory.
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution. 
+\*************************************************************************/
+
+/* devEnviron.c */
+
+#include 
+#include 
+
+#include "alarm.h"
+#include "dbCommon.h"
+#include "devSup.h"
+#include "errlog.h"
+#include "recGbl.h"
+#include "recSup.h"
+
+#include "lsiRecord.h"
+#include "stringinRecord.h"
+#include "epicsExport.h"
+
+/* lsi device support */
+
+static long add_lsi(dbCommon *pcommon) {
+    lsiRecord *prec = (lsiRecord *) pcommon;
+
+    if (prec->inp.type != INST_IO)
+        return S_dev_badInpType;
+
+    return 0;
+}
+
+static long del_lsi(dbCommon *pcommon) {
+    return 0;
+}
+
+static struct dsxt dsxtLsiEnviron = {
+    add_lsi, del_lsi
+};
+
+static long init_lsi(int pass)
+{
+    if (pass == 0)
+        devExtend(&dsxtLsiEnviron);
+
+    return 0;
+}
+
+static long read_lsi(lsiRecord *prec)
+{
+    const char *val = getenv(prec->inp.value.instio.string);
+
+    if (val) {
+        strncpy(prec->val, val, prec->sizv);
+        prec->val[prec->sizv - 1] = 0;
+        prec->len = strlen(prec->val);
+        prec->udf = FALSE;
+    }
+    else {
+        prec->val[0] = 0;
+        prec->len = 1;
+        prec->udf = TRUE;
+        recGblSetSevr(prec, UDF_ALARM, prec->udfs);
+    }
+
+    return 0;
+}
+
+lsidset devLsiEnviron = {
+    5, NULL, init_lsi, NULL, NULL, read_lsi
+};
+epicsExportAddress(dset, devLsiEnviron);
+
+
+/* stringin device support */
+
+static long add_stringin(dbCommon *pcommon) {
+    stringinRecord *prec = (stringinRecord *) pcommon;
+
+    if (prec->inp.type != INST_IO)
+        return S_dev_badInpType;
+
+    return 0;
+}
+
+static long del_stringin(dbCommon *pcommon) {
+    return 0;
+}
+
+static struct dsxt dsxtSiEnviron = {
+    add_stringin, del_stringin
+};
+
+static long init_stringin(int pass)
+{
+    if (pass == 0)
+        devExtend(&dsxtSiEnviron);
+
+    return 0;
+}
+
+static long read_stringin(stringinRecord *prec)
+{
+    const char *val = getenv(prec->inp.value.instio.string);
+
+    if (val) {
+        strncpy(prec->val, val, MAX_STRING_SIZE);
+        prec->val[MAX_STRING_SIZE - 1] = 0;
+        prec->udf = FALSE;
+    }
+    else {
+        prec->val[0] = 0;
+        prec->udf = TRUE;
+        recGblSetSevr(prec, UDF_ALARM, prec->udfs);
+    }
+
+    return 0;
+}
+
+static struct {
+    dset common;
+    DEVSUPFUN read;
+} devSiEnviron = {
+    {5, NULL, init_stringin, NULL, NULL}, read_stringin
+};
+epicsExportAddress(dset, devSiEnviron);
diff --git a/src/std/dev/devEventSoft.c b/src/std/dev/devEventSoft.c
index 418da5658..06717fa57 100644
--- a/src/std/dev/devEventSoft.c
+++ b/src/std/dev/devEventSoft.c
@@ -7,8 +7,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$
- *
+/*
  *      Author: Janet Anderson
  *      Date: 04-21-91
  */
diff --git a/src/std/dev/devGeneralTime.c b/src/std/dev/devGeneralTime.c
index 0cce00d4b..1b821d582 100644
--- a/src/std/dev/devGeneralTime.c
+++ b/src/std/dev/devGeneralTime.c
@@ -3,7 +3,6 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
-/* $Revision-Id$ */
 /*
  *   Original Author:	Sheng Peng, ORNL / SNS Project
  *   Date:		07/2004
diff --git a/src/std/dev/devHistogramSoft.c b/src/std/dev/devHistogramSoft.c
index cdb4add1e..c019f1849 100644
--- a/src/std/dev/devHistogramSoft.c
+++ b/src/std/dev/devHistogramSoft.c
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* devHistogramSoft.c */
-/* base/src/dev $Revision-Id$ */
 /*
  *      Author:		Janet Anderson
  *      Date:		07/02/91
diff --git a/src/std/dev/devLiSoft.c b/src/std/dev/devLiSoft.c
index 11dbedc3f..07c4a1900 100644
--- a/src/std/dev/devLiSoft.c
+++ b/src/std/dev/devLiSoft.c
@@ -7,8 +7,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$
- *
+/*
  *      Author: Janet Anderson
  *      Date: 09-23-91
  */
diff --git a/src/std/dev/devLoSoft.c b/src/std/dev/devLoSoft.c
index fe2de4203..af49c60ff 100644
--- a/src/std/dev/devLoSoft.c
+++ b/src/std/dev/devLoSoft.c
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* devLoSoft.c */
-/* base/src/dev $Revision-Id$ */
 /*
  *      Author:		Janet Anderson
  *      Date:   	09-23-91
diff --git a/src/std/dev/devLsoSoftCallback.c b/src/std/dev/devLsoSoftCallback.c
index 4ab7ead9d..fb95afafd 100644
--- a/src/std/dev/devLsoSoftCallback.c
+++ b/src/std/dev/devLsoSoftCallback.c
@@ -4,7 +4,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 /*
  *      Author: Andrew Johnson
  *      Date:   30 Nov 2012
diff --git a/src/std/dev/devMbbiDirectSoft.c b/src/std/dev/devMbbiDirectSoft.c
index 8b7816b65..6d10d1a51 100644
--- a/src/std/dev/devMbbiDirectSoft.c
+++ b/src/std/dev/devMbbiDirectSoft.c
@@ -7,8 +7,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$
- *
+/*
  *      Original Authors: Bob Dalesio and Matthew Needes
  *      Date: 10-08-93
  */
diff --git a/src/std/dev/devMbbiDirectSoftRaw.c b/src/std/dev/devMbbiDirectSoftRaw.c
index df8c08f52..b27210a29 100644
--- a/src/std/dev/devMbbiDirectSoftRaw.c
+++ b/src/std/dev/devMbbiDirectSoftRaw.c
@@ -7,8 +7,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$
- *
+/*
  *      Original Authors: Bob Dalesio and Matthew Needes
  *      Date: 10-08-93
  */
diff --git a/src/std/dev/devMbbiSoft.c b/src/std/dev/devMbbiSoft.c
index c3b0d28f1..9f084b7fc 100644
--- a/src/std/dev/devMbbiSoft.c
+++ b/src/std/dev/devMbbiSoft.c
@@ -7,8 +7,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$
- *
+/*
  *      Original Authors: Bob Dalesio and Marty Kraimer
  *      Date: 6-1-90
  */
diff --git a/src/std/dev/devMbbiSoftRaw.c b/src/std/dev/devMbbiSoftRaw.c
index 997201cdb..5b38549c7 100644
--- a/src/std/dev/devMbbiSoftRaw.c
+++ b/src/std/dev/devMbbiSoftRaw.c
@@ -7,8 +7,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$
- *
+/*
  *      Original Authors: Bob Dalesio and Marty Kraimer
  *      Date: 6-1-90
  */
diff --git a/src/std/dev/devMbboSoft.c b/src/std/dev/devMbboSoft.c
index 43ad5a05d..b2fe6b094 100644
--- a/src/std/dev/devMbboSoft.c
+++ b/src/std/dev/devMbboSoft.c
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* devMbboSoft.c */
-/* base/src/dev $Revision-Id$ */
 /*
  *      Original Author: Bob Dalesio
  *      Current Author:  Marty Kraimer
diff --git a/src/std/dev/devPrintfSoft.c b/src/std/dev/devPrintfSoft.c
index a61d4bbfb..ca06f04be 100644
--- a/src/std/dev/devPrintfSoft.c
+++ b/src/std/dev/devPrintfSoft.c
@@ -4,7 +4,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 /*
  *      Author: Andrew Johnson
  *      Date:   28 Sept 2012
diff --git a/src/std/dev/devPrintfSoftCallback.c b/src/std/dev/devPrintfSoftCallback.c
index 7f9314d9e..333ee1c70 100644
--- a/src/std/dev/devPrintfSoftCallback.c
+++ b/src/std/dev/devPrintfSoftCallback.c
@@ -4,7 +4,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 /*
  *      Author: Andrew Johnson
  *      Date:   28 Sept 2012
diff --git a/src/std/dev/devSASoft.c b/src/std/dev/devSASoft.c
index 6178b6ce7..6c0c876f0 100644
--- a/src/std/dev/devSASoft.c
+++ b/src/std/dev/devSASoft.c
@@ -7,8 +7,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$
- *
+/*
  *      Author: Carl Lionberger
  *      Date: 9-2-93
  */
diff --git a/src/std/dev/devSiSoft.c b/src/std/dev/devSiSoft.c
index 1a64674cf..46877de23 100644
--- a/src/std/dev/devSiSoft.c
+++ b/src/std/dev/devSiSoft.c
@@ -7,8 +7,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$
- *
+/*
  *      Author: Janet Anderson
  *      Date: 04-21-91
  */
diff --git a/src/std/dev/devSoSoft.c b/src/std/dev/devSoSoft.c
index ca7a87051..6dda4a765 100644
--- a/src/std/dev/devSoSoft.c
+++ b/src/std/dev/devSoSoft.c
@@ -7,7 +7,6 @@
 * and higher are distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 /*
  *      Author: Janet Anderson
  *      Date:   21APR1991
diff --git a/src/std/dev/devSoSoftCallback.c b/src/std/dev/devSoSoftCallback.c
index a39e14b4d..f6d2c554e 100644
--- a/src/std/dev/devSoSoftCallback.c
+++ b/src/std/dev/devSoSoftCallback.c
@@ -7,7 +7,6 @@
 * and higher are distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 /*
  *      Author: Marty Kraimer
  *      Date:   04NOV2003
diff --git a/src/std/dev/devSoft.dbd b/src/std/dev/devSoft.dbd
index d6cb14de9..1314bf540 100644
--- a/src/std/dev/devSoft.dbd
+++ b/src/std/dev/devSoft.dbd
@@ -1,3 +1,5 @@
+# devSoft.dbd
+
 device(aai,CONSTANT,devAaiSoft,"Soft Channel")
 device(aao,CONSTANT,devAaoSoft,"Soft Channel")
 device(ai,CONSTANT,devAiSoft,"Soft Channel")
@@ -58,5 +60,8 @@ device(lso,INST_IO,devLsoStdio,"stdio")
 device(printf,INST_IO,devPrintfStdio,"stdio")
 device(stringout,INST_IO,devSoStdio,"stdio")
 
+device(lsi,INST_IO,devLsiEnviron,"getenv")
+device(stringin,INST_IO,devSiEnviron,"getenv")
+
 device(bi, INST_IO, devBiDbState, "Db State")
 device(bo, INST_IO, devBoDbState, "Db State")
diff --git a/src/std/dev/devStdio.c b/src/std/dev/devStdio.c
index 4801657b9..e957bfce0 100644
--- a/src/std/dev/devStdio.c
+++ b/src/std/dev/devStdio.c
@@ -5,8 +5,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 #include 
 #include 
 
diff --git a/src/std/dev/devTimestamp.c b/src/std/dev/devTimestamp.c
index a43a2d352..936d7767d 100644
--- a/src/std/dev/devTimestamp.c
+++ b/src/std/dev/devTimestamp.c
@@ -5,7 +5,6 @@
 * in the file LICENSE that is included with this distribution.
 \*************************************************************************/
 
-/* $Revision-Id$ */
 /*
  * Device support for EPICS time stamps
  *
diff --git a/src/std/dev/devWfSoft.c b/src/std/dev/devWfSoft.c
index 0ea0ce771..f1754f78e 100644
--- a/src/std/dev/devWfSoft.c
+++ b/src/std/dev/devWfSoft.c
@@ -7,8 +7,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$
- *
+/*
  *      Original Authors: Bob Dalesio and Marty Kraimer
  *      Date: 6-1-90
  */
diff --git a/src/std/rec/aSubRecord.c b/src/std/rec/aSubRecord.c
index 0bb33dac3..c014dd093 100644
--- a/src/std/rec/aSubRecord.c
+++ b/src/std/rec/aSubRecord.c
@@ -4,8 +4,7 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
-/* $Revision-Id$
- * 
+/*
  * Record Support Routines for the Array Subroutine Record type,
  * derived from Andy Foster's genSub record, with some features
  * removed and asynchronous support added.
diff --git a/src/std/rec/aSubRecord.dbd.pod b/src/std/rec/aSubRecord.dbd.pod
index d188745f1..73f734629 100644
--- a/src/std/rec/aSubRecord.dbd.pod
+++ b/src/std/rec/aSubRecord.dbd.pod
@@ -61,33 +61,33 @@ recordtype(aSub) {
 	}
 	field(INAM,DBF_STRING) {
 		prompt("Initialize Subr. Name")
-		promptgroup(GUI_SUB)
+		promptgroup("30 - Action")
 		special(SPC_NOMOD)
 		interest(1)
 		size(41)
 	}
 	field(LFLG,DBF_MENU) {
 		prompt("Subr. Input Enable")
-		promptgroup(GUI_SUB)
+		promptgroup("30 - Action")
 		interest(1)
 		menu(aSubLFLG)
 	}
 	field(SUBL,DBF_INLINK) {
 		prompt("Subroutine Name Link")
-		promptgroup(GUI_SUB)
+		promptgroup("30 - Action")
 		special(SPC_NOMOD)
 		interest(1)
 	}
 	field(SNAM,DBF_STRING) {
 		prompt("Process Subr. Name")
-		promptgroup(GUI_SUB)
+		promptgroup("30 - Action")
 		special(SPC_MOD)
 		interest(1)
 		size(41)
 	}
 	field(ONAM,DBF_STRING) {
 		prompt("Old Subr. Name")
-		promptgroup(GUI_SUB)
+		promptgroup("30 - Action")
 		special(SPC_NOMOD)
 		interest(3)
 		size(41)
@@ -107,127 +107,127 @@ recordtype(aSub) {
 	}
 	field(BRSV,DBF_MENU) {
 		prompt("Bad Return Severity")
-		promptgroup(GUI_SUB)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(PREC,DBF_SHORT) {
 		prompt("Display Precision")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(EFLG,DBF_MENU) {
 		prompt("Output Event Flag")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(1)
 		menu(aSubEFLG)
 		initial("1")
 	}
 	field(INPA,DBF_INLINK) {
 		prompt("Input Link A")
-		promptgroup(GUI_INPUTS)
+		promptgroup("41 - Input A-G")
 		interest(1)
 	}
 	field(INPB,DBF_INLINK) {
 		prompt("Input Link B")
-		promptgroup(GUI_INPUTS)
+		promptgroup("41 - Input A-G")
 		interest(1)
 	}
 	field(INPC,DBF_INLINK) {
 		prompt("Input Link C")
-		promptgroup(GUI_INPUTS)
+		promptgroup("41 - Input A-G")
 		interest(1)
 	}
 	field(INPD,DBF_INLINK) {
 		prompt("Input Link D")
-		promptgroup(GUI_INPUTS)
+		promptgroup("41 - Input A-G")
 		interest(1)
 	}
 	field(INPE,DBF_INLINK) {
 		prompt("Input Link E")
-		promptgroup(GUI_INPUTS)
+		promptgroup("41 - Input A-G")
 		interest(1)
 	}
 	field(INPF,DBF_INLINK) {
 		prompt("Input Link F")
-		promptgroup(GUI_INPUTS)
+		promptgroup("41 - Input A-G")
 		interest(1)
 	}
 	field(INPG,DBF_INLINK) {
 		prompt("Input Link G")
-		promptgroup(GUI_INPUTS)
+		promptgroup("41 - Input A-G")
 		interest(1)
 	}
 	field(INPH,DBF_INLINK) {
 		prompt("Input Link H")
-		promptgroup(GUI_INPUTS)
+		promptgroup("42 - Input H-N")
 		interest(1)
 	}
 	field(INPI,DBF_INLINK) {
 		prompt("Input Link I")
-		promptgroup(GUI_INPUTS)
+		promptgroup("42 - Input H-N")
 		interest(1)
 	}
 	field(INPJ,DBF_INLINK) {
 		prompt("Input Link J")
-		promptgroup(GUI_INPUTS)
+		promptgroup("42 - Input H-N")
 		interest(1)
 	}
 	field(INPK,DBF_INLINK) {
 		prompt("Input Link K")
-		promptgroup(GUI_INPUTS)
+		promptgroup("42 - Input H-N")
 		interest(1)
 	}
 	field(INPL,DBF_INLINK) {
 		prompt("Input Link L")
-		promptgroup(GUI_INPUTS)
+		promptgroup("42 - Input H-N")
 		interest(1)
 	}
 	field(INPM,DBF_INLINK) {
 		prompt("Input Link M")
-		promptgroup(GUI_INPUTS)
+		promptgroup("42 - Input H-N")
 		interest(1)
 	}
 	field(INPN,DBF_INLINK) {
 		prompt("Input Link N")
-		promptgroup(GUI_INPUTS)
+		promptgroup("42 - Input H-N")
 		interest(1)
 	}
 	field(INPO,DBF_INLINK) {
 		prompt("Input Link O")
-		promptgroup(GUI_INPUTS)
+		promptgroup("43 - Input O-U")
 		interest(1)
 	}
 	field(INPP,DBF_INLINK) {
 		prompt("Input Link P")
-		promptgroup(GUI_INPUTS)
+		promptgroup("43 - Input O-U")
 		interest(1)
 	}
 	field(INPQ,DBF_INLINK) {
 		prompt("Input Link Q")
-		promptgroup(GUI_INPUTS)
+		promptgroup("43 - Input O-U")
 		interest(1)
 	}
 	field(INPR,DBF_INLINK) {
 		prompt("Input Link R")
-		promptgroup(GUI_INPUTS)
+		promptgroup("43 - Input O-U")
 		interest(1)
 	}
 	field(INPS,DBF_INLINK) {
 		prompt("Input Link S")
-		promptgroup(GUI_INPUTS)
+		promptgroup("43 - Input O-U")
 		interest(1)
 	}
 	field(INPT,DBF_INLINK) {
 		prompt("Input Link T")
-		promptgroup(GUI_INPUTS)
+		promptgroup("43 - Input O-U")
 		interest(1)
 	}
 	field(INPU,DBF_INLINK) {
 		prompt("Input Link U")
-		promptgroup(GUI_INPUTS)
+		promptgroup("43 - Input O-U")
 		interest(1)
 	}
 
@@ -451,7 +451,7 @@ recordtype(aSub) {
 	}
 	field(FTA,DBF_MENU) {
 		prompt("Type of A")
-		promptgroup(GUI_WAVE)
+		promptgroup("41 - Input A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -459,7 +459,7 @@ recordtype(aSub) {
 	}
 	field(FTB,DBF_MENU) {
 		prompt("Type of B")
-		promptgroup(GUI_WAVE)
+		promptgroup("41 - Input A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -467,7 +467,7 @@ recordtype(aSub) {
 	}
 	field(FTC,DBF_MENU) {
 		prompt("Type of C")
-		promptgroup(GUI_WAVE)
+		promptgroup("41 - Input A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -475,7 +475,7 @@ recordtype(aSub) {
 	}
 	field(FTD,DBF_MENU) {
 		prompt("Type of D")
-		promptgroup(GUI_WAVE)
+		promptgroup("41 - Input A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -483,7 +483,7 @@ recordtype(aSub) {
 	}
 	field(FTE,DBF_MENU) {
 		prompt("Type of E")
-		promptgroup(GUI_WAVE)
+		promptgroup("41 - Input A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -491,7 +491,7 @@ recordtype(aSub) {
 	}
 	field(FTF,DBF_MENU) {
 		prompt("Type of F")
-		promptgroup(GUI_WAVE)
+		promptgroup("41 - Input A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -499,7 +499,7 @@ recordtype(aSub) {
 	}
 	field(FTG,DBF_MENU) {
 		prompt("Type of G")
-		promptgroup(GUI_WAVE)
+		promptgroup("41 - Input A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -507,7 +507,7 @@ recordtype(aSub) {
 	}
 	field(FTH,DBF_MENU) {
 		prompt("Type of H")
-		promptgroup(GUI_WAVE)
+		promptgroup("42 - Input H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -515,7 +515,7 @@ recordtype(aSub) {
 	}
 	field(FTI,DBF_MENU) {
 		prompt("Type of I")
-		promptgroup(GUI_WAVE)
+		promptgroup("42 - Input H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -523,7 +523,7 @@ recordtype(aSub) {
 	}
 	field(FTJ,DBF_MENU) {
 		prompt("Type of J")
-		promptgroup(GUI_WAVE)
+		promptgroup("42 - Input H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -531,7 +531,7 @@ recordtype(aSub) {
 	}
 	field(FTK,DBF_MENU) {
 		prompt("Type of K")
-		promptgroup(GUI_WAVE)
+		promptgroup("42 - Input H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -539,7 +539,7 @@ recordtype(aSub) {
 	}
 	field(FTL,DBF_MENU) {
 		prompt("Type of L")
-		promptgroup(GUI_WAVE)
+		promptgroup("42 - Input H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -547,7 +547,7 @@ recordtype(aSub) {
 	}
 	field(FTM,DBF_MENU) {
 		prompt("Type of M")
-		promptgroup(GUI_WAVE)
+		promptgroup("42 - Input H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -555,7 +555,7 @@ recordtype(aSub) {
 	}
 	field(FTN,DBF_MENU) {
 		prompt("Type of N")
-		promptgroup(GUI_WAVE)
+		promptgroup("42 - Input H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -563,7 +563,7 @@ recordtype(aSub) {
 	}
 	field(FTO,DBF_MENU) {
 		prompt("Type of O")
-		promptgroup(GUI_WAVE)
+		promptgroup("43 - Input O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -571,7 +571,7 @@ recordtype(aSub) {
 	}
 	field(FTP,DBF_MENU) {
 		prompt("Type of P")
-		promptgroup(GUI_WAVE)
+		promptgroup("43 - Input O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -579,7 +579,7 @@ recordtype(aSub) {
 	}
 	field(FTQ,DBF_MENU) {
 		prompt("Type of Q")
-		promptgroup(GUI_WAVE)
+		promptgroup("43 - Input O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -587,7 +587,7 @@ recordtype(aSub) {
 	}
 	field(FTR,DBF_MENU) {
 		prompt("Type of R")
-		promptgroup(GUI_WAVE)
+		promptgroup("43 - Input O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -595,7 +595,7 @@ recordtype(aSub) {
 	}
 	field(FTS,DBF_MENU) {
 		prompt("Type of S")
-		promptgroup(GUI_WAVE)
+		promptgroup("43 - Input O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -603,7 +603,7 @@ recordtype(aSub) {
 	}
 	field(FTT,DBF_MENU) {
 		prompt("Type of T")
-		promptgroup(GUI_WAVE)
+		promptgroup("43 - Input O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -611,7 +611,7 @@ recordtype(aSub) {
 	}
 	field(FTU,DBF_MENU) {
 		prompt("Type of U")
-		promptgroup(GUI_WAVE)
+		promptgroup("43 - Input O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -619,401 +619,380 @@ recordtype(aSub) {
 	}
 	field(NOA,DBF_ULONG) {
 		prompt("Max. elements in A")
-		promptgroup(GUI_WAVE)
+		promptgroup("41 - Input A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOB,DBF_ULONG) {
 		prompt("Max. elements in B")
-		promptgroup(GUI_WAVE)
+		promptgroup("41 - Input A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOC,DBF_ULONG) {
 		prompt("Max. elements in C")
-		promptgroup(GUI_WAVE)
+		promptgroup("41 - Input A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOD,DBF_ULONG) {
 		prompt("Max. elements in D")
-		promptgroup(GUI_WAVE)
+		promptgroup("41 - Input A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOE,DBF_ULONG) {
 		prompt("Max. elements in E")
-		promptgroup(GUI_WAVE)
+		promptgroup("41 - Input A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOF,DBF_ULONG) {
 		prompt("Max. elements in F")
-		promptgroup(GUI_WAVE)
+		promptgroup("41 - Input A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOG,DBF_ULONG) {
 		prompt("Max. elements in G")
-		promptgroup(GUI_WAVE)
+		promptgroup("41 - Input A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOH,DBF_ULONG) {
 		prompt("Max. elements in H")
-		promptgroup(GUI_WAVE)
+		promptgroup("42 - Input H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOI,DBF_ULONG) {
 		prompt("Max. elements in I")
-		promptgroup(GUI_WAVE)
+		promptgroup("42 - Input H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOJ,DBF_ULONG) {
 		prompt("Max. elements in J")
-		promptgroup(GUI_WAVE)
+		promptgroup("42 - Input H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOK,DBF_ULONG) {
 		prompt("Max. elements in K")
-		promptgroup(GUI_WAVE)
+		promptgroup("42 - Input H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOL,DBF_ULONG) {
 		prompt("Max. elements in L")
-		promptgroup(GUI_WAVE)
+		promptgroup("42 - Input H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOM,DBF_ULONG) {
 		prompt("Max. elements in M")
-		promptgroup(GUI_WAVE)
+		promptgroup("42 - Input H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NON,DBF_ULONG) {
 		prompt("Max. elements in N")
-		promptgroup(GUI_WAVE)
+		promptgroup("42 - Input H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOO,DBF_ULONG) {
 		prompt("Max. elements in O")
-		promptgroup(GUI_WAVE)
+		promptgroup("43 - Input O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOP,DBF_ULONG) {
 		prompt("Max. elements in P")
-		promptgroup(GUI_WAVE)
+		promptgroup("43 - Input O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOQ,DBF_ULONG) {
 		prompt("Max. elements in Q")
-		promptgroup(GUI_WAVE)
+		promptgroup("43 - Input O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOR,DBF_ULONG) {
 		prompt("Max. elements in R")
-		promptgroup(GUI_WAVE)
+		promptgroup("43 - Input O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOS,DBF_ULONG) {
 		prompt("Max. elements in S")
-		promptgroup(GUI_WAVE)
+		promptgroup("43 - Input O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOT,DBF_ULONG) {
 		prompt("Max. elements in T")
-		promptgroup(GUI_WAVE)
+		promptgroup("43 - Input O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOU,DBF_ULONG) {
 		prompt("Max. elements in U")
-		promptgroup(GUI_WAVE)
+		promptgroup("43 - Input O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NEA,DBF_ULONG) {
 		prompt("Num. elements in A")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NEB,DBF_ULONG) {
 		prompt("Num. elements in B")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NEC,DBF_ULONG) {
 		prompt("Num. elements in C")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NED,DBF_ULONG) {
 		prompt("Num. elements in D")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NEE,DBF_ULONG) {
 		prompt("Num. elements in E")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NEF,DBF_ULONG) {
 		prompt("Num. elements in F")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NEG,DBF_ULONG) {
 		prompt("Num. elements in G")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NEH,DBF_ULONG) {
 		prompt("Num. elements in H")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NEI,DBF_ULONG) {
 		prompt("Num. elements in I")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NEJ,DBF_ULONG) {
 		prompt("Num. elements in J")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NEK,DBF_ULONG) {
 		prompt("Num. elements in K")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NEL,DBF_ULONG) {
 		prompt("Num. elements in L")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NEM,DBF_ULONG) {
 		prompt("Num. elements in M")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NEN,DBF_ULONG) {
 		prompt("Num. elements in N")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NEO,DBF_ULONG) {
 		prompt("Num. elements in O")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NEP,DBF_ULONG) {
 		prompt("Num. elements in P")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NEQ,DBF_ULONG) {
 		prompt("Num. elements in Q")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NER,DBF_ULONG) {
 		prompt("Num. elements in R")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NES,DBF_ULONG) {
 		prompt("Num. elements in S")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NET,DBF_ULONG) {
 		prompt("Num. elements in T")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(NEU,DBF_ULONG) {
 		prompt("Num. elements in U")
-		promptgroup(GUI_WAVE)
 		special(SPC_NOMOD)
 		interest(3)
 		initial("1")
 	}
 	field(OUTA,DBF_OUTLINK) {
 		prompt("Output Link A")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("51 - Output A-G")
 		interest(1)
 	}
 	field(OUTB,DBF_OUTLINK) {
 		prompt("Output Link B")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("51 - Output A-G")
 		interest(1)
 	}
 	field(OUTC,DBF_OUTLINK) {
 		prompt("Output Link C")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("51 - Output A-G")
 		interest(1)
 	}
 	field(OUTD,DBF_OUTLINK) {
 		prompt("Output Link D")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("51 - Output A-G")
 		interest(1)
 	}
 	field(OUTE,DBF_OUTLINK) {
 		prompt("Output Link E")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("51 - Output A-G")
 		interest(1)
 	}
 	field(OUTF,DBF_OUTLINK) {
 		prompt("Output Link F")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("51 - Output A-G")
 		interest(1)
 	}
 	field(OUTG,DBF_OUTLINK) {
 		prompt("Output Link G")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("51 - Output A-G")
 		interest(1)
 	}
 	field(OUTH,DBF_OUTLINK) {
 		prompt("Output Link H")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("52 - Output H-N")
 		interest(1)
 	}
 	field(OUTI,DBF_OUTLINK) {
 		prompt("Output Link I")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("52 - Output H-N")
 		interest(1)
 	}
 	field(OUTJ,DBF_OUTLINK) {
 		prompt("Output Link J")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("52 - Output H-N")
 		interest(1)
 	}
 	field(OUTK,DBF_OUTLINK) {
 		prompt("Output Link K")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("52 - Output H-N")
 		interest(1)
 	}
 	field(OUTL,DBF_OUTLINK) {
 		prompt("Output Link L")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("52 - Output H-N")
 		interest(1)
 	}
 	field(OUTM,DBF_OUTLINK) {
 		prompt("Output Link M")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("52 - Output H-N")
 		interest(1)
 	}
 	field(OUTN,DBF_OUTLINK) {
 		prompt("Output Link N")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("52 - Output H-N")
 		interest(1)
 	}
 	field(OUTO,DBF_OUTLINK) {
 		prompt("Output Link O")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("53 - Output O-U")
 		interest(1)
 	}
 	field(OUTP,DBF_OUTLINK) {
 		prompt("Output Link P")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("53 - Output O-U")
 		interest(1)
 	}
 	field(OUTQ,DBF_OUTLINK) {
 		prompt("Output Link Q")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("53 - Output O-U")
 		interest(1)
 	}
 	field(OUTR,DBF_OUTLINK) {
 		prompt("Output Link R")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("53 - Output O-U")
 		interest(1)
 	}
 	field(OUTS,DBF_OUTLINK) {
 		prompt("Output Link S")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("53 - Output O-U")
 		interest(1)
 	}
 	field(OUTT,DBF_OUTLINK) {
 		prompt("Output Link T")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("53 - Output O-U")
 		interest(1)
 	}
 	field(OUTU,DBF_OUTLINK) {
 		prompt("Output Link U")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("53 - Output O-U")
 		interest(1)
 	}
 
@@ -1384,7 +1363,7 @@ recordtype(aSub) {
 	}
 	field(FTVA,DBF_MENU) {
 		prompt("Type of VALA")
-		promptgroup(GUI_WAVE)
+		promptgroup("51 - Output A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1392,7 +1371,7 @@ recordtype(aSub) {
 	}
 	field(FTVB,DBF_MENU) {
 		prompt("Type of VALB")
-		promptgroup(GUI_WAVE)
+		promptgroup("51 - Output A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1400,7 +1379,7 @@ recordtype(aSub) {
 	}
 	field(FTVC,DBF_MENU) {
 		prompt("Type of VALC")
-		promptgroup(GUI_WAVE)
+		promptgroup("51 - Output A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1408,7 +1387,7 @@ recordtype(aSub) {
 	}
 	field(FTVD,DBF_MENU) {
 		prompt("Type of VALD")
-		promptgroup(GUI_WAVE)
+		promptgroup("51 - Output A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1416,7 +1395,7 @@ recordtype(aSub) {
 	}
 	field(FTVE,DBF_MENU) {
 		prompt("Type of VALE")
-		promptgroup(GUI_WAVE)
+		promptgroup("51 - Output A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1424,7 +1403,7 @@ recordtype(aSub) {
 	}
 	field(FTVF,DBF_MENU) {
 		prompt("Type of VALF")
-		promptgroup(GUI_WAVE)
+		promptgroup("51 - Output A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1432,7 +1411,7 @@ recordtype(aSub) {
 	}
 	field(FTVG,DBF_MENU) {
 		prompt("Type of VALG")
-		promptgroup(GUI_WAVE)
+		promptgroup("51 - Output A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1440,7 +1419,7 @@ recordtype(aSub) {
 	}
 	field(FTVH,DBF_MENU) {
 		prompt("Type of VALH")
-		promptgroup(GUI_WAVE)
+		promptgroup("52 - Output H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1448,7 +1427,7 @@ recordtype(aSub) {
 	}
 	field(FTVI,DBF_MENU) {
 		prompt("Type of VALI")
-		promptgroup(GUI_WAVE)
+		promptgroup("52 - Output H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1456,7 +1435,7 @@ recordtype(aSub) {
 	}
 	field(FTVJ,DBF_MENU) {
 		prompt("Type of VALJ")
-		promptgroup(GUI_WAVE)
+		promptgroup("52 - Output H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1464,7 +1443,7 @@ recordtype(aSub) {
 	}
 	field(FTVK,DBF_MENU) {
 		prompt("Type of VALK")
-		promptgroup(GUI_WAVE)
+		promptgroup("52 - Output H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1472,7 +1451,7 @@ recordtype(aSub) {
 	}
 	field(FTVL,DBF_MENU) {
 		prompt("Type of VALL")
-		promptgroup(GUI_WAVE)
+		promptgroup("52 - Output H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1480,7 +1459,7 @@ recordtype(aSub) {
 	}
 	field(FTVM,DBF_MENU) {
 		prompt("Type of VALM")
-		promptgroup(GUI_WAVE)
+		promptgroup("52 - Output H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1488,7 +1467,7 @@ recordtype(aSub) {
 	}
 	field(FTVN,DBF_MENU) {
 		prompt("Type of VALN")
-		promptgroup(GUI_WAVE)
+		promptgroup("52 - Output H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1496,7 +1475,7 @@ recordtype(aSub) {
 	}
 	field(FTVO,DBF_MENU) {
 		prompt("Type of VALO")
-		promptgroup(GUI_WAVE)
+		promptgroup("53 - Output O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1504,7 +1483,7 @@ recordtype(aSub) {
 	}
 	field(FTVP,DBF_MENU) {
 		prompt("Type of VALP")
-		promptgroup(GUI_WAVE)
+		promptgroup("53 - Output O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1512,7 +1491,7 @@ recordtype(aSub) {
 	}
 	field(FTVQ,DBF_MENU) {
 		prompt("Type of VALQ")
-		promptgroup(GUI_WAVE)
+		promptgroup("53 - Output O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1520,7 +1499,7 @@ recordtype(aSub) {
 	}
 	field(FTVR,DBF_MENU) {
 		prompt("Type of VALR")
-		promptgroup(GUI_WAVE)
+		promptgroup("53 - Output O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1528,7 +1507,7 @@ recordtype(aSub) {
 	}
 	field(FTVS,DBF_MENU) {
 		prompt("Type of VALS")
-		promptgroup(GUI_WAVE)
+		promptgroup("53 - Output O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1536,7 +1515,7 @@ recordtype(aSub) {
 	}
 	field(FTVT,DBF_MENU) {
 		prompt("Type of VALT")
-		promptgroup(GUI_WAVE)
+		promptgroup("53 - Output O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1544,7 +1523,7 @@ recordtype(aSub) {
 	}
 	field(FTVU,DBF_MENU) {
 		prompt("Type of VALU")
-		promptgroup(GUI_WAVE)
+		promptgroup("53 - Output O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("DOUBLE")
@@ -1552,147 +1531,147 @@ recordtype(aSub) {
 	}
 	field(NOVA,DBF_ULONG) {
 		prompt("Max. elements in VALA")
-		promptgroup(GUI_WAVE)
+		promptgroup("51 - Output A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVB,DBF_ULONG) {
 		prompt("Max. elements in VALB")
-		promptgroup(GUI_WAVE)
+		promptgroup("51 - Output A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVC,DBF_ULONG) {
 		prompt("Max. elements in VALC")
-		promptgroup(GUI_WAVE)
+		promptgroup("51 - Output A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVD,DBF_ULONG) {
 		prompt("Max. elements in VALD")
-		promptgroup(GUI_WAVE)
+		promptgroup("51 - Output A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVE,DBF_ULONG) {
 		prompt("Max. elements in VALE")
-		promptgroup(GUI_WAVE)
+		promptgroup("51 - Output A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVF,DBF_ULONG) {
 		prompt("Max. elements in VALF")
-		promptgroup(GUI_WAVE)
+		promptgroup("51 - Output A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVG,DBF_ULONG) {
 		prompt("Max. elements in VALG")
-		promptgroup(GUI_WAVE)
+		promptgroup("51 - Output A-G")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVH,DBF_ULONG) {
 		prompt("Max. elements in VAlH")
-		promptgroup(GUI_WAVE)
+		promptgroup("52 - Output H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVI,DBF_ULONG) {
 		prompt("Max. elements in VALI")
-		promptgroup(GUI_WAVE)
+		promptgroup("52 - Output H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVJ,DBF_ULONG) {
 		prompt("Max. elements in VALJ")
-		promptgroup(GUI_WAVE)
+		promptgroup("52 - Output H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVK,DBF_ULONG) {
 		prompt("Max. elements in VALK")
-		promptgroup(GUI_WAVE)
+		promptgroup("52 - Output H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVL,DBF_ULONG) {
 		prompt("Max. elements in VALL")
-		promptgroup(GUI_WAVE)
+		promptgroup("52 - Output H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVM,DBF_ULONG) {
 		prompt("Max. elements in VALM")
-		promptgroup(GUI_WAVE)
+		promptgroup("52 - Output H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVN,DBF_ULONG) {
 		prompt("Max. elements in VALN")
-		promptgroup(GUI_WAVE)
+		promptgroup("52 - Output H-N")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVO,DBF_ULONG) {
 		prompt("Max. elements in VALO")
-		promptgroup(GUI_WAVE)
+		promptgroup("53 - Output O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVP,DBF_ULONG) {
 		prompt("Max. elements in VALP")
-		promptgroup(GUI_WAVE)
+		promptgroup("53 - Output O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVQ,DBF_ULONG) {
 		prompt("Max. elements in VALQ")
-		promptgroup(GUI_WAVE)
+		promptgroup("53 - Output O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVR,DBF_ULONG) {
 		prompt("Max. elements in VALR")
-		promptgroup(GUI_WAVE)
+		promptgroup("53 - Output O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVS,DBF_ULONG) {
 		prompt("Max. elements in VALS")
-		promptgroup(GUI_WAVE)
+		promptgroup("53 - Output O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVT,DBF_ULONG) {
 		prompt("Max. elements in VALT")
-		promptgroup(GUI_WAVE)
+		promptgroup("53 - Output O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NOVU,DBF_ULONG) {
 		prompt("Max. elements in VALU")
-		promptgroup(GUI_WAVE)
+		promptgroup("53 - Output O-U")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
diff --git a/src/std/rec/aaiRecord.dbd b/src/std/rec/aaiRecord.dbd
index 3b6c5fb2c..06ab7f7b8 100644
--- a/src/std/rec/aaiRecord.dbd
+++ b/src/std/rec/aaiRecord.dbd
@@ -3,13 +3,12 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 menu(aaiPOST) {
-        choice(aaiPOST_Always,"Always")
-        choice(aaiPOST_OnChange,"On Change")
+	choice(aaiPOST_Always,"Always")
+	choice(aaiPOST_OnChange,"On Change")
 }
 recordtype(aai) {
 	include "dbCommon.dbd" 
@@ -25,44 +24,44 @@ recordtype(aai) {
 	}
 	field(PREC,DBF_SHORT) {
 		prompt("Display Precision")
-		promptgroup(GUI_ALARMS)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(INP,DBF_INLINK) {
 		prompt("Input Specification")
-		promptgroup(GUI_BITS1)
+		promptgroup("40 - Input")
 		interest(1)
 	}
 	field(EGU,DBF_STRING) {
-		prompt("Engineering Units Name")
-		promptgroup(GUI_BITS2)
+		prompt("Engineering Units")
+		promptgroup("80 - Display")
 		interest(1)
 		size(16)
 		prop(YES)
 	}
 	field(HOPR,DBF_DOUBLE) {
 		prompt("High Operating Range")
-		promptgroup(GUI_CALC)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(LOPR,DBF_DOUBLE) {
 		prompt("Low Operating Range")
-		promptgroup(GUI_CLOCK)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(NELM,DBF_ULONG) {
 		prompt("Number of Elements")
-		promptgroup(GUI_COMPRESS)
+		promptgroup("30 - Action")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(FTVL,DBF_MENU) {
 		prompt("Field Type of Value")
-		promptgroup(GUI_CONVERT)
+		promptgroup("30 - Action")
 		special(SPC_NOMOD)
 		interest(1)
 		menu(menuFtype)
@@ -79,7 +78,7 @@ recordtype(aai) {
 	}
 	field(SIML,DBF_INLINK) {
 		prompt("Sim Mode Location")
-		promptgroup(GUI_HIST)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SIMM,DBF_MENU) {
@@ -89,27 +88,27 @@ recordtype(aai) {
 	}
 	field(SIMS,DBF_MENU) {
 		prompt("Sim mode Alarm Svrty")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(2)
 		menu(menuAlarmSevr)
 	}
 	field(SIOL,DBF_INLINK) {
 		prompt("Sim Input Specifctn")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(MPST,DBF_MENU) {
-                prompt("Post Value Monitors")
-                promptgroup(GUI_DISPLAY)
-                interest(1)
-                menu(aaiPOST)
+		prompt("Post Value Monitors")
+		promptgroup("80 - Display")
+		interest(1)
+		menu(aaiPOST)
 	}
 	field(APST,DBF_MENU) {
-                prompt("Post Archive Monitors")
-                promptgroup(GUI_DISPLAY)
-                interest(1)
-                menu(aaiPOST)
-        }
+		prompt("Post Archive Monitors")
+		promptgroup("80 - Display")
+		interest(1)
+		menu(aaiPOST)
+	}
 	field(HASH,DBF_ULONG) {
 		prompt("Hash of OnChange data.")
 		interest(3)
diff --git a/src/std/rec/aaoRecord.dbd b/src/std/rec/aaoRecord.dbd
index 861a16613..57d842f4f 100644
--- a/src/std/rec/aaoRecord.dbd
+++ b/src/std/rec/aaoRecord.dbd
@@ -3,13 +3,12 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 menu(aaoPOST) {
-        choice(aaoPOST_Always,"Always")
-        choice(aaoPOST_OnChange,"On Change")
+	choice(aaoPOST_Always,"Always")
+	choice(aaoPOST_OnChange,"On Change")
 }
 recordtype(aao) {
 	include "dbCommon.dbd" 
@@ -25,44 +24,44 @@ recordtype(aao) {
 	}
 	field(PREC,DBF_SHORT) {
 		prompt("Display Precision")
-		promptgroup(GUI_ALARMS)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(OUT,DBF_OUTLINK) {
 		prompt("Output Specification")
-		promptgroup(GUI_BITS1)
+		promptgroup("50 - Output")
 		interest(1)
 	}
 	field(EGU,DBF_STRING) {
-		prompt("Engineering Units Name")
-		promptgroup(GUI_BITS2)
+		prompt("Engineering Units")
+		promptgroup("80 - Display")
 		interest(1)
 		size(16)
 		prop(YES)
 	}
 	field(HOPR,DBF_DOUBLE) {
 		prompt("High Operating Range")
-		promptgroup(GUI_CALC)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(LOPR,DBF_DOUBLE) {
 		prompt("Low Operating Range")
-		promptgroup(GUI_CLOCK)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(NELM,DBF_ULONG) {
 		prompt("Number of Elements")
-		promptgroup(GUI_COMPRESS)
+		promptgroup("30 - Action")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(FTVL,DBF_MENU) {
 		prompt("Field Type of Value")
-		promptgroup(GUI_CONVERT)
+		promptgroup("30 - Action")
 		special(SPC_NOMOD)
 		interest(1)
 		menu(menuFtype)
@@ -79,7 +78,7 @@ recordtype(aao) {
 	}
 	field(SIML,DBF_INLINK) {
 		prompt("Sim Mode Location")
-		promptgroup(GUI_HIST)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SIMM,DBF_MENU) {
@@ -89,27 +88,27 @@ recordtype(aao) {
 	}
 	field(SIMS,DBF_MENU) {
 		prompt("Sim mode Alarm Svrty")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(2)
 		menu(menuAlarmSevr)
 	}
 	field(SIOL,DBF_OUTLINK) {
 		prompt("Sim Output Specifctn")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(MPST,DBF_MENU) {
-                prompt("Post Value Monitors")
-                promptgroup(GUI_DISPLAY)
-                interest(1)
-                menu(aaoPOST)
+		prompt("Post Value Monitors")
+		promptgroup("80 - Display")
+		interest(1)
+		menu(aaoPOST)
 	}
 	field(APST,DBF_MENU) {
-                prompt("Post Archive Monitors")
-                promptgroup(GUI_DISPLAY)
-                interest(1)
-                menu(aaoPOST)
-        }
+		prompt("Post Archive Monitors")
+		promptgroup("80 - Display")
+		interest(1)
+		menu(aaoPOST)
+	}
 	field(HASH,DBF_ULONG) {
 		prompt("Hash of OnChange data.")
 		interest(3)
diff --git a/src/std/rec/aiRecord.c b/src/std/rec/aiRecord.c
index fb1218b16..aab5529c7 100644
--- a/src/std/rec/aiRecord.c
+++ b/src/std/rec/aiRecord.c
@@ -6,7 +6,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 
 /* aiRecord.c - Record Support Routines for Analog Input records */
 /*
diff --git a/src/std/rec/aiRecord.dbd.pod b/src/std/rec/aiRecord.dbd.pod
index 8da77055d..2973ec831 100644
--- a/src/std/rec/aiRecord.dbd.pod
+++ b/src/std/rec/aiRecord.dbd.pod
@@ -217,24 +217,24 @@ monitoring functionality.
     include "dbCommon.dbd" 
     field(VAL,DBF_DOUBLE) {
         prompt("Current EGU Value")
-        promptgroup(GUI_INPUTS)
+        promptgroup("40 - Input")
         asl(ASL0)
         pp(TRUE)
     }
     field(INP,DBF_INLINK) {
         prompt("Input Specification")
-        promptgroup(GUI_INPUTS)
+        promptgroup("40 - Input")
         interest(1)
     }
     field(PREC,DBF_SHORT) {
         prompt("Display Precision")
-        promptgroup(GUI_DISPLAY)
+        promptgroup("80 - Display")
         interest(1)
-		prop(YES)
+        prop(YES)
     }
     field(LINR,DBF_MENU) {
         prompt("Linearization")
-        promptgroup(GUI_CONVERT)
+        promptgroup("60 - Convert")
         special(SPC_LINCONV)
         pp(TRUE)
         interest(1)
@@ -242,133 +242,133 @@ monitoring functionality.
     }
     field(EGUF,DBF_DOUBLE) {
         prompt("Engineer Units Full")
-        promptgroup(GUI_CONVERT)
+        promptgroup("60 - Convert")
         special(SPC_LINCONV)
         pp(TRUE)
         interest(1)
     }
     field(EGUL,DBF_DOUBLE) {
         prompt("Engineer Units Low")
-        promptgroup(GUI_CONVERT)
+        promptgroup("60 - Convert")
         special(SPC_LINCONV)
         pp(TRUE)
         interest(1)
     }
     field(EGU,DBF_STRING) {
         prompt("Engineering Units")
-        promptgroup(GUI_DISPLAY)
+        promptgroup("80 - Display")
         interest(1)
         size(16)
-		prop(YES)
+        prop(YES)
     }
     field(HOPR,DBF_DOUBLE) {
         prompt("High Operating Range")
-        promptgroup(GUI_DISPLAY)
+        promptgroup("80 - Display")
         interest(1)
-		prop(YES)
+        prop(YES)
     }
     field(LOPR,DBF_DOUBLE) {
         prompt("Low Operating Range")
-        promptgroup(GUI_DISPLAY)
+        promptgroup("80 - Display")
         interest(1)
-		prop(YES)
+        prop(YES)
     }
     field(AOFF,DBF_DOUBLE) {
         prompt("Adjustment Offset")
-        promptgroup(GUI_CONVERT)
+        promptgroup("60 - Convert")
         pp(TRUE)
         interest(1)
     }
     field(ASLO,DBF_DOUBLE) {
         prompt("Adjustment Slope")
-        promptgroup(GUI_CONVERT)
+        promptgroup("60 - Convert")
         pp(TRUE)
         interest(1)
         initial("1")
     }
     field(SMOO,DBF_DOUBLE) {
         prompt("Smoothing")
-        promptgroup(GUI_CONVERT)
+        promptgroup("60 - Convert")
         interest(1)
     }
     field(HIHI,DBF_DOUBLE) {
         prompt("Hihi Alarm Limit")
-        promptgroup(GUI_ALARMS)
+        promptgroup("70 - Alarm")
         pp(TRUE)
         interest(1)
-		prop(YES)
+        prop(YES)
     }
     field(LOLO,DBF_DOUBLE) {
         prompt("Lolo Alarm Limit")
-        promptgroup(GUI_ALARMS)
+        promptgroup("70 - Alarm")
         pp(TRUE)
         interest(1)
-		prop(YES)
+        prop(YES)
     }
     field(HIGH,DBF_DOUBLE) {
         prompt("High Alarm Limit")
-        promptgroup(GUI_ALARMS)
+        promptgroup("70 - Alarm")
         pp(TRUE)
         interest(1)
-		prop(YES)
+        prop(YES)
     }
     field(LOW,DBF_DOUBLE) {
         prompt("Low Alarm Limit")
-        promptgroup(GUI_ALARMS)
+        promptgroup("70 - Alarm")
         pp(TRUE)
         interest(1)
-		prop(YES)
+        prop(YES)
     }
     field(HHSV,DBF_MENU) {
         prompt("Hihi Severity")
-        promptgroup(GUI_ALARMS)
+        promptgroup("70 - Alarm")
         pp(TRUE)
         interest(1)
-		prop(YES)
+        prop(YES)
         menu(menuAlarmSevr)
     }
     field(LLSV,DBF_MENU) {
         prompt("Lolo Severity")
-        promptgroup(GUI_ALARMS)
+        promptgroup("70 - Alarm")
         pp(TRUE)
         interest(1)
-		prop(YES)
+        prop(YES)
         menu(menuAlarmSevr)
     }
     field(HSV,DBF_MENU) {
         prompt("High Severity")
-        promptgroup(GUI_ALARMS)
+        promptgroup("70 - Alarm")
         pp(TRUE)
         interest(1)
-		prop(YES)
+        prop(YES)
         menu(menuAlarmSevr)
     }
     field(LSV,DBF_MENU) {
         prompt("Low Severity")
-        promptgroup(GUI_ALARMS)
+        promptgroup("70 - Alarm")
         pp(TRUE)
         interest(1)
-		prop(YES)
+        prop(YES)
         menu(menuAlarmSevr)
     }
     field(HYST,DBF_DOUBLE) {
         prompt("Alarm Deadband")
-        promptgroup(GUI_ALARMS)
+        promptgroup("70 - Alarm")
         interest(1)
     }
     field(AFTC,DBF_DOUBLE) {
         prompt("Alarm Filter Time Constant")
-        promptgroup(GUI_ALARMS)
+        promptgroup("70 - Alarm")
         interest(1)
     }
     field(ADEL,DBF_DOUBLE) {
         prompt("Archive Deadband")
-        promptgroup(GUI_DISPLAY)
+        promptgroup("80 - Display")
         interest(1)
     }
     field(MDEL,DBF_DOUBLE) {
         prompt("Monitor Deadband")
-        promptgroup(GUI_DISPLAY)
+        promptgroup("80 - Display")
         interest(1)
     }
     field(LALM,DBF_DOUBLE) {
@@ -393,14 +393,14 @@ monitoring functionality.
     }
     field(ESLO,DBF_DOUBLE) {
         prompt("Raw to EGU Slope")
-        promptgroup(GUI_CONVERT)
+        promptgroup("60 - Convert")
         pp(TRUE)
         interest(2)
         initial("1")
     }
     field(EOFF,DBF_DOUBLE) {
         prompt("Raw to EGU Offset")
-        promptgroup(GUI_CONVERT)
+        promptgroup("60 - Convert")
         pp(TRUE)
         interest(2)
     }
@@ -469,7 +469,7 @@ simulation mode.
 
     field(SIOL,DBF_INLINK) {
         prompt("Sim. Input Specification")
-        promptgroup(GUI_INPUTS)
+        promptgroup("90 - Simulate")
         interest(1)
     }
     field(SVAL,DBF_DOUBLE) {
@@ -477,7 +477,7 @@ simulation mode.
     }
     field(SIML,DBF_INLINK) {
         prompt("Sim. Mode Location")
-        promptgroup(GUI_INPUTS)
+        promptgroup("90 - Simulate")
         interest(1)
     }
     field(SIMM,DBF_MENU) {
@@ -487,7 +487,7 @@ simulation mode.
     }
     field(SIMS,DBF_MENU) {
         prompt("Simulation Mode Severity")
-        promptgroup(GUI_INPUTS)
+        promptgroup("90 - Simulate")
         interest(2)
         menu(menuAlarmSevr)
     }
@@ -610,7 +610,7 @@ values that the C routine can put in the RVAL field.
 When RVAL is set to I the VAL field will be set to EGUF, and when RVAL
 is set to I the VAL field will become EGUL.
 
-The fomulae to use are:
+The formulae to use are:
 
 =over
 
diff --git a/src/std/rec/aoRecord.c b/src/std/rec/aoRecord.c
index 63125593e..06dc1588c 100644
--- a/src/std/rec/aoRecord.c
+++ b/src/std/rec/aoRecord.c
@@ -6,7 +6,6 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* $Revision-Id$ */
 
 /* aoRecord.c - Record Support Routines for Analog Output records */
 /*
diff --git a/src/std/rec/aoRecord.dbd.pod b/src/std/rec/aoRecord.dbd.pod
index 5b9280a65..41467dcd3 100644
--- a/src/std/rec/aoRecord.dbd.pod
+++ b/src/std/rec/aoRecord.dbd.pod
@@ -273,7 +273,7 @@ information on these fields.
     include "dbCommon.dbd" 
     field(VAL,DBF_DOUBLE) {
         prompt("Desired Output")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("50 - Output")
         asl(ASL0)
         pp(TRUE)
     }
@@ -282,40 +282,40 @@ information on these fields.
     }
     field(OUT,DBF_OUTLINK) {
         prompt("Output Specification")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("50 - Output")
         interest(1)
     }
     field(OROC,DBF_DOUBLE) {
         prompt("Output Rate of Change")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("50 - Output")
         interest(1)
     }
     field(DOL,DBF_INLINK) {
         prompt("Desired Output Loc")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("40 - Input")
         interest(1)
     }
     field(OMSL,DBF_MENU) {
         prompt("Output Mode Select")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("50 - Output")
         interest(1)
         menu(menuOmsl)
     }
     field(OIF,DBF_MENU) {
         prompt("Out Full/Incremental")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("50 - Output")
         interest(1)
         menu(aoOIF)
     }
     field(PREC,DBF_SHORT) {
         prompt("Display Precision")
-        promptgroup(GUI_DISPLAY)
+        promptgroup("80 - Display")
         interest(1)
-		prop(YES)
+        prop(YES)
     }
     field(LINR,DBF_MENU) {
         prompt("Linearization")
-        promptgroup(GUI_CONVERT)
+        promptgroup("60 - Convert")
         special(SPC_LINCONV)
         pp(TRUE)
         interest(1)
@@ -323,24 +323,24 @@ information on these fields.
     }
     field(EGUF,DBF_DOUBLE) {
         prompt("Eng Units Full")
-        promptgroup(GUI_CONVERT)
+        promptgroup("60 - Convert")
         special(SPC_LINCONV)
         pp(TRUE)
         interest(1)
     }
     field(EGUL,DBF_DOUBLE) {
         prompt("Eng Units Low")
-        promptgroup(GUI_CONVERT)
+        promptgroup("60 - Convert")
         special(SPC_LINCONV)
         pp(TRUE)
         interest(1)
     }
     field(EGU,DBF_STRING) {
         prompt("Engineering Units")
-        promptgroup(GUI_DISPLAY)
+        promptgroup("80 - Display")
         interest(1)
         size(16)
-		prop(YES)
+        prop(YES)
     }
     field(ROFF,DBF_ULONG) {
         prompt("Raw Offset")
@@ -349,128 +349,128 @@ information on these fields.
     }
     field(EOFF,DBF_DOUBLE) {
         prompt("EGU to Raw Offset")
-        promptgroup(GUI_CONVERT)
+        promptgroup("60 - Convert")
         pp(TRUE)
         interest(2)
     }
     field(ESLO,DBF_DOUBLE) {
         prompt("EGU to Raw Slope")
-        promptgroup(GUI_CONVERT)
+        promptgroup("60 - Convert")
         pp(TRUE)
         interest(2)
         initial("1")
     }
     field(DRVH,DBF_DOUBLE) {
         prompt("Drive High Limit")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("30 - Action")
         pp(TRUE)
         interest(1)
-		prop(YES)
+        prop(YES)
     }
     field(DRVL,DBF_DOUBLE) {
         prompt("Drive Low Limit")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("30 - Action")
         pp(TRUE)
         interest(1)
-		prop(YES)
+        prop(YES)
     }
     field(HOPR,DBF_DOUBLE) {
         prompt("High Operating Range")
-        promptgroup(GUI_DISPLAY)
+        promptgroup("80 - Display")
         interest(1)
-		prop(YES)
+        prop(YES)
     }
     field(LOPR,DBF_DOUBLE) {
         prompt("Low Operating Range")
-        promptgroup(GUI_DISPLAY)
+        promptgroup("80 - Display")
         interest(1)
-		prop(YES)
+        prop(YES)
     }
     field(AOFF,DBF_DOUBLE) {
         prompt("Adjustment Offset")
-        promptgroup(GUI_CONVERT)
+        promptgroup("60 - Convert")
         pp(TRUE)
         interest(1)
     }
     field(ASLO,DBF_DOUBLE) {
         prompt("Adjustment Slope")
-        promptgroup(GUI_CONVERT)
+        promptgroup("60 - Convert")
         pp(TRUE)
         interest(1)
     }
     field(HIHI,DBF_DOUBLE) {
         prompt("Hihi Alarm Limit")
-        promptgroup(GUI_ALARMS)
+        promptgroup("70 - Alarm")
         pp(TRUE)
         interest(1)
-		prop(YES)
+        prop(YES)
     }
     field(LOLO,DBF_DOUBLE) {
         prompt("Lolo Alarm Limit")
-        promptgroup(GUI_ALARMS)
+        promptgroup("70 - Alarm")
         pp(TRUE)
         interest(1)
-		prop(YES)
+        prop(YES)
     }
     field(HIGH,DBF_DOUBLE) {
         prompt("High Alarm Limit")
-        promptgroup(GUI_ALARMS)
+        promptgroup("70 - Alarm")
         pp(TRUE)
         interest(1)
-		prop(YES)
+        prop(YES)
     }
     field(LOW,DBF_DOUBLE) {
         prompt("Low Alarm Limit")
-        promptgroup(GUI_ALARMS)
+        promptgroup("70 - Alarm")
         pp(TRUE)
         interest(1)
-		prop(YES)
+        prop(YES)
     }
     field(HHSV,DBF_MENU) {
         prompt("Hihi Severity")
-        promptgroup(GUI_ALARMS)
+        promptgroup("70 - Alarm")
         pp(TRUE)
         interest(1)
-		prop(YES)
+        prop(YES)
         menu(menuAlarmSevr)
     }
     field(LLSV,DBF_MENU) {
         prompt("Lolo Severity")
-        promptgroup(GUI_ALARMS)
+        promptgroup("70 - Alarm")
         pp(TRUE)
         interest(1)
-		prop(YES)
+        prop(YES)
         menu(menuAlarmSevr)
     }
     field(HSV,DBF_MENU) {
         prompt("High Severity")
-        promptgroup(GUI_ALARMS)
+        promptgroup("70 - Alarm")
         pp(TRUE)
         interest(1)
-		prop(YES)
+        prop(YES)
         menu(menuAlarmSevr)
     }
     field(LSV,DBF_MENU) {
         prompt("Low Severity")
-        promptgroup(GUI_ALARMS)
+        promptgroup("70 - Alarm")
         pp(TRUE)
         interest(1)
-		prop(YES)
+        prop(YES)
         menu(menuAlarmSevr)
     }
     field(HYST,DBF_DOUBLE) {
         prompt("Alarm Deadband")
-        promptgroup(GUI_ALARMS)
+        promptgroup("70 - Alarm")
         interest(1)
     }
     field(ADEL,DBF_DOUBLE) {
         prompt("Archive Deadband")
-        promptgroup(GUI_DISPLAY)
+        promptgroup("80 - Display")
         interest(1)
     }
     field(MDEL,DBF_DOUBLE) {
         prompt("Monitor Deadband")
-        promptgroup(GUI_DISPLAY)
+        promptgroup("80 - Display")
         interest(1)
     }
     field(RVAL,DBF_LONG) {
@@ -529,12 +529,12 @@ information on these fields.
     }
     field(SIOL,DBF_OUTLINK) {
         prompt("Sim Output Specifctn")
-        promptgroup(GUI_INPUTS)
+        promptgroup("90 - Simulate")
         interest(1)
     }
     field(SIML,DBF_INLINK) {
         prompt("Sim Mode Location")
-        promptgroup(GUI_INPUTS)
+        promptgroup("90 - Simulate")
         interest(1)
     }
     field(SIMM,DBF_MENU) {
@@ -544,19 +544,19 @@ information on these fields.
     }
     field(SIMS,DBF_MENU) {
         prompt("Sim mode Alarm Svrty")
-        promptgroup(GUI_INPUTS)
+        promptgroup("90 - Simulate")
         interest(2)
         menu(menuAlarmSevr)
     }
     field(IVOA,DBF_MENU) {
         prompt("INVALID output action")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("50 - Output")
         interest(2)
         menu(menuIvoa)
     }
     field(IVOV,DBF_DOUBLE) {
         prompt("INVALID output value")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("50 - Output")
         interest(2)
     }
     field(OMOD,DBF_UCHAR) {
diff --git a/src/std/rec/biRecord.c b/src/std/rec/biRecord.c
index 1e09ce2f7..b6af69a8b 100644
--- a/src/std/rec/biRecord.c
+++ b/src/std/rec/biRecord.c
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* recBi.c - Record Support Routines for Binary Input records */
 /*
  *      Original Author: Bob Dalesio
diff --git a/src/std/rec/biRecord.dbd b/src/std/rec/biRecord.dbd
index 501ecab83..fb3588fb1 100644
--- a/src/std/rec/biRecord.dbd
+++ b/src/std/rec/biRecord.dbd
@@ -3,47 +3,46 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 recordtype(bi) {
 	include "dbCommon.dbd" 
 	field(INP,DBF_INLINK) {
 		prompt("Input Specification")
-		promptgroup(GUI_INPUTS)
+		promptgroup("40 - Input")
 		interest(1)
 	}
 	field(VAL,DBF_ENUM) {
 		prompt("Current Value")
-		promptgroup(GUI_INPUTS)
+		promptgroup("40 - Input")
 		asl(ASL0)
 		pp(TRUE)
 	}
 	field(ZSV,DBF_MENU) {
 		prompt("Zero Error Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(OSV,DBF_MENU) {
 		prompt("One Error Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(COSV,DBF_MENU) {
 		prompt("Change of State Svr")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(ZNAM,DBF_STRING) {
 		prompt("Zero Name")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		pp(TRUE)
 		interest(1)
 		size(26)
@@ -51,7 +50,7 @@ recordtype(bi) {
 	}
 	field(ONAM,DBF_STRING) {
 		prompt("One Name")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		pp(TRUE)
 		interest(1)
 		size(26)
@@ -83,7 +82,7 @@ recordtype(bi) {
 	}
 	field(SIOL,DBF_INLINK) {
 		prompt("Sim Input Specifctn")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SVAL,DBF_ULONG) {
@@ -91,7 +90,7 @@ recordtype(bi) {
 	}
 	field(SIML,DBF_INLINK) {
 		prompt("Sim Mode Location")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SIMM,DBF_MENU) {
@@ -101,7 +100,7 @@ recordtype(bi) {
 	}
 	field(SIMS,DBF_MENU) {
 		prompt("Sim mode Alarm Svrty")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(2)
 		menu(menuAlarmSevr)
 	}
diff --git a/src/std/rec/boRecord.c b/src/std/rec/boRecord.c
index 55e198220..88184555e 100644
--- a/src/std/rec/boRecord.c
+++ b/src/std/rec/boRecord.c
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* recBo.c - Record Support Routines for Binary Output records */
 /*
  *      Original Author: Bob Dalesio
diff --git a/src/std/rec/boRecord.dbd b/src/std/rec/boRecord.dbd
index 9a861f157..fd002c368 100644
--- a/src/std/rec/boRecord.dbd
+++ b/src/std/rec/boRecord.dbd
@@ -3,42 +3,41 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 recordtype(bo) {
 	include "dbCommon.dbd" 
 	field(VAL,DBF_ENUM) {
 		prompt("Current Value")
-                promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		asl(ASL0)
 		pp(TRUE)
 	}
 	field(OMSL,DBF_MENU) {
 		prompt("Output Mode Select")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(1)
 		menu(menuOmsl)
 	}
 	field(DOL,DBF_INLINK) {
 		prompt("Desired Output Loc")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("40 - Input")
 		interest(1)
 	}
 	field(OUT,DBF_OUTLINK) {
 		prompt("Output Specification")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(1)
 	}
 	field(HIGH,DBF_DOUBLE) {
 		prompt("Seconds to Hold High")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("30 - Action")
 		interest(1)
 	}
 	field(ZNAM,DBF_STRING) {
 		prompt("Zero Name")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		pp(TRUE)
 		interest(1)
 		size(26)
@@ -46,7 +45,7 @@ recordtype(bo) {
 	}
 	field(ONAM,DBF_STRING) {
 		prompt("One Name")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		pp(TRUE)
 		interest(1)
 		size(26)
@@ -80,21 +79,21 @@ recordtype(bo) {
 	}
 	field(ZSV,DBF_MENU) {
 		prompt("Zero Error Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(OSV,DBF_MENU) {
 		prompt("One Error Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(COSV,DBF_MENU) {
 		prompt("Change of State Sevr")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
@@ -120,12 +119,12 @@ recordtype(bo) {
 	}
 	field(SIOL,DBF_OUTLINK) {
 		prompt("Sim Output Specifctn")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SIML,DBF_INLINK) {
 		prompt("Sim Mode Location")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SIMM,DBF_MENU) {
@@ -135,19 +134,19 @@ recordtype(bo) {
 	}
 	field(SIMS,DBF_MENU) {
 		prompt("Sim mode Alarm Svrty")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(2)
 		menu(menuAlarmSevr)
 	}
 	field(IVOA,DBF_MENU) {
 		prompt("INVALID outpt action")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(2)
 		menu(menuIvoa)
 	}
 	field(IVOV,DBF_USHORT) {
 		prompt("INVALID output value")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(2)
 	}
 }
diff --git a/src/std/rec/calcRecord.c b/src/std/rec/calcRecord.c
index a83ee073a..39cf2ab56 100644
--- a/src/std/rec/calcRecord.c
+++ b/src/std/rec/calcRecord.c
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* Record Support Routines for Calculation records */
 /*
  *      Original Author: Julie Sander and Bob Dalesio
diff --git a/src/std/rec/calcRecord.dbd b/src/std/rec/calcRecord.dbd
index 27c21da95..e7eb0eee3 100644
--- a/src/std/rec/calcRecord.dbd
+++ b/src/std/rec/calcRecord.dbd
@@ -10,11 +10,12 @@ recordtype(calc) {
 	include "dbCommon.dbd" 
 	field(VAL,DBF_DOUBLE) {
 		prompt("Result")
+		promptgroup("50 - Output")
 		asl(ASL0)
 	}
 	field(CALC,DBF_STRING) {
 		prompt("Calculation")
-		promptgroup(GUI_CALC)
+		promptgroup("30 - Action")
 		special(SPC_CALC)
 		pp(TRUE)
 		size(80)
@@ -22,120 +23,120 @@ recordtype(calc) {
 	}
 	field(INPA,DBF_INLINK) {
 		prompt("Input A")
-		promptgroup(GUI_CALC)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPB,DBF_INLINK) {
 		prompt("Input B")
-		promptgroup(GUI_CALC)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPC,DBF_INLINK) {
 		prompt("Input C")
-		promptgroup(GUI_CALC)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPD,DBF_INLINK) {
 		prompt("Input D")
-		promptgroup(GUI_CALC)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPE,DBF_INLINK) {
 		prompt("Input E")
-		promptgroup(GUI_CALC)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPF,DBF_INLINK) {
 		prompt("Input F")
-		promptgroup(GUI_CALC)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPG,DBF_INLINK) {
 		prompt("Input G")
-		promptgroup(GUI_CALC)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPH,DBF_INLINK) {
 		prompt("Input H")
-		promptgroup(GUI_CALC)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPI,DBF_INLINK) {
 		prompt("Input I")
-		promptgroup(GUI_CALC)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPJ,DBF_INLINK) {
 		prompt("Input J")
-		promptgroup(GUI_CALC)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPK,DBF_INLINK) {
 		prompt("Input K")
-		promptgroup(GUI_CALC)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPL,DBF_INLINK) {
 		prompt("Input L")
-		promptgroup(GUI_CALC)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(EGU,DBF_STRING) {
-		prompt("Units Name")
-		promptgroup(GUI_DISPLAY)
+		prompt("Engineering Units")
+		promptgroup("80 - Display")
 		interest(1)
 		size(16)
 		prop(YES)
 	}
 	field(PREC,DBF_SHORT) {
 		prompt("Display Precision")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(HOPR,DBF_DOUBLE) {
 		prompt("High Operating Rng")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(LOPR,DBF_DOUBLE) {
 		prompt("Low Operating Range")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(HIHI,DBF_DOUBLE) {
 		prompt("Hihi Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(LOLO,DBF_DOUBLE) {
 		prompt("Lolo Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(HIGH,DBF_DOUBLE) {
 		prompt("High Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(LOW,DBF_DOUBLE) {
 		prompt("Low Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(HHSV,DBF_MENU) {
 		prompt("Hihi Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
@@ -143,7 +144,7 @@ recordtype(calc) {
 	}
 	field(LLSV,DBF_MENU) {
 		prompt("Lolo Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
@@ -151,7 +152,7 @@ recordtype(calc) {
 	}
 	field(HSV,DBF_MENU) {
 		prompt("High Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
@@ -159,35 +160,35 @@ recordtype(calc) {
 	}
 	field(LSV,DBF_MENU) {
 		prompt("Low Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 		menu(menuAlarmSevr)
 	}
-        field(AFTC, DBF_DOUBLE) {
-                prompt("Alarm Filter Time Constant")
-                promptgroup(GUI_ALARMS)
-                interest(1)
-        }
-        field(AFVL, DBF_DOUBLE) {
-                prompt("Alarm Filter Value")
-                special(SPC_NOMOD)
-                interest(3)
-        }
+	field(AFTC, DBF_DOUBLE) {
+		prompt("Alarm Filter Time Constant")
+		promptgroup("70 - Alarm")
+		interest(1)
+	}
+	field(AFVL, DBF_DOUBLE) {
+		prompt("Alarm Filter Value")
+		special(SPC_NOMOD)
+		interest(3)
+	}
 	field(HYST,DBF_DOUBLE) {
 		prompt("Alarm Deadband")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		interest(1)
 	}
 	field(ADEL,DBF_DOUBLE) {
 		prompt("Archive Deadband")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 	}
 	field(MDEL,DBF_DOUBLE) {
 		prompt("Monitor Deadband")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 	}
 	field(A,DBF_DOUBLE) {
diff --git a/src/std/rec/calcoutRecord.dbd b/src/std/rec/calcoutRecord.dbd
index 4b6e2a5e2..5bf2e54de 100644
--- a/src/std/rec/calcoutRecord.dbd
+++ b/src/std/rec/calcoutRecord.dbd
@@ -34,7 +34,7 @@ recordtype(calcout) {
 	}
 	field(VAL,DBF_DOUBLE) {
 		prompt("Result")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		asl(ASL0)
 	}
 	field(PVAL,DBF_DOUBLE) {
@@ -42,7 +42,7 @@ recordtype(calcout) {
 	}
 	field(CALC,DBF_STRING) {
 		prompt("Calculation")
-		promptgroup(GUI_CALC)
+		promptgroup("30 - Action")
 		special(SPC_CALC)
 		pp(TRUE)
 		size(80)
@@ -55,79 +55,79 @@ recordtype(calcout) {
 	field(INPA,DBF_INLINK) {
 		prompt("Input A")
 		special(SPC_MOD)
-		promptgroup(GUI_CALC)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPB,DBF_INLINK) {
 		prompt("Input B")
 		special(SPC_MOD)
-		promptgroup(GUI_CALC)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPC,DBF_INLINK) {
 		prompt("Input C")
 		special(SPC_MOD)
-		promptgroup(GUI_CALC)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPD,DBF_INLINK) {
 		prompt("Input D")
 		special(SPC_MOD)
-		promptgroup(GUI_CALC)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPE,DBF_INLINK) {
 		prompt("Input E")
 		special(SPC_MOD)
-		promptgroup(GUI_CALC)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPF,DBF_INLINK) {
 		prompt("Input F")
 		special(SPC_MOD)
-		promptgroup(GUI_CALC)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPG,DBF_INLINK) {
 		prompt("Input G")
 		special(SPC_MOD)
-		promptgroup(GUI_CALC)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPH,DBF_INLINK) {
 		prompt("Input H")
 		special(SPC_MOD)
-		promptgroup(GUI_CALC)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPI,DBF_INLINK) {
 		prompt("Input I")
 		special(SPC_MOD)
-		promptgroup(GUI_CALC)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPJ,DBF_INLINK) {
 		prompt("Input J")
 		special(SPC_MOD)
-		promptgroup(GUI_CALC)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPK,DBF_INLINK) {
 		prompt("Input K")
 		special(SPC_MOD)
-		promptgroup(GUI_CALC)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPL,DBF_INLINK) {
 		prompt("Input L")
 		special(SPC_MOD)
-		promptgroup(GUI_CALC)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(OUT,DBF_OUTLINK) {
 		prompt("Output Specification")
 		special(SPC_MOD)
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(1)
 	}
 	field(INAV,DBF_MENU) {
@@ -222,13 +222,13 @@ recordtype(calcout) {
 	}
 	field(OOPT,DBF_MENU) {
 		prompt("Output Execute Opt")
-		promptgroup(GUI_CALC)
+		promptgroup("50 - Output")
 		interest(1)
 		menu(calcoutOOPT)
 	}
 	field(ODLY,DBF_DOUBLE) {
 		prompt("Output Execute Delay")
-		promptgroup(GUI_ALARMS)
+		promptgroup("50 - Output")
 		asl(ASL0)
 		interest(1)
 	}
@@ -239,13 +239,13 @@ recordtype(calcout) {
 	}
 	field(DOPT,DBF_MENU) {
 		prompt("Output Data Opt")
-		promptgroup(GUI_CALC)
+		promptgroup("30 - Action")
 		interest(1)
 		menu(calcoutDOPT)
 	}
 	field(OCAL,DBF_STRING) {
 		prompt("Output Calculation")
-		promptgroup(GUI_CALC)
+		promptgroup("30 - Action")
 		special(SPC_CALC)
 		pp(TRUE)
 		size(80)
@@ -257,7 +257,7 @@ recordtype(calcout) {
 	}
 	field(OEVT,DBF_STRING) {
 		prompt("Event To Issue")
-		promptgroup(GUI_CLOCK)
+		promptgroup("30 - Action")
 		special(SPC_MOD)
 		asl(ASL0)
 		size(40)
@@ -271,71 +271,71 @@ recordtype(calcout) {
 	}
 	field(IVOA,DBF_MENU) {
 		prompt("INVALID output action")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(2)
 		menu(menuIvoa)
 	}
 	field(IVOV,DBF_DOUBLE) {
 		prompt("INVALID output value")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(2)
 	}
 	field(EGU,DBF_STRING) {
-		prompt("Units Name")
-		promptgroup(GUI_DISPLAY)
+		prompt("Engineering Units")
+		promptgroup("80 - Display")
 		interest(1)
 		size(16)
 		prop(YES)
 	}
 	field(PREC,DBF_SHORT) {
 		prompt("Display Precision")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(HOPR,DBF_DOUBLE) {
 		prompt("High Operating Rng")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(LOPR,DBF_DOUBLE) {
 		prompt("Low Operating Range")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(HIHI,DBF_DOUBLE) {
 		prompt("Hihi Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(LOLO,DBF_DOUBLE) {
 		prompt("Lolo Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(HIGH,DBF_DOUBLE) {
 		prompt("High Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(LOW,DBF_DOUBLE) {
 		prompt("Low Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(HHSV,DBF_MENU) {
 		prompt("Hihi Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
@@ -343,7 +343,7 @@ recordtype(calcout) {
 	}
 	field(LLSV,DBF_MENU) {
 		prompt("Lolo Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
@@ -351,7 +351,7 @@ recordtype(calcout) {
 	}
 	field(HSV,DBF_MENU) {
 		prompt("High Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
@@ -359,7 +359,7 @@ recordtype(calcout) {
 	}
 	field(LSV,DBF_MENU) {
 		prompt("Low Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
@@ -367,17 +367,17 @@ recordtype(calcout) {
 	}
 	field(HYST,DBF_DOUBLE) {
 		prompt("Alarm Deadband")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		interest(1)
 	}
 	field(ADEL,DBF_DOUBLE) {
 		prompt("Archive Deadband")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 	}
 	field(MDEL,DBF_DOUBLE) {
 		prompt("Monitor Deadband")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 	}
 	field(A,DBF_DOUBLE) {
diff --git a/src/std/rec/compressRecord.c b/src/std/rec/compressRecord.c
index c6bdbd869..1df9ee577 100644
--- a/src/std/rec/compressRecord.c
+++ b/src/std/rec/compressRecord.c
@@ -7,7 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
 /*
  *      Original Author: Bob Dalesio
  *      Date:            7-14-89 
diff --git a/src/std/rec/compressRecord.dbd.pod b/src/std/rec/compressRecord.dbd.pod
index 93d1e63bf..c1cb8cc29 100644
--- a/src/std/rec/compressRecord.dbd.pod
+++ b/src/std/rec/compressRecord.dbd.pod
@@ -79,7 +79,7 @@ recordtype(compress) {
 	}
 	field(INP,DBF_INLINK) {
 		prompt("Input Specification")
-		promptgroup(GUI_COMPRESS)
+		promptgroup("40 - Input")
 		interest(1)
 	}
 	field(RES,DBF_SHORT) {
@@ -90,7 +90,7 @@ recordtype(compress) {
 	}
 	field(ALG,DBF_MENU) {
 		prompt("Compression Algorithm")
-		promptgroup(GUI_ALARMS)
+		promptgroup("30 - Action")
 		special(SPC_RESET)
 		interest(1)
 		menu(compressALG)
@@ -104,49 +104,49 @@ recordtype(compress) {
 	}
 	field(NSAM,DBF_ULONG) {
 		prompt("Number of Values")
-		promptgroup(GUI_COMPRESS)
+		promptgroup("30 - Action")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(N,DBF_ULONG) {
 		prompt("N to 1 Compression")
-		promptgroup(GUI_COMPRESS)
+		promptgroup("30 - Action")
 		special(SPC_RESET)
 		interest(1)
 		initial("1")
 	}
 	field(IHIL,DBF_DOUBLE) {
 		prompt("Init High Interest Lim")
-		promptgroup(GUI_COMPRESS)
+		promptgroup("30 - Action")
 		interest(1)
 	}
 	field(ILIL,DBF_DOUBLE) {
 		prompt("Init Low Interest Lim")
-		promptgroup(GUI_COMPRESS)
+		promptgroup("30 - Action")
 		interest(1)
 	}
 	field(HOPR,DBF_DOUBLE) {
 		prompt("High Operating Range")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(LOPR,DBF_DOUBLE) {
 		prompt("Low Operating Range")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(PREC,DBF_SHORT) {
 		prompt("Display Precision")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(EGU,DBF_STRING) {
-		prompt("EngineeringUnits")
-		promptgroup(GUI_DISPLAY)
+		prompt("Engineering Units")
+		promptgroup("80 - Display")
 		interest(1)
 		size(16)
 		prop(YES)
diff --git a/src/std/rec/dfanoutRecord.c b/src/std/rec/dfanoutRecord.c
index 15d06fb3c..93c272cbd 100644
--- a/src/std/rec/dfanoutRecord.c
+++ b/src/std/rec/dfanoutRecord.c
@@ -5,8 +5,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* recDfanout.c - Record Support Routines for Dfanout records */
 /*
  * Original Author: 	Matt Bickley   (Sometime in 1994)
diff --git a/src/std/rec/dfanoutRecord.dbd b/src/std/rec/dfanoutRecord.dbd
index 4e61907c7..c2eb42a75 100644
--- a/src/std/rec/dfanoutRecord.dbd
+++ b/src/std/rec/dfanoutRecord.dbd
@@ -3,145 +3,145 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 menu(dfanoutSELM) {
-        choice(dfanoutSELM_All,"All")
-        choice(dfanoutSELM_Specified,"Specified")
-        choice(dfanoutSELM_Mask,"Mask")
+	choice(dfanoutSELM_All,"All")
+	choice(dfanoutSELM_Specified,"Specified")
+	choice(dfanoutSELM_Mask,"Mask")
 }
 recordtype(dfanout) {
 	include "dbCommon.dbd" 
 	field(VAL,DBF_DOUBLE) {
 		prompt("Desired Output")
+		promptgroup("40 - Input")
 		asl(ASL0)
 		pp(TRUE)
 	}
-        field(SELM,DBF_MENU) {
-                prompt("Select Mechanism")
-                promptgroup(GUI_LINKS)
-                interest(1)
-                menu(dfanoutSELM)
-        }
-        field(SELN,DBF_USHORT) {
-                prompt("Link Selection")
-                interest(1)
-                initial("1")
-        }
-        field(SELL,DBF_INLINK) {
-                prompt("Link Selection Loc")
-                promptgroup(GUI_LINKS)
-                interest(1)
-        }
+	field(SELM,DBF_MENU) {
+		prompt("Select Mechanism")
+		promptgroup("30 - Action")
+		interest(1)
+		menu(dfanoutSELM)
+	}
+	field(SELN,DBF_USHORT) {
+		prompt("Link Selection")
+		interest(1)
+		initial("1")
+	}
+	field(SELL,DBF_INLINK) {
+		prompt("Link Selection Loc")
+		promptgroup("30 - Action")
+		interest(1)
+	}
 	field(OUTA,DBF_OUTLINK) {
 		prompt("Output Spec A")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(1)
 	}
 	field(OUTB,DBF_OUTLINK) {
 		prompt("Output Spec B")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(1)
 	}
 	field(OUTC,DBF_OUTLINK) {
 		prompt("Output Spec C")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(1)
 	}
 	field(OUTD,DBF_OUTLINK) {
 		prompt("Output Spec D")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(1)
 	}
 	field(OUTE,DBF_OUTLINK) {
 		prompt("Output Spec E")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(1)
 	}
 	field(OUTF,DBF_OUTLINK) {
 		prompt("Output Spec F")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(1)
 	}
 	field(OUTG,DBF_OUTLINK) {
 		prompt("Output Spec G")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(1)
 	}
 	field(OUTH,DBF_OUTLINK) {
 		prompt("Output Spec H")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(1)
 	}
 	field(DOL,DBF_INLINK) {
 		prompt("Desired Output Loc")
-		promptgroup(GUI_INPUTS)
+		promptgroup("40 - Input")
 		interest(1)
 	}
 	field(OMSL,DBF_MENU) {
 		prompt("Output Mode Select")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(1)
 		menu(menuOmsl)
 	}
 	field(EGU,DBF_STRING) {
-		prompt("Units name")
-		promptgroup(GUI_DISPLAY)
+		prompt("Engineering Units")
+		promptgroup("80 - Display")
 		interest(1)
 		size(16)
 		prop(YES)
 	}
-        field(PREC,DBF_SHORT) {
-                prompt("Display Precision")
-                promptgroup(GUI_DISPLAY)
-                interest(1)
+	field(PREC,DBF_SHORT) {
+		prompt("Display Precision")
+		promptgroup("80 - Display")
+		interest(1)
 		prop(YES)
-        }
+	}
 	field(HOPR,DBF_DOUBLE) {
 		prompt("High Operating Range")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(LOPR,DBF_DOUBLE) {
 		prompt("Low Operating Range")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(HIHI,DBF_DOUBLE) {
 		prompt("Hihi Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(LOLO,DBF_DOUBLE) {
 		prompt("Lolo Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(HIGH,DBF_DOUBLE) {
 		prompt("High Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(LOW,DBF_DOUBLE) {
 		prompt("Low Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(HHSV,DBF_MENU) {
 		prompt("Hihi Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
@@ -149,7 +149,7 @@ recordtype(dfanout) {
 	}
 	field(LLSV,DBF_MENU) {
 		prompt("Lolo Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
@@ -157,7 +157,7 @@ recordtype(dfanout) {
 	}
 	field(HSV,DBF_MENU) {
 		prompt("High Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
@@ -165,7 +165,7 @@ recordtype(dfanout) {
 	}
 	field(LSV,DBF_MENU) {
 		prompt("Low Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
@@ -173,17 +173,17 @@ recordtype(dfanout) {
 	}
 	field(HYST,DBF_DOUBLE) {
 		prompt("Alarm Deadband")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		interest(1)
 	}
 	field(ADEL,DBF_DOUBLE) {
 		prompt("Archive Deadband")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 	}
 	field(MDEL,DBF_DOUBLE) {
 		prompt("Monitor Deadband")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 	}
 	field(LALM,DBF_DOUBLE) {
diff --git a/src/std/rec/eventRecord.c b/src/std/rec/eventRecord.c
index a7f9c82a9..a135a3a37 100644
--- a/src/std/rec/eventRecord.c
+++ b/src/std/rec/eventRecord.c
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* recEvent.c - Record Support Routines for Event records */
 /*
  *      Author:          Janet Anderson
diff --git a/src/std/rec/eventRecord.dbd b/src/std/rec/eventRecord.dbd
index 842d2b1c0..348902e4b 100644
--- a/src/std/rec/eventRecord.dbd
+++ b/src/std/rec/eventRecord.dbd
@@ -3,15 +3,14 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 recordtype(event) {
 	include "dbCommon.dbd" 
 	field(VAL,DBF_STRING) {
 		prompt("Event Name To Post")
-		promptgroup(GUI_INPUTS)
+		promptgroup("40 - Input")
 		special(SPC_MOD)
 		asl(ASL0)
 		size(40)
@@ -25,12 +24,12 @@ recordtype(event) {
 	}
 	field(INP,DBF_INLINK) {
 		prompt("Input Specification")
-		promptgroup(GUI_INPUTS)
+		promptgroup("40 - Input")
 		interest(1)
 	}
 	field(SIOL,DBF_INLINK) {
 		prompt("Sim Input Specifctn")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SVAL,DBF_STRING) {
@@ -39,7 +38,7 @@ recordtype(event) {
 	}
 	field(SIML,DBF_INLINK) {
 		prompt("Sim Mode Location")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SIMM,DBF_MENU) {
@@ -49,7 +48,7 @@ recordtype(event) {
 	}
 	field(SIMS,DBF_MENU) {
 		prompt("Sim mode Alarm Svrty")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(2)
 		menu(menuAlarmSevr)
 	}
diff --git a/src/std/rec/fanoutRecord.c b/src/std/rec/fanoutRecord.c
index e2bec291c..d54c5c953 100644
--- a/src/std/rec/fanoutRecord.c
+++ b/src/std/rec/fanoutRecord.c
@@ -7,7 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
 /*
  *      Original Author: Bob Dalesio
  *      Date:            12-20-88
diff --git a/src/std/rec/fanoutRecord.dbd b/src/std/rec/fanoutRecord.dbd
index 8ad9209fc..40968945c 100644
--- a/src/std/rec/fanoutRecord.dbd
+++ b/src/std/rec/fanoutRecord.dbd
@@ -20,7 +20,7 @@ recordtype(fanout) {
 	}
 	field(SELM,DBF_MENU) {
 		prompt("Select Mechanism")
-		promptgroup(GUI_LINKS)
+		promptgroup("30 - Action")
 		interest(1)
 		menu(fanoutSELM)
 	}
@@ -31,7 +31,7 @@ recordtype(fanout) {
 	}
 	field(SELL,DBF_INLINK) {
 		prompt("Link Selection Loc")
-		promptgroup(GUI_LINKS)
+		promptgroup("30 - Action")
 		interest(1)
 	}
 	field(OFFS,DBF_SHORT) {
@@ -46,82 +46,82 @@ recordtype(fanout) {
 	}
 	field(LNK0,DBF_FWDLINK) {
 		prompt("Forward Link 0")
-		promptgroup(GUI_LINKS)
+		promptgroup("51 - Output 0-7")
 		interest(1)
 	}
 	field(LNK1,DBF_FWDLINK) {
 		prompt("Forward Link 1")
-		promptgroup(GUI_LINKS)
+		promptgroup("51 - Output 0-7")
 		interest(1)
 	}
 	field(LNK2,DBF_FWDLINK) {
 		prompt("Forward Link 2")
-		promptgroup(GUI_LINKS)
+		promptgroup("51 - Output 0-7")
 		interest(1)
 	}
 	field(LNK3,DBF_FWDLINK) {
 		prompt("Forward Link 3")
-		promptgroup(GUI_LINKS)
+		promptgroup("51 - Output 0-7")
 		interest(1)
 	}
 	field(LNK4,DBF_FWDLINK) {
 		prompt("Forward Link 4")
-		promptgroup(GUI_LINKS)
+		promptgroup("51 - Output 0-7")
 		interest(1)
 	}
 	field(LNK5,DBF_FWDLINK) {
 		prompt("Forward Link 5")
-		promptgroup(GUI_LINKS)
+		promptgroup("51 - Output 0-7")
 		interest(1)
 	}
 	field(LNK6,DBF_FWDLINK) {
 		prompt("Forward Link 6")
-		promptgroup(GUI_LINKS)
+		promptgroup("51 - Output 0-7")
 		interest(1)
 	}
 	field(LNK7,DBF_FWDLINK) {
 		prompt("Forward Link 7")
-		promptgroup(GUI_LINKS)
+		promptgroup("51 - Output 0-7")
 		interest(1)
 	}
 	field(LNK8,DBF_FWDLINK) {
 		prompt("Forward Link 8")
-		promptgroup(GUI_LINKS)
+		promptgroup("52 - Output 8-F")
 		interest(1)
 	}
 	field(LNK9,DBF_FWDLINK) {
 		prompt("Forward Link 9")
-		promptgroup(GUI_LINKS)
+		promptgroup("52 - Output 8-F")
 		interest(1)
 	}
 	field(LNKA,DBF_FWDLINK) {
 		prompt("Forward Link 10")
-		promptgroup(GUI_LINKS)
+		promptgroup("52 - Output 8-F")
 		interest(1)
 	}
 	field(LNKB,DBF_FWDLINK) {
 		prompt("Forward Link 11")
-		promptgroup(GUI_LINKS)
+		promptgroup("52 - Output 8-F")
 		interest(1)
 	}
 	field(LNKC,DBF_FWDLINK) {
 		prompt("Forward Link 12")
-		promptgroup(GUI_LINKS)
+		promptgroup("52 - Output 8-F")
 		interest(1)
 	}
 	field(LNKD,DBF_FWDLINK) {
 		prompt("Forward Link 13")
-		promptgroup(GUI_LINKS)
+		promptgroup("52 - Output 8-F")
 		interest(1)
 	}
 	field(LNKE,DBF_FWDLINK) {
 		prompt("Forward Link 14")
-		promptgroup(GUI_LINKS)
+		promptgroup("52 - Output 8-F")
 		interest(1)
 	}
 	field(LNKF,DBF_FWDLINK) {
 		prompt("Forward Link 15")
-		promptgroup(GUI_LINKS)
+		promptgroup("52 - Output 8-F")
 		interest(1)
 	}
 }
diff --git a/src/std/rec/histogramRecord.c b/src/std/rec/histogramRecord.c
index 74b2fcd17..f24bba625 100644
--- a/src/std/rec/histogramRecord.c
+++ b/src/std/rec/histogramRecord.c
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* histogramRecord.c - Record Support Routines for Histogram records */
 /*
  *      Author:      Janet Anderson
diff --git a/src/std/rec/histogramRecord.dbd b/src/std/rec/histogramRecord.dbd
index 08fc12d4f..075400fc6 100644
--- a/src/std/rec/histogramRecord.dbd
+++ b/src/std/rec/histogramRecord.dbd
@@ -3,9 +3,8 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 menu(histogramCMD) {
 	choice(histogramCMD_Read,"Read")
@@ -26,7 +25,7 @@ recordtype(histogram) {
 	}
 	field(NELM,DBF_USHORT) {
 		prompt("Num of Array Elements")
-		promptgroup(GUI_HIST)
+		promptgroup("30 - Action")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
@@ -46,14 +45,14 @@ recordtype(histogram) {
 	}
 	field(ULIM,DBF_DOUBLE) {
 		prompt("Upper Signal Limit")
-		promptgroup(GUI_HIST)
+		promptgroup("30 - Action")
 		special(SPC_RESET)
 		interest(1)
 		prop(YES)
 	}
 	field(LLIM,DBF_DOUBLE) {
 		prompt("Lower Signal Limit ")
-		promptgroup(GUI_HIST)
+		promptgroup("30 - Action")
 		special(SPC_RESET)
 		interest(1)
 		prop(YES)
@@ -69,13 +68,13 @@ recordtype(histogram) {
 	}
 	field(PREC,DBF_SHORT) {
 		prompt("Display Precision")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(SVL,DBF_INLINK) {
 		prompt("Signal Value Location")
-		promptgroup(GUI_INPUTS)
+		promptgroup("40 - Input")
 		interest(1)
 	}
 	field(BPTR,DBF_NOACCESS) {
@@ -92,7 +91,7 @@ recordtype(histogram) {
 	}
 	field(MDEL,DBF_SHORT) {
 		prompt("Monitor Count Deadband")
-		promptgroup(GUI_HIST)
+		promptgroup("80 - Display")
 		interest(1)
 	}
 	field(MCNT,DBF_SHORT) {
@@ -102,13 +101,13 @@ recordtype(histogram) {
 	}
 	field(SDEL,DBF_DOUBLE) {
 		prompt("Monitor Seconds Dband")
-		promptgroup(GUI_HIST)
+		promptgroup("80 - Display")
 		special(SPC_RESET)
 		interest(1)
 	}
 	field(SIOL,DBF_INLINK) {
 		prompt("Sim Input Specifctn")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SVAL,DBF_DOUBLE) {
@@ -116,7 +115,7 @@ recordtype(histogram) {
 	}
 	field(SIML,DBF_INLINK) {
 		prompt("Sim Mode Location")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SIMM,DBF_MENU) {
@@ -126,19 +125,19 @@ recordtype(histogram) {
 	}
 	field(SIMS,DBF_MENU) {
 		prompt("Sim mode Alarm Svrty")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(2)
 		menu(menuAlarmSevr)
 	}
 	field(HOPR,DBF_ULONG) {
 		prompt("High Operating Range")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(LOPR,DBF_ULONG) {
 		prompt("Low Operating Range")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
diff --git a/src/std/rec/longinRecord.c b/src/std/rec/longinRecord.c
index b4b50ebd5..f9a9232e3 100644
--- a/src/std/rec/longinRecord.c
+++ b/src/std/rec/longinRecord.c
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* recLongin.c - Record Support Routines for Longin records */
 /*
  *      Author: 	Janet Anderson
diff --git a/src/std/rec/longinRecord.dbd b/src/std/rec/longinRecord.dbd
index 5c038f9db..60eee5000 100644
--- a/src/std/rec/longinRecord.dbd
+++ b/src/std/rec/longinRecord.dbd
@@ -3,121 +3,120 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 recordtype(longin) {
 	include "dbCommon.dbd" 
 	field(VAL,DBF_LONG) {
 		prompt("Current value")
-                promptgroup(GUI_INPUTS)
+		promptgroup("40 - Input")
 		asl(ASL0)
 		pp(TRUE)
 	}
 	field(INP,DBF_INLINK) {
 		prompt("Input Specification")
-		promptgroup(GUI_INPUTS)
+		promptgroup("40 - Input")
 		interest(1)
 	}
 	field(EGU,DBF_STRING) {
-		prompt("Units name")
-		promptgroup(GUI_DISPLAY)
+		prompt("Engineering Units")
+		promptgroup("80 - Display")
 		interest(1)
 		size(16)
 		prop(YES)
 	}
 	field(HOPR,DBF_LONG) {
 		prompt("High Operating Range")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(LOPR,DBF_LONG) {
 		prompt("Low Operating Range")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(HIHI,DBF_LONG) {
 		prompt("Hihi Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(LOLO,DBF_LONG) {
 		prompt("Lolo Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(HIGH,DBF_LONG) {
 		prompt("High Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(LOW,DBF_LONG) {
 		prompt("Low Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(HHSV,DBF_MENU) {
 		prompt("Hihi Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(LLSV,DBF_MENU) {
 		prompt("Lolo Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(HSV,DBF_MENU) {
 		prompt("High Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(LSV,DBF_MENU) {
 		prompt("Low Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(HYST,DBF_LONG) {
 		prompt("Alarm Deadband")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		interest(1)
 	}
         field(AFTC, DBF_DOUBLE) {
-                prompt("Alarm Filter Time Constant")
-                promptgroup(GUI_ALARMS)
-                interest(1)
+		prompt("Alarm Filter Time Constant")
+		promptgroup("70 - Alarm")
+		interest(1)
         }
         field(AFVL, DBF_DOUBLE) {
-                prompt("Alarm Filter Value")
-                special(SPC_NOMOD)
-                interest(3)
+		prompt("Alarm Filter Value")
+		special(SPC_NOMOD)
+		interest(3)
         }
 	field(ADEL,DBF_LONG) {
 		prompt("Archive Deadband")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 	}
 	field(MDEL,DBF_LONG) {
 		prompt("Monitor Deadband")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 	}
 	field(LALM,DBF_LONG) {
@@ -137,7 +136,7 @@ recordtype(longin) {
 	}
 	field(SIOL,DBF_INLINK) {
 		prompt("Sim Input Specifctn")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SVAL,DBF_LONG) {
@@ -145,7 +144,7 @@ recordtype(longin) {
 	}
 	field(SIML,DBF_INLINK) {
 		prompt("Sim Mode Location")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SIMM,DBF_MENU) {
@@ -155,7 +154,7 @@ recordtype(longin) {
 	}
 	field(SIMS,DBF_MENU) {
 		prompt("Sim mode Alarm Svrty")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(2)
 		menu(menuAlarmSevr)
 	}
diff --git a/src/std/rec/longoutRecord.c b/src/std/rec/longoutRecord.c
index afdf90ea8..b168bf1be 100644
--- a/src/std/rec/longoutRecord.c
+++ b/src/std/rec/longoutRecord.c
@@ -7,7 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
 /*
  * Author: 	Janet Anderson
  * Date:	9/23/91
diff --git a/src/std/rec/longoutRecord.dbd b/src/std/rec/longoutRecord.dbd
index 5124aafe8..c3ba0b977 100644
--- a/src/std/rec/longoutRecord.dbd
+++ b/src/std/rec/longoutRecord.dbd
@@ -3,136 +3,135 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 recordtype(longout) {
 	include "dbCommon.dbd" 
 	field(VAL,DBF_LONG) {
 		prompt("Desired Output")
-                promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		asl(ASL0)
 		pp(TRUE)
 	}
 	field(OUT,DBF_OUTLINK) {
 		prompt("Output Specification")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(1)
 	}
 	field(DOL,DBF_INLINK) {
 		prompt("Desired Output Loc")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("40 - Input")
 		interest(1)
 	}
 	field(OMSL,DBF_MENU) {
 		prompt("Output Mode Select")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(1)
 		menu(menuOmsl)
 	}
 	field(EGU,DBF_STRING) {
-		prompt("Units name")
-		promptgroup(GUI_DISPLAY)
+		prompt("Engineering Units")
+		promptgroup("80 - Display")
 		interest(1)
 		size(16)
 		prop(YES)
 	}
 	field(DRVH,DBF_LONG) {
 		prompt("Drive High Limit")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("30 - Action")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(DRVL,DBF_LONG) {
 		prompt("Drive Low Limit")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("30 - Action")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(HOPR,DBF_LONG) {
 		prompt("High Operating Range")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(LOPR,DBF_LONG) {
 		prompt("Low Operating Range")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(HIHI,DBF_LONG) {
 		prompt("Hihi Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(LOLO,DBF_LONG) {
 		prompt("Lolo Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(HIGH,DBF_LONG) {
 		prompt("High Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(LOW,DBF_LONG) {
 		prompt("Low Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(HHSV,DBF_MENU) {
 		prompt("Hihi Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(LLSV,DBF_MENU) {
 		prompt("Lolo Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(HSV,DBF_MENU) {
 		prompt("High Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(LSV,DBF_MENU) {
 		prompt("Low Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(HYST,DBF_LONG) {
 		prompt("Alarm Deadband")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		interest(1)
 	}
 	field(ADEL,DBF_LONG) {
 		prompt("Archive Deadband")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 	}
 	field(MDEL,DBF_LONG) {
 		prompt("Monitor Deadband")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 	}
 	field(LALM,DBF_LONG) {
@@ -152,12 +151,12 @@ recordtype(longout) {
 	}
 	field(SIOL,DBF_OUTLINK) {
 		prompt("Sim Output Specifctn")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SIML,DBF_INLINK) {
 		prompt("Sim Mode Location")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SIMM,DBF_MENU) {
@@ -167,19 +166,19 @@ recordtype(longout) {
 	}
 	field(SIMS,DBF_MENU) {
 		prompt("Sim mode Alarm Svrty")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(2)
 		menu(menuAlarmSevr)
 	}
 	field(IVOA,DBF_MENU) {
 		prompt("INVALID output action")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(2)
 		menu(menuIvoa)
 	}
 	field(IVOV,DBF_LONG) {
 		prompt("INVALID output value")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(2)
 	}
 }
diff --git a/src/std/rec/lsiRecord.c b/src/std/rec/lsiRecord.c
index 1cbff9185..ee9e8e2f0 100644
--- a/src/std/rec/lsiRecord.c
+++ b/src/std/rec/lsiRecord.c
@@ -158,9 +158,10 @@ static long put_array_info(DBADDR *paddr, long nNew)
 {
     lsiRecord *prec = (lsiRecord *) paddr->precord;
 
-    if (nNew == prec->sizv)
-        --nNew;             /* truncated string */
-    prec->val[nNew] = 0;    /* ensure data is terminated */
+    if (nNew >= prec->sizv)
+        nNew = prec->sizv - 1; /* truncated string */
+    if (paddr->field_type == DBF_CHAR)
+        prec->val[nNew] = 0;   /* ensure data is terminated */
 
     return 0;
 }
diff --git a/src/std/rec/lsiRecord.dbd b/src/std/rec/lsiRecord.dbd
index be14cf552..c50d905d8 100644
--- a/src/std/rec/lsiRecord.dbd
+++ b/src/std/rec/lsiRecord.dbd
@@ -34,7 +34,7 @@ recordtype(lsi) {
     }
     field(SIZV,DBF_USHORT) {
         prompt("Size of buffers")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("40 - Input")
         special(SPC_NOMOD)
         interest(1)
         initial("41")
@@ -49,24 +49,24 @@ recordtype(lsi) {
     }
     field(INP,DBF_INLINK) {
         prompt("Input Specification")
-        promptgroup(GUI_INPUTS)
+        promptgroup("40 - Input")
         interest(1)
     }
     field(MPST,DBF_MENU) {
         prompt("Post Value Monitors")
-        promptgroup(GUI_DISPLAY)
+        promptgroup("80 - Display")
         interest(1)
         menu(menuPost)
     }
     field(APST,DBF_MENU) {
         prompt("Post Archive Monitors")
-        promptgroup(GUI_DISPLAY)
+        promptgroup("80 - Display")
         interest(1)
         menu(menuPost)
     }
     field(SIML,DBF_INLINK) {
         prompt("Simulation Mode Link")
-        promptgroup(GUI_INPUTS)
+        promptgroup("90 - Simulate")
         interest(2)
     }
     field(SIMM,DBF_MENU) {
@@ -76,13 +76,13 @@ recordtype(lsi) {
     }
     field(SIMS,DBF_MENU) {
         prompt("Simulation Mode Severity")
-        promptgroup(GUI_INPUTS)
+        promptgroup("90 - Simulate")
         interest(2)
         menu(menuAlarmSevr)
     }
     field(SIOL,DBF_INLINK) {
         prompt("Sim Input Specifctn")
-        promptgroup(GUI_INPUTS)
+        promptgroup("90 - Simulate")
         interest(2)
     }
 }
diff --git a/src/std/rec/lsoRecord.c b/src/std/rec/lsoRecord.c
index 271a0c3f9..52a6f1aa4 100644
--- a/src/std/rec/lsoRecord.c
+++ b/src/std/rec/lsoRecord.c
@@ -200,9 +200,10 @@ static long put_array_info(DBADDR *paddr, long nNew)
 {
     lsoRecord *prec = (lsoRecord *) paddr->precord;
 
-    if (nNew == prec->sizv)
-        --nNew;             /* truncated string */
-    prec->val[nNew] = 0;    /* ensure data is terminated */
+    if (nNew >= prec->sizv)
+        nNew = prec->sizv - 1; /* truncated string */
+    if (paddr->field_type == DBF_CHAR)
+        prec->val[nNew] = 0;   /* ensure data is terminated */
 
     return 0;
 }
diff --git a/src/std/rec/lsoRecord.dbd b/src/std/rec/lsoRecord.dbd
index 48ddea810..69203f2d0 100644
--- a/src/std/rec/lsoRecord.dbd
+++ b/src/std/rec/lsoRecord.dbd
@@ -34,7 +34,7 @@ recordtype(lso) {
     }
     field(SIZV,DBF_USHORT) {
         prompt("Size of buffers")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("50 - Output")
         special(SPC_NOMOD)
         interest(1)
         initial("41")
@@ -50,47 +50,47 @@ recordtype(lso) {
     }
     field(DOL,DBF_INLINK) {
         prompt("Desired Output Link")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("40 - Input")
         interest(1)
     }
     field(IVOA,DBF_MENU) {
         prompt("INVALID Output Action")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("50 - Output")
         interest(2)
         menu(menuIvoa)
     }
     field(IVOV,DBF_STRING) {
         prompt("INVALID Output Value")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("50 - Output")
         interest(2)
         size(40)
     }
     field(OMSL,DBF_MENU) {
         prompt("Output Mode Select")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("50 - Output")
         interest(1)
         menu(menuOmsl)
     }
     field(OUT,DBF_OUTLINK) {
         prompt("Output Specification")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("50 - Output")
         interest(1)
     }
     field(MPST,DBF_MENU) {
         prompt("Post Value Monitors")
-        promptgroup(GUI_DISPLAY)
+        promptgroup("80 - Display")
         interest(1)
         menu(menuPost)
     }
     field(APST,DBF_MENU) {
         prompt("Post Archive Monitors")
-        promptgroup(GUI_DISPLAY)
+        promptgroup("80 - Display")
         interest(1)
         menu(menuPost)
     }
     field(SIML,DBF_INLINK) {
         prompt("Sim Mode link")
-        promptgroup(GUI_INPUTS)
+        promptgroup("90 - Simulate")
         interest(1)
     }
     field(SIMM,DBF_MENU) {
@@ -100,13 +100,13 @@ recordtype(lso) {
     }
     field(SIMS,DBF_MENU) {
         prompt("Sim mode Alarm Svrty")
-        promptgroup(GUI_INPUTS)
+        promptgroup("90 - Simulate")
         interest(2)
         menu(menuAlarmSevr)
     }
     field(SIOL,DBF_OUTLINK) {
         prompt("Sim Output Specifctn")
-        promptgroup(GUI_INPUTS)
+        promptgroup("90 - Simulate")
         interest(1)
     }
 }
diff --git a/src/std/rec/mbbiDirectRecord.c b/src/std/rec/mbbiDirectRecord.c
index 1d603ab5a..5e4d5df8d 100644
--- a/src/std/rec/mbbiDirectRecord.c
+++ b/src/std/rec/mbbiDirectRecord.c
@@ -9,8 +9,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* mbbiDirectRecord.c - Record Support routines for mbboDirect records */
 /*
  *      Original Authors: Bob Dalesio and Matthew Needes
diff --git a/src/std/rec/mbbiDirectRecord.dbd b/src/std/rec/mbbiDirectRecord.dbd
index a72c24070..3fa3d8823 100644
--- a/src/std/rec/mbbiDirectRecord.dbd
+++ b/src/std/rec/mbbiDirectRecord.dbd
@@ -10,19 +10,19 @@ recordtype(mbbiDirect) {
     include "dbCommon.dbd" 
     field(VAL,DBF_USHORT) {
         prompt("Current Value")
-        promptgroup(GUI_INPUTS)
+        promptgroup("40 - Input")
         asl(ASL0)
         pp(TRUE)
     }
     field(NOBT,DBF_SHORT) {
         prompt("Number of Bits")
-        promptgroup(GUI_MBB)
+        promptgroup("40 - Input")
         special(SPC_NOMOD)
         interest(1)
     }
     field(INP,DBF_INLINK) {
         prompt("Input Specification")
-        promptgroup(GUI_MBB)
+        promptgroup("40 - Input")
         interest(1)
     }
     field(RVAL,DBF_ULONG) {
@@ -46,12 +46,12 @@ recordtype(mbbiDirect) {
     }
     field(SHFT,DBF_USHORT) {
         prompt("Shift")
-        promptgroup(GUI_MBB)
+        promptgroup("40 - Input")
         interest(1)
     }
     field(SIOL,DBF_INLINK) {
         prompt("Sim Input Specifctn")
-        promptgroup(GUI_MBB)
+        promptgroup("90 - Simulate")
         interest(1)
     }
     field(SVAL,DBF_ULONG) {
@@ -59,7 +59,7 @@ recordtype(mbbiDirect) {
     }
     field(SIML,DBF_INLINK) {
         prompt("Sim Mode Location")
-        promptgroup(GUI_MBB)
+        promptgroup("90 - Simulate")
         interest(1)
     }
     field(SIMM,DBF_MENU) {
@@ -69,7 +69,7 @@ recordtype(mbbiDirect) {
     }
     field(SIMS,DBF_MENU) {
         prompt("Sim mode Alarm Svrty")
-        promptgroup(GUI_MBB)
+        promptgroup("90 - Simulate")
         interest(2)
         menu(menuAlarmSevr)
     }
diff --git a/src/std/rec/mbbiRecord.c b/src/std/rec/mbbiRecord.c
index bfc4fdba6..c7e008c26 100644
--- a/src/std/rec/mbbiRecord.c
+++ b/src/std/rec/mbbiRecord.c
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
 /*
  *      Original Author: Bob Dalesio
  *      Date:            5-9-88
diff --git a/src/std/rec/mbbiRecord.dbd b/src/std/rec/mbbiRecord.dbd
index ffc37cfaf..1f5724c92 100644
--- a/src/std/rec/mbbiRecord.dbd
+++ b/src/std/rec/mbbiRecord.dbd
@@ -10,24 +10,24 @@ recordtype(mbbi) {
 	include "dbCommon.dbd" 
 	field(VAL,DBF_ENUM) {
 		prompt("Current Value")
-                promptgroup(GUI_INPUTS)
+		promptgroup("40 - Input")
 		asl(ASL0)
 		pp(TRUE)
 	}
 	field(NOBT,DBF_USHORT) {
 		prompt("Number of Bits")
-		promptgroup(GUI_MBB)
+		promptgroup("40 - Input")
 		special(SPC_NOMOD)
 		interest(1)
 	}
 	field(INP,DBF_INLINK) {
 		prompt("Input Specification")
-		promptgroup(GUI_MBB)
+		promptgroup("40 - Input")
 		interest(1)
 	}
 	field(ZRVL,DBF_ULONG) {
 		prompt("Zero Value")
-		promptgroup(GUI_BITS1)
+		promptgroup("41 - Input 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -35,7 +35,7 @@ recordtype(mbbi) {
 	}
 	field(ONVL,DBF_ULONG) {
 		prompt("One Value")
-		promptgroup(GUI_BITS1)
+		promptgroup("41 - Input 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -43,7 +43,7 @@ recordtype(mbbi) {
 	}
 	field(TWVL,DBF_ULONG) {
 		prompt("Two Value")
-		promptgroup(GUI_BITS1)
+		promptgroup("41 - Input 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -51,7 +51,7 @@ recordtype(mbbi) {
 	}
 	field(THVL,DBF_ULONG) {
 		prompt("Three Value")
-		promptgroup(GUI_BITS1)
+		promptgroup("41 - Input 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -59,7 +59,7 @@ recordtype(mbbi) {
 	}
 	field(FRVL,DBF_ULONG) {
 		prompt("Four Value")
-		promptgroup(GUI_BITS1)
+		promptgroup("41 - Input 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -67,7 +67,7 @@ recordtype(mbbi) {
 	}
 	field(FVVL,DBF_ULONG) {
 		prompt("Five Value")
-		promptgroup(GUI_BITS1)
+		promptgroup("41 - Input 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -75,7 +75,7 @@ recordtype(mbbi) {
 	}
 	field(SXVL,DBF_ULONG) {
 		prompt("Six Value")
-		promptgroup(GUI_BITS1)
+		promptgroup("41 - Input 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -83,7 +83,7 @@ recordtype(mbbi) {
 	}
 	field(SVVL,DBF_ULONG) {
 		prompt("Seven Value")
-		promptgroup(GUI_BITS1)
+		promptgroup("41 - Input 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -91,7 +91,7 @@ recordtype(mbbi) {
 	}
 	field(EIVL,DBF_ULONG) {
 		prompt("Eight Value")
-		promptgroup(GUI_BITS2)
+		promptgroup("42 - Input 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -99,7 +99,7 @@ recordtype(mbbi) {
 	}
 	field(NIVL,DBF_ULONG) {
 		prompt("Nine Value")
-		promptgroup(GUI_BITS2)
+		promptgroup("42 - Input 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -107,7 +107,7 @@ recordtype(mbbi) {
 	}
 	field(TEVL,DBF_ULONG) {
 		prompt("Ten Value")
-		promptgroup(GUI_BITS2)
+		promptgroup("42 - Input 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -115,7 +115,7 @@ recordtype(mbbi) {
 	}
 	field(ELVL,DBF_ULONG) {
 		prompt("Eleven Value")
-		promptgroup(GUI_BITS2)
+		promptgroup("42 - Input 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -123,7 +123,7 @@ recordtype(mbbi) {
 	}
 	field(TVVL,DBF_ULONG) {
 		prompt("Twelve Value")
-		promptgroup(GUI_BITS2)
+		promptgroup("42 - Input 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -131,7 +131,7 @@ recordtype(mbbi) {
 	}
 	field(TTVL,DBF_ULONG) {
 		prompt("Thirteen Value")
-		promptgroup(GUI_BITS2)
+		promptgroup("42 - Input 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -139,7 +139,7 @@ recordtype(mbbi) {
 	}
 	field(FTVL,DBF_ULONG) {
 		prompt("Fourteen Value")
-		promptgroup(GUI_BITS2)
+		promptgroup("42 - Input 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -147,7 +147,7 @@ recordtype(mbbi) {
 	}
 	field(FFVL,DBF_ULONG) {
 		prompt("Fifteen Value")
-		promptgroup(GUI_BITS2)
+		promptgroup("42 - Input 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -155,7 +155,7 @@ recordtype(mbbi) {
 	}
 	field(ZRST,DBF_STRING) {
 		prompt("Zero String")
-		promptgroup(GUI_BITS1)
+		promptgroup("81 - Display 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -163,7 +163,7 @@ recordtype(mbbi) {
 	}
 	field(ONST,DBF_STRING) {
 		prompt("One String")
-		promptgroup(GUI_BITS1)
+		promptgroup("81 - Display 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -171,7 +171,7 @@ recordtype(mbbi) {
 	}
 	field(TWST,DBF_STRING) {
 		prompt("Two String")
-		promptgroup(GUI_BITS1)
+		promptgroup("81 - Display 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -179,7 +179,7 @@ recordtype(mbbi) {
 	}
 	field(THST,DBF_STRING) {
 		prompt("Three String")
-		promptgroup(GUI_BITS1)
+		promptgroup("81 - Display 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -187,7 +187,7 @@ recordtype(mbbi) {
 	}
 	field(FRST,DBF_STRING) {
 		prompt("Four String")
-		promptgroup(GUI_BITS1)
+		promptgroup("81 - Display 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -195,7 +195,7 @@ recordtype(mbbi) {
 	}
 	field(FVST,DBF_STRING) {
 		prompt("Five String")
-		promptgroup(GUI_BITS1)
+		promptgroup("81 - Display 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -203,7 +203,7 @@ recordtype(mbbi) {
 	}
 	field(SXST,DBF_STRING) {
 		prompt("Six String")
-		promptgroup(GUI_BITS1)
+		promptgroup("81 - Display 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -211,7 +211,7 @@ recordtype(mbbi) {
 	}
 	field(SVST,DBF_STRING) {
 		prompt("Seven String")
-		promptgroup(GUI_BITS1)
+		promptgroup("81 - Display 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -219,7 +219,7 @@ recordtype(mbbi) {
 	}
 	field(EIST,DBF_STRING) {
 		prompt("Eight String")
-		promptgroup(GUI_BITS2)
+		promptgroup("82 - Display 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -227,7 +227,7 @@ recordtype(mbbi) {
 	}
 	field(NIST,DBF_STRING) {
 		prompt("Nine String")
-		promptgroup(GUI_BITS2)
+		promptgroup("82 - Display 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -235,7 +235,7 @@ recordtype(mbbi) {
 	}
 	field(TEST,DBF_STRING) {
 		prompt("Ten String")
-		promptgroup(GUI_BITS2)
+		promptgroup("82 - Display 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -243,7 +243,7 @@ recordtype(mbbi) {
 	}
 	field(ELST,DBF_STRING) {
 		prompt("Eleven String")
-		promptgroup(GUI_BITS2)
+		promptgroup("82 - Display 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -251,7 +251,7 @@ recordtype(mbbi) {
 	}
 	field(TVST,DBF_STRING) {
 		prompt("Twelve String")
-		promptgroup(GUI_BITS2)
+		promptgroup("82 - Display 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -259,7 +259,7 @@ recordtype(mbbi) {
 	}
 	field(TTST,DBF_STRING) {
 		prompt("Thirteen String")
-		promptgroup(GUI_BITS2)
+		promptgroup("82 - Display 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -267,7 +267,7 @@ recordtype(mbbi) {
 	}
 	field(FTST,DBF_STRING) {
 		prompt("Fourteen String")
-		promptgroup(GUI_BITS2)
+		promptgroup("82 - Display 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -275,7 +275,7 @@ recordtype(mbbi) {
 	}
 	field(FFST,DBF_STRING) {
 		prompt("Fifteen String")
-		promptgroup(GUI_BITS2)
+		promptgroup("82 - Display 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -283,136 +283,136 @@ recordtype(mbbi) {
 	}
 	field(ZRSV,DBF_MENU) {
 		prompt("State Zero Severity")
-		promptgroup(GUI_BITS1)
+		promptgroup("71 - Alarm 0-7")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(ONSV,DBF_MENU) {
 		prompt("State One Severity")
-		promptgroup(GUI_BITS1)
+		promptgroup("71 - Alarm 0-7")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(TWSV,DBF_MENU) {
 		prompt("State Two Severity")
-		promptgroup(GUI_BITS1)
+		promptgroup("71 - Alarm 0-7")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(THSV,DBF_MENU) {
 		prompt("State Three Severity")
-		promptgroup(GUI_BITS1)
+		promptgroup("71 - Alarm 0-7")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(FRSV,DBF_MENU) {
 		prompt("State Four Severity")
-		promptgroup(GUI_BITS1)
+		promptgroup("71 - Alarm 0-7")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(FVSV,DBF_MENU) {
 		prompt("State Five Severity")
-		promptgroup(GUI_BITS1)
+		promptgroup("71 - Alarm 0-7")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(SXSV,DBF_MENU) {
 		prompt("State Six Severity")
-		promptgroup(GUI_BITS1)
+		promptgroup("71 - Alarm 0-7")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(SVSV,DBF_MENU) {
 		prompt("State Seven Severity")
-		promptgroup(GUI_BITS1)
+		promptgroup("71 - Alarm 0-7")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(EISV,DBF_MENU) {
 		prompt("State Eight Severity")
-		promptgroup(GUI_BITS2)
+		promptgroup("72 - Alarm 8-15")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(NISV,DBF_MENU) {
 		prompt("State Nine Severity")
-		promptgroup(GUI_BITS2)
+		promptgroup("72 - Alarm 8-15")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(TESV,DBF_MENU) {
 		prompt("State Ten Severity")
-		promptgroup(GUI_BITS2)
+		promptgroup("72 - Alarm 8-15")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(ELSV,DBF_MENU) {
 		prompt("State Eleven Severity")
-		promptgroup(GUI_BITS2)
+		promptgroup("72 - Alarm 8-15")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(TVSV,DBF_MENU) {
 		prompt("State Twelve Severity")
-		promptgroup(GUI_BITS2)
+		promptgroup("72 - Alarm 8-15")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(TTSV,DBF_MENU) {
 		prompt("State Thirteen Sevr")
-		promptgroup(GUI_BITS2)
+		promptgroup("72 - Alarm 8-15")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(FTSV,DBF_MENU) {
 		prompt("State Fourteen Sevr")
-		promptgroup(GUI_BITS2)
+		promptgroup("72 - Alarm 8-15")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(FFSV,DBF_MENU) {
 		prompt("State Fifteen Severity")
-		promptgroup(GUI_BITS2)
+		promptgroup("72 - Alarm 8-15")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
-        field(AFTC, DBF_DOUBLE) {
-                prompt("Alarm Filter Time Constant")
-                promptgroup(GUI_ALARMS)
-                interest(1)
-        }
-        field(AFVL, DBF_DOUBLE) {
-                prompt("Alarm Filter Value")
-                special(SPC_NOMOD)
-                interest(3)
-        }
+	field(AFTC, DBF_DOUBLE) {
+		prompt("Alarm Filter Time Constant")
+		promptgroup("70 - Alarm")
+		interest(1)
+	}
+	field(AFVL, DBF_DOUBLE) {
+		prompt("Alarm Filter Value")
+		special(SPC_NOMOD)
+		interest(3)
+	}
 	field(UNSV,DBF_MENU) {
 		prompt("Unknown State Severity")
-		promptgroup(GUI_MBB)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(COSV,DBF_MENU) {
 		prompt("Change of State Svr")
-		promptgroup(GUI_MBB)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
@@ -448,12 +448,12 @@ recordtype(mbbi) {
 	}
 	field(SHFT,DBF_USHORT) {
 		prompt("Shift")
-		promptgroup(GUI_MBB)
+		promptgroup("40 - Input")
 		interest(1)
 	}
 	field(SIOL,DBF_INLINK) {
 		prompt("Sim Input Specifctn")
-		promptgroup(GUI_MBB)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SVAL,DBF_ULONG) {
@@ -461,7 +461,7 @@ recordtype(mbbi) {
 	}
 	field(SIML,DBF_INLINK) {
 		prompt("Sim Mode Location")
-		promptgroup(GUI_MBB)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SIMM,DBF_MENU) {
@@ -471,7 +471,7 @@ recordtype(mbbi) {
 	}
 	field(SIMS,DBF_MENU) {
 		prompt("Sim mode Alarm Svrty")
-		promptgroup(GUI_MBB)
+		promptgroup("90 - Simulate")
 		interest(2)
 		menu(menuAlarmSevr)
 	}
diff --git a/src/std/rec/mbboDirectRecord.c b/src/std/rec/mbboDirectRecord.c
index ae43bdcf2..b98597149 100644
--- a/src/std/rec/mbboDirectRecord.c
+++ b/src/std/rec/mbboDirectRecord.c
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* mbboDirectRecord.c - Record Support for mbboDirect records */
 /*
  *      Original Author: Bob Dalesio
diff --git a/src/std/rec/mbboDirectRecord.dbd b/src/std/rec/mbboDirectRecord.dbd
index df2927de5..0b4285e32 100644
--- a/src/std/rec/mbboDirectRecord.dbd
+++ b/src/std/rec/mbboDirectRecord.dbd
@@ -10,13 +10,13 @@ recordtype(mbboDirect) {
     include "dbCommon.dbd" 
     field(VAL,DBF_USHORT) {
         prompt("Word")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("50 - Output")
         asl(ASL0)
         pp(TRUE)
     }
     field(OMSL,DBF_MENU) {
         prompt("Output Mode Select")
-        promptgroup(GUI_MBB)
+        promptgroup("50 - Output")
         special(SPC_RESET)
         pp(TRUE)
         interest(1)
@@ -24,128 +24,128 @@ recordtype(mbboDirect) {
     }
     field(NOBT,DBF_SHORT) {
         prompt("Number of Bits")
-        promptgroup(GUI_MBB)
+        promptgroup("50 - Output")
         special(SPC_NOMOD)
         interest(1)
     }
     field(DOL,DBF_INLINK) {
         prompt("Desired Output Loc")
-        promptgroup(GUI_MBB)
+        promptgroup("40 - Input")
         interest(1)
     }
     field(OUT,DBF_OUTLINK) {
         prompt("Output Specification")
-        promptgroup(GUI_MBB)
+        promptgroup("50 - Output")
         interest(1)
     }
     field(B0,DBF_UCHAR) {
         prompt("Bit 0")
-        promptgroup(GUI_BITS1)
+        promptgroup("51 - Output 0-7")
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
     }
     field(B1,DBF_UCHAR) {
         prompt("Bit 1")
-        promptgroup(GUI_BITS1)
+        promptgroup("51 - Output 0-7")
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
     }
     field(B2,DBF_UCHAR) {
         prompt("Bit 2")
-        promptgroup(GUI_BITS1)
+        promptgroup("51 - Output 0-7")
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
     }
     field(B3,DBF_UCHAR) {
         prompt("Bit 3")
-        promptgroup(GUI_BITS1)
+        promptgroup("51 - Output 0-7")
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
     }
     field(B4,DBF_UCHAR) {
         prompt("Bit 4")
-        promptgroup(GUI_BITS1)
+        promptgroup("51 - Output 0-7")
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
     }
     field(B5,DBF_UCHAR) {
         prompt("Bit 5")
-        promptgroup(GUI_BITS1)
+        promptgroup("51 - Output 0-7")
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
     }
     field(B6,DBF_UCHAR) {
         prompt("Bit 6")
-        promptgroup(GUI_BITS1)
+        promptgroup("51 - Output 0-7")
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
     }
     field(B7,DBF_UCHAR) {
         prompt("Bit 7")
-        promptgroup(GUI_BITS1)
+        promptgroup("51 - Output 0-7")
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
     }
     field(B8,DBF_UCHAR) {
         prompt("Bit 8")
-        promptgroup(GUI_BITS2)
+        promptgroup("52 - Output 9-F")
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
     }
     field(B9,DBF_UCHAR) {
         prompt("Bit 9")
-        promptgroup(GUI_BITS2)
+        promptgroup("52 - Output 9-F")
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
     }
     field(BA,DBF_UCHAR) {
         prompt("Bit 10")
-        promptgroup(GUI_BITS2)
+        promptgroup("52 - Output 9-F")
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
     }
     field(BB,DBF_UCHAR) {
         prompt("Bit 11")
-        promptgroup(GUI_BITS2)
+        promptgroup("52 - Output 9-F")
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
     }
     field(BC,DBF_UCHAR) {
         prompt("Bit 12")
-        promptgroup(GUI_BITS2)
+        promptgroup("52 - Output 9-F")
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
     }
     field(BD,DBF_UCHAR) {
         prompt("Bit 13")
-        promptgroup(GUI_BITS2)
+        promptgroup("52 - Output 9-F")
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
     }
     field(BE,DBF_UCHAR) {
         prompt("Bit 14")
-        promptgroup(GUI_BITS2)
+        promptgroup("52 - Output 9-F")
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
     }
     field(BF,DBF_UCHAR) {
         prompt("Bit 15")
-        promptgroup(GUI_BITS2)
+        promptgroup("52 - Output 9-F")
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -181,17 +181,17 @@ recordtype(mbboDirect) {
     }
     field(SHFT,DBF_ULONG) {
         prompt("Shift")
-        promptgroup(GUI_MBB)
+        promptgroup("50 - Output")
         interest(1)
     }
     field(SIOL,DBF_OUTLINK) {
         prompt("Sim Output Specifctn")
-        promptgroup(GUI_MBB)
+        promptgroup("90 - Simulate")
         interest(1)
     }
     field(SIML,DBF_INLINK) {
         prompt("Sim Mode Location")
-        promptgroup(GUI_MBB)
+        promptgroup("90 - Simulate")
         interest(1)
     }
     field(SIMM,DBF_MENU) {
@@ -201,19 +201,19 @@ recordtype(mbboDirect) {
     }
     field(SIMS,DBF_MENU) {
         prompt("Sim mode Alarm Svrty")
-        promptgroup(GUI_MBB)
+        promptgroup("90 - Simulate")
         interest(2)
         menu(menuAlarmSevr)
     }
     field(IVOA,DBF_MENU) {
         prompt("INVALID outpt action")
-        promptgroup(GUI_MBB)
+        promptgroup("50 - Output")
         interest(2)
         menu(menuIvoa)
     }
     field(IVOV,DBF_USHORT) {
         prompt("INVALID output value")
-        promptgroup(GUI_MBB)
+        promptgroup("50 - Output")
         interest(2)
     }
 }
diff --git a/src/std/rec/mbboRecord.c b/src/std/rec/mbboRecord.c
index ffb6f1eed..0ba0cbf67 100644
--- a/src/std/rec/mbboRecord.c
+++ b/src/std/rec/mbboRecord.c
@@ -8,8 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* mbboRecord.c - Record Support Routines for multi bit binary Output records */
 /*
  *      Original Author: Bob Dalesio
diff --git a/src/std/rec/mbboRecord.dbd b/src/std/rec/mbboRecord.dbd
index 1a32ad1cd..f841ba018 100644
--- a/src/std/rec/mbboRecord.dbd
+++ b/src/std/rec/mbboRecord.dbd
@@ -10,7 +10,7 @@ recordtype(mbbo) {
 	include "dbCommon.dbd" 
 	field(VAL,DBF_ENUM) {
 		prompt("Desired Value")
-                promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		special(SPC_DBADDR)
 		asl(ASL0)
 		pp(TRUE)
@@ -19,29 +19,29 @@ recordtype(mbbo) {
 	}
 	field(DOL,DBF_INLINK) {
 		prompt("Desired Output Loc")
-		promptgroup(GUI_MBB)
+		promptgroup("40 - Input")
 		interest(1)
 	}
 	field(OMSL,DBF_MENU) {
 		prompt("Output Mode Select")
-		promptgroup(GUI_MBB)
+		promptgroup("50 - Output")
 		interest(1)
 		menu(menuOmsl)
 	}
 	field(NOBT,DBF_USHORT) {
 		prompt("Number of Bits")
-		promptgroup(GUI_MBB)
+		promptgroup("50 - Output")
 		special(SPC_NOMOD)
 		interest(1)
 	}
 	field(OUT,DBF_OUTLINK) {
 		prompt("Output Specification")
-		promptgroup(GUI_MBB)
+		promptgroup("50 - Output")
 		interest(1)
 	}
 	field(ZRVL,DBF_ULONG) {
 		prompt("Zero Value")
-		promptgroup(GUI_BITS1)
+		promptgroup("51 - Output 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -49,7 +49,7 @@ recordtype(mbbo) {
 	}
 	field(ONVL,DBF_ULONG) {
 		prompt("One Value")
-		promptgroup(GUI_BITS1)
+		promptgroup("51 - Output 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -57,7 +57,7 @@ recordtype(mbbo) {
 	}
 	field(TWVL,DBF_ULONG) {
 		prompt("Two Value")
-		promptgroup(GUI_BITS1)
+		promptgroup("51 - Output 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -65,7 +65,7 @@ recordtype(mbbo) {
 	}
 	field(THVL,DBF_ULONG) {
 		prompt("Three Value")
-		promptgroup(GUI_BITS1)
+		promptgroup("51 - Output 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -73,7 +73,7 @@ recordtype(mbbo) {
 	}
 	field(FRVL,DBF_ULONG) {
 		prompt("Four Value")
-		promptgroup(GUI_BITS1)
+		promptgroup("51 - Output 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -81,7 +81,7 @@ recordtype(mbbo) {
 	}
 	field(FVVL,DBF_ULONG) {
 		prompt("Five Value")
-		promptgroup(GUI_BITS1)
+		promptgroup("51 - Output 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -89,7 +89,7 @@ recordtype(mbbo) {
 	}
 	field(SXVL,DBF_ULONG) {
 		prompt("Six Value")
-		promptgroup(GUI_BITS1)
+		promptgroup("51 - Output 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -97,7 +97,7 @@ recordtype(mbbo) {
 	}
 	field(SVVL,DBF_ULONG) {
 		prompt("Seven Value")
-		promptgroup(GUI_BITS1)
+		promptgroup("51 - Output 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -105,7 +105,7 @@ recordtype(mbbo) {
 	}
 	field(EIVL,DBF_ULONG) {
 		prompt("Eight Value")
-		promptgroup(GUI_BITS2)
+		promptgroup("52 - Output 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -113,7 +113,7 @@ recordtype(mbbo) {
 	}
 	field(NIVL,DBF_ULONG) {
 		prompt("Nine Value")
-		promptgroup(GUI_BITS2)
+		promptgroup("52 - Output 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -121,7 +121,7 @@ recordtype(mbbo) {
 	}
 	field(TEVL,DBF_ULONG) {
 		prompt("Ten Value")
-		promptgroup(GUI_BITS2)
+		promptgroup("52 - Output 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -129,7 +129,7 @@ recordtype(mbbo) {
 	}
 	field(ELVL,DBF_ULONG) {
 		prompt("Eleven Value")
-		promptgroup(GUI_BITS2)
+		promptgroup("52 - Output 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -137,7 +137,7 @@ recordtype(mbbo) {
 	}
 	field(TVVL,DBF_ULONG) {
 		prompt("Twelve Value")
-		promptgroup(GUI_BITS2)
+		promptgroup("52 - Output 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -145,7 +145,7 @@ recordtype(mbbo) {
 	}
 	field(TTVL,DBF_ULONG) {
 		prompt("Thirteen Value")
-		promptgroup(GUI_BITS2)
+		promptgroup("52 - Output 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -153,7 +153,7 @@ recordtype(mbbo) {
 	}
 	field(FTVL,DBF_ULONG) {
 		prompt("Fourteen Value")
-		promptgroup(GUI_BITS2)
+		promptgroup("52 - Output 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -161,7 +161,7 @@ recordtype(mbbo) {
 	}
 	field(FFVL,DBF_ULONG) {
 		prompt("Fifteen Value")
-		promptgroup(GUI_BITS2)
+		promptgroup("52 - Output 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		base(HEX)
@@ -169,7 +169,7 @@ recordtype(mbbo) {
 	}
 	field(ZRST,DBF_STRING) {
 		prompt("Zero String")
-		promptgroup(GUI_BITS1)
+		promptgroup("81 - Display 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -177,7 +177,7 @@ recordtype(mbbo) {
 	}
 	field(ONST,DBF_STRING) {
 		prompt("One String")
-		promptgroup(GUI_BITS1)
+		promptgroup("81 - Display 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -185,7 +185,7 @@ recordtype(mbbo) {
 	}
 	field(TWST,DBF_STRING) {
 		prompt("Two String")
-		promptgroup(GUI_BITS1)
+		promptgroup("81 - Display 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -193,7 +193,7 @@ recordtype(mbbo) {
 	}
 	field(THST,DBF_STRING) {
 		prompt("Three String")
-		promptgroup(GUI_BITS1)
+		promptgroup("81 - Display 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -201,7 +201,7 @@ recordtype(mbbo) {
 	}
 	field(FRST,DBF_STRING) {
 		prompt("Four String")
-		promptgroup(GUI_BITS1)
+		promptgroup("81 - Display 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -209,7 +209,7 @@ recordtype(mbbo) {
 	}
 	field(FVST,DBF_STRING) {
 		prompt("Five String")
-		promptgroup(GUI_BITS1)
+		promptgroup("81 - Display 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -217,7 +217,7 @@ recordtype(mbbo) {
 	}
 	field(SXST,DBF_STRING) {
 		prompt("Six String")
-		promptgroup(GUI_BITS1)
+		promptgroup("81 - Display 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -225,7 +225,7 @@ recordtype(mbbo) {
 	}
 	field(SVST,DBF_STRING) {
 		prompt("Seven String")
-		promptgroup(GUI_BITS1)
+		promptgroup("81 - Display 0-7")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -233,7 +233,7 @@ recordtype(mbbo) {
 	}
 	field(EIST,DBF_STRING) {
 		prompt("Eight String")
-		promptgroup(GUI_BITS2)
+		promptgroup("82 - Display 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -241,7 +241,7 @@ recordtype(mbbo) {
 	}
 	field(NIST,DBF_STRING) {
 		prompt("Nine String")
-		promptgroup(GUI_BITS2)
+		promptgroup("82 - Display 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -249,7 +249,7 @@ recordtype(mbbo) {
 	}
 	field(TEST,DBF_STRING) {
 		prompt("Ten String")
-		promptgroup(GUI_BITS2)
+		promptgroup("82 - Display 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -257,7 +257,7 @@ recordtype(mbbo) {
 	}
 	field(ELST,DBF_STRING) {
 		prompt("Eleven String")
-		promptgroup(GUI_BITS2)
+		promptgroup("82 - Display 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -265,7 +265,7 @@ recordtype(mbbo) {
 	}
 	field(TVST,DBF_STRING) {
 		prompt("Twelve String")
-		promptgroup(GUI_BITS2)
+		promptgroup("82 - Display 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -273,7 +273,7 @@ recordtype(mbbo) {
 	}
 	field(TTST,DBF_STRING) {
 		prompt("Thirteen String")
-		promptgroup(GUI_BITS2)
+		promptgroup("82 - Display 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -281,7 +281,7 @@ recordtype(mbbo) {
 	}
 	field(FTST,DBF_STRING) {
 		prompt("Fourteen String")
-		promptgroup(GUI_BITS2)
+		promptgroup("82 - Display 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -289,7 +289,7 @@ recordtype(mbbo) {
 	}
 	field(FFST,DBF_STRING) {
 		prompt("Fifteen String")
-		promptgroup(GUI_BITS2)
+		promptgroup("82 - Display 8-15")
 		special(SPC_MOD)
 		pp(TRUE)
 		interest(1)
@@ -297,126 +297,126 @@ recordtype(mbbo) {
 	}
 	field(ZRSV,DBF_MENU) {
 		prompt("State Zero Severity")
-		promptgroup(GUI_BITS1)
+		promptgroup("71 - Alarm 0-7")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(ONSV,DBF_MENU) {
 		prompt("State One Severity")
-		promptgroup(GUI_BITS1)
+		promptgroup("71 - Alarm 0-7")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(TWSV,DBF_MENU) {
 		prompt("State Two Severity")
-		promptgroup(GUI_BITS1)
+		promptgroup("71 - Alarm 0-7")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(THSV,DBF_MENU) {
 		prompt("State Three Severity")
-		promptgroup(GUI_BITS1)
+		promptgroup("71 - Alarm 0-7")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(FRSV,DBF_MENU) {
 		prompt("State Four Severity")
-		promptgroup(GUI_BITS1)
+		promptgroup("71 - Alarm 0-7")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(FVSV,DBF_MENU) {
 		prompt("State Five Severity")
-		promptgroup(GUI_BITS1)
+		promptgroup("71 - Alarm 0-7")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(SXSV,DBF_MENU) {
 		prompt("State Six Severity")
-		promptgroup(GUI_BITS1)
+		promptgroup("71 - Alarm 0-7")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(SVSV,DBF_MENU) {
 		prompt("State Seven Severity")
-		promptgroup(GUI_BITS1)
+		promptgroup("71 - Alarm 0-7")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(EISV,DBF_MENU) {
 		prompt("State Eight Severity")
-		promptgroup(GUI_BITS2)
+		promptgroup("72 - Alarm 8-15")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(NISV,DBF_MENU) {
 		prompt("State Nine Severity")
-		promptgroup(GUI_BITS2)
+		promptgroup("72 - Alarm 8-15")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(TESV,DBF_MENU) {
 		prompt("State Ten Severity")
-		promptgroup(GUI_BITS2)
+		promptgroup("72 - Alarm 8-15")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(ELSV,DBF_MENU) {
 		prompt("State Eleven Severity")
-		promptgroup(GUI_BITS2)
+		promptgroup("72 - Alarm 8-15")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(TVSV,DBF_MENU) {
 		prompt("State Twelve Severity")
-		promptgroup(GUI_BITS2)
+		promptgroup("72 - Alarm 8-15")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(TTSV,DBF_MENU) {
 		prompt("State Thirteen Sevr")
-		promptgroup(GUI_BITS2)
+		promptgroup("72 - Alarm 8-15")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(FTSV,DBF_MENU) {
 		prompt("State Fourteen Sevr")
-		promptgroup(GUI_BITS2)
+		promptgroup("72 - Alarm 8-15")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(FFSV,DBF_MENU) {
 		prompt("State Fifteen Sevr")
-		promptgroup(GUI_BITS2)
+		promptgroup("72 - Alarm 8-15")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(UNSV,DBF_MENU) {
 		prompt("Unknown State Sevr")
-		promptgroup(GUI_MBB)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(COSV,DBF_MENU) {
 		prompt("Change of State Sevr")
-		promptgroup(GUI_MBB)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
@@ -461,17 +461,17 @@ recordtype(mbbo) {
 	}
 	field(SHFT,DBF_USHORT) {
 		prompt("Shift")
-		promptgroup(GUI_MBB)
+		promptgroup("50 - Output")
 		interest(1)
 	}
 	field(SIOL,DBF_OUTLINK) {
 		prompt("Sim Output Specifctn")
-		promptgroup(GUI_MBB)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SIML,DBF_INLINK) {
 		prompt("Sim Mode Location")
-		promptgroup(GUI_MBB)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SIMM,DBF_MENU) {
@@ -481,19 +481,19 @@ recordtype(mbbo) {
 	}
 	field(SIMS,DBF_MENU) {
 		prompt("Sim mode Alarm Svrty")
-		promptgroup(GUI_MBB)
+		promptgroup("90 - Simulate")
 		interest(2)
 		menu(menuAlarmSevr)
 	}
 	field(IVOA,DBF_MENU) {
 		prompt("INVALID outpt action")
-		promptgroup(GUI_MBB)
+		promptgroup("50 - Output")
 		interest(2)
 		menu(menuIvoa)
 	}
 	field(IVOV,DBF_USHORT) {
 		prompt("INVALID output value")
-		promptgroup(GUI_MBB)
+		promptgroup("50 - Output")
 		interest(2)
 	}
 }
diff --git a/src/std/rec/permissiveRecord.c b/src/std/rec/permissiveRecord.c
index 65077253a..8242a1992 100644
--- a/src/std/rec/permissiveRecord.c
+++ b/src/std/rec/permissiveRecord.c
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* recPermissive.c - Record Support Routines for Permissive records */
 /*
  *      Original Author: Bob Dalesio
diff --git a/src/std/rec/permissiveRecord.dbd b/src/std/rec/permissiveRecord.dbd
index 6e999175f..7eb04bf95 100644
--- a/src/std/rec/permissiveRecord.dbd
+++ b/src/std/rec/permissiveRecord.dbd
@@ -3,21 +3,21 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 recordtype(permissive) {
 	include "dbCommon.dbd" 
 	field(LABL,DBF_STRING) {
 		prompt("Button Label")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		pp(TRUE)
 		interest(1)
 		size(20)
 	}
 	field(VAL,DBF_USHORT) {
 		prompt("Status")
+		promptgroup("40 - Input")
 		asl(ASL0)
 		pp(TRUE)
 	}
diff --git a/src/std/rec/printfRecord.dbd b/src/std/rec/printfRecord.dbd
index 37beccebf..4fd63ef3c 100644
--- a/src/std/rec/printfRecord.dbd
+++ b/src/std/rec/printfRecord.dbd
@@ -28,7 +28,7 @@ recordtype(printf) {
     }
     field(SIZV,DBF_USHORT) {
         prompt("Size of VAL buffer")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("30 - Action")
         special(SPC_NOMOD)
         interest(1)
         initial("41")
@@ -39,69 +39,69 @@ recordtype(printf) {
     }
     field(OUT,DBF_OUTLINK) {
         prompt("Output Specification")
-        promptgroup(GUI_OUTPUT)
+        promptgroup("50 - Output")
         interest(1)
     }
     field(FMT,DBF_STRING) {
         prompt("Format String")
-        promptgroup(GUI_CALC)
+        promptgroup("30 - Action")
         pp(TRUE)
         size(81)
     }
     field(IVLS,DBF_STRING) {
         prompt("Invalid Link String")
-        promptgroup(GUI_CALC)
+        promptgroup("30 - Action")
         size(16)
         initial("LNK")
     }
     field(INP0,DBF_INLINK) {
         prompt("Input 0")
-        promptgroup(GUI_INPUTS)
+        promptgroup("40 - Input")
         interest(1)
     }
     field(INP1,DBF_INLINK) {
         prompt("Input 1")
-        promptgroup(GUI_INPUTS)
+        promptgroup("40 - Input")
         interest(1)
     }
     field(INP2,DBF_INLINK) {
         prompt("Input 2")
-        promptgroup(GUI_INPUTS)
+        promptgroup("40 - Input")
         interest(1)
     }
     field(INP3,DBF_INLINK) {
         prompt("Input 3")
-        promptgroup(GUI_INPUTS)
+        promptgroup("40 - Input")
         interest(1)
     }
     field(INP4,DBF_INLINK) {
         prompt("Input 4")
-        promptgroup(GUI_INPUTS)
+        promptgroup("40 - Input")
         interest(1)
     }
     field(INP5,DBF_INLINK) {
         prompt("Input 5")
-        promptgroup(GUI_INPUTS)
+        promptgroup("40 - Input")
         interest(1)
     }
     field(INP6,DBF_INLINK) {
         prompt("Input 6")
-        promptgroup(GUI_INPUTS)
+        promptgroup("40 - Input")
         interest(1)
     }
     field(INP7,DBF_INLINK) {
         prompt("Input 7")
-        promptgroup(GUI_INPUTS)
+        promptgroup("40 - Input")
         interest(1)
     }
     field(INP8,DBF_INLINK) {
         prompt("Input 8")
-        promptgroup(GUI_INPUTS)
+        promptgroup("40 - Input")
         interest(1)
     }
     field(INP9,DBF_INLINK) {
         prompt("Input 9")
-        promptgroup(GUI_INPUTS)
+        promptgroup("40 - Input")
         interest(1)
     }
     %/* Number of INPx fields defined */
diff --git a/src/std/rec/selRecord.c b/src/std/rec/selRecord.c
index b9f385173..20dcf4a83 100644
--- a/src/std/rec/selRecord.c
+++ b/src/std/rec/selRecord.c
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* selRecord.c - Record Support Routines for Select records */
 /*
  *      Original Author: Bob Dalesio
diff --git a/src/std/rec/selRecord.dbd b/src/std/rec/selRecord.dbd
index 0d01586a0..724482704 100644
--- a/src/std/rec/selRecord.dbd
+++ b/src/std/rec/selRecord.dbd
@@ -3,9 +3,8 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 menu(selSELM) {
 	choice(selSELM_Specified,"Specified")
@@ -17,12 +16,13 @@ recordtype(sel) {
 	include "dbCommon.dbd" 
 	field(VAL,DBF_DOUBLE) {
 		prompt("Result")
+		promptgroup("40 - Input")
 		asl(ASL0)
 		special(SPC_NOMOD)
 	}
 	field(SELM,DBF_MENU) {
 		prompt("Select Mechanism")
-		promptgroup(GUI_INPUTS)
+		promptgroup("30 - Action")
 		menu(selSELM)
 	}
 	field(SELN,DBF_USHORT) {
@@ -30,124 +30,124 @@ recordtype(sel) {
 	}
 	field(PREC,DBF_SHORT) {
 		prompt("Display Precision")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 	}
 	field(NVL,DBF_INLINK) {
 		prompt("Index Value Location")
-		promptgroup(GUI_INPUTS)
+		promptgroup("30 - Action")
 		interest(1)
 	}
 	field(INPA,DBF_INLINK) {
 		prompt("Input A")
-		promptgroup(GUI_SELECT)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPB,DBF_INLINK) {
 		prompt("Input B")
-		promptgroup(GUI_SELECT)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPC,DBF_INLINK) {
 		prompt("Input C")
-		promptgroup(GUI_SELECT)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPD,DBF_INLINK) {
 		prompt("Input D")
-		promptgroup(GUI_SELECT)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPE,DBF_INLINK) {
 		prompt("Input E")
-		promptgroup(GUI_SELECT)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPF,DBF_INLINK) {
 		prompt("Input F")
-		promptgroup(GUI_SELECT)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPG,DBF_INLINK) {
 		prompt("Input G")
-		promptgroup(GUI_SELECT)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPH,DBF_INLINK) {
 		prompt("Input H")
-		promptgroup(GUI_SELECT)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPI,DBF_INLINK) {
 		prompt("Input I")
-		promptgroup(GUI_SELECT)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPJ,DBF_INLINK) {
 		prompt("Input J")
-		promptgroup(GUI_SELECT)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPK,DBF_INLINK) {
 		prompt("Input K")
-		promptgroup(GUI_SELECT)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPL,DBF_INLINK) {
 		prompt("Input L")
-		promptgroup(GUI_SELECT)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(EGU,DBF_STRING) {
-		prompt("Units Name")
-		promptgroup(GUI_DISPLAY)
+		prompt("Engineering Units")
+		promptgroup("80 - Display")
 		interest(1)
 		size(16)
 		prop(YES)
 	}
 	field(HOPR,DBF_DOUBLE) {
 		prompt("High Operating Rng")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(LOPR,DBF_DOUBLE) {
 		prompt("Low Operating Range")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(HIHI,DBF_DOUBLE) {
 		prompt("Hihi Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(LOLO,DBF_DOUBLE) {
 		prompt("Lolo Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(HIGH,DBF_DOUBLE) {
 		prompt("High Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(LOW,DBF_DOUBLE) {
 		prompt("Low Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(HHSV,DBF_MENU) {
 		prompt("Hihi Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
@@ -155,7 +155,7 @@ recordtype(sel) {
 	}
 	field(LLSV,DBF_MENU) {
 		prompt("Lolo Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
@@ -163,7 +163,7 @@ recordtype(sel) {
 	}
 	field(HSV,DBF_MENU) {
 		prompt("High Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
@@ -171,7 +171,7 @@ recordtype(sel) {
 	}
 	field(LSV,DBF_MENU) {
 		prompt("Low Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
@@ -179,17 +179,17 @@ recordtype(sel) {
 	}
 	field(HYST,DBF_DOUBLE) {
 		prompt("Alarm Deadband")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		interest(1)
 	}
 	field(ADEL,DBF_DOUBLE) {
 		prompt("Archive Deadband")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 	}
 	field(MDEL,DBF_DOUBLE) {
 		prompt("Monitor Deadband")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 	}
 	field(A,DBF_DOUBLE) {
diff --git a/src/std/rec/seqRecord.c b/src/std/rec/seqRecord.c
index 5986f827c..13d1cba1f 100644
--- a/src/std/rec/seqRecord.c
+++ b/src/std/rec/seqRecord.c
@@ -8,8 +8,6 @@
 \*************************************************************************/
  
 /*
- * $Revision-Id$
- *
  *      Author:	John Winans
  *      Date:	09-21-92
  */
diff --git a/src/std/rec/seqRecord.dbd b/src/std/rec/seqRecord.dbd
index 3ef3d3ef9..c40d17c38 100644
--- a/src/std/rec/seqRecord.dbd
+++ b/src/std/rec/seqRecord.dbd
@@ -20,7 +20,7 @@ recordtype(seq) {
     }
     field(SELM,DBF_MENU) {
         prompt("Select Mechanism")
-        promptgroup(GUI_INPUTS)
+        promptgroup("30 - Action")
         interest(1)
         menu(seqSELM)
     }
@@ -31,7 +31,7 @@ recordtype(seq) {
     }
     field(SELL,DBF_INLINK) {
         prompt("Link Selection Loc")
-        promptgroup(GUI_INPUTS)
+        promptgroup("30 - Action")
         interest(1)
     }
     field(OFFS,DBF_SHORT) {
@@ -50,17 +50,17 @@ recordtype(seq) {
     }
     field(PREC,DBF_SHORT) {
         prompt("Display Precision")
-        promptgroup(GUI_DISPLAY)
+        promptgroup("80 - Display")
         interest(1)
     }
     field(DLY0,DBF_DOUBLE) {
         prompt("Delay 0")
-        promptgroup(GUI_SEQ1)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DOL0,DBF_INLINK) {
         prompt("Input link 0")
-        promptgroup(GUI_SEQ1)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DO0,DBF_DOUBLE) {
@@ -69,17 +69,17 @@ recordtype(seq) {
     }
     field(LNK0,DBF_OUTLINK) {
         prompt("Output Link 0")
-        promptgroup(GUI_SEQ1)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DLY1,DBF_DOUBLE) {
         prompt("Delay 1")
-        promptgroup(GUI_SEQ1)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DOL1,DBF_INLINK) {
         prompt("Input link1")
-        promptgroup(GUI_SEQ1)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DO1,DBF_DOUBLE) {
@@ -88,17 +88,17 @@ recordtype(seq) {
     }
     field(LNK1,DBF_OUTLINK) {
         prompt("Output Link 1")
-        promptgroup(GUI_SEQ1)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DLY2,DBF_DOUBLE) {
         prompt("Delay 2")
-        promptgroup(GUI_SEQ1)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DOL2,DBF_INLINK) {
         prompt("Input link 2")
-        promptgroup(GUI_SEQ1)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DO2,DBF_DOUBLE) {
@@ -107,17 +107,17 @@ recordtype(seq) {
     }
     field(LNK2,DBF_OUTLINK) {
         prompt("Output Link 2")
-        promptgroup(GUI_SEQ1)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DLY3,DBF_DOUBLE) {
         prompt("Delay 3")
-        promptgroup(GUI_SEQ1)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DOL3,DBF_INLINK) {
         prompt("Input link 3")
-        promptgroup(GUI_SEQ1)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DO3,DBF_DOUBLE) {
@@ -126,17 +126,17 @@ recordtype(seq) {
     }
     field(LNK3,DBF_OUTLINK) {
         prompt("Output Link 3")
-        promptgroup(GUI_SEQ1)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DLY4,DBF_DOUBLE) {
         prompt("Delay 4")
-        promptgroup(GUI_SEQ2)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DOL4,DBF_INLINK) {
         prompt("Input link 4")
-        promptgroup(GUI_SEQ2)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DO4,DBF_DOUBLE) {
@@ -145,17 +145,17 @@ recordtype(seq) {
     }
     field(LNK4,DBF_OUTLINK) {
         prompt("Output Link 4")
-        promptgroup(GUI_SEQ2)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DLY5,DBF_DOUBLE) {
         prompt("Delay 5")
-        promptgroup(GUI_SEQ2)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DOL5,DBF_INLINK) {
         prompt("Input link 5")
-        promptgroup(GUI_SEQ2)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DO5,DBF_DOUBLE) {
@@ -164,17 +164,17 @@ recordtype(seq) {
     }
     field(LNK5,DBF_OUTLINK) {
         prompt("Output Link 5")
-        promptgroup(GUI_SEQ2)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DLY6,DBF_DOUBLE) {
         prompt("Delay 6")
-        promptgroup(GUI_SEQ2)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DOL6,DBF_INLINK) {
         prompt("Input link 6")
-        promptgroup(GUI_SEQ2)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DO6,DBF_DOUBLE) {
@@ -183,17 +183,17 @@ recordtype(seq) {
     }
     field(LNK6,DBF_OUTLINK) {
         prompt("Output Link 6")
-        promptgroup(GUI_SEQ2)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DLY7,DBF_DOUBLE) {
         prompt("Delay 7")
-        promptgroup(GUI_SEQ3)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DOL7,DBF_INLINK) {
         prompt("Input link 7")
-        promptgroup(GUI_SEQ3)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DO7,DBF_DOUBLE) {
@@ -202,17 +202,17 @@ recordtype(seq) {
     }
     field(LNK7,DBF_OUTLINK) {
         prompt("Output Link 7")
-        promptgroup(GUI_SEQ3)
+        promptgroup("41 - Link 0-7")
         interest(1)
     }
     field(DLY8,DBF_DOUBLE) {
         prompt("Delay 8")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DOL8,DBF_INLINK) {
         prompt("Input link 8")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DO8,DBF_DOUBLE) {
@@ -221,17 +221,17 @@ recordtype(seq) {
     }
     field(LNK8,DBF_OUTLINK) {
         prompt("Output Link 8")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DLY9,DBF_DOUBLE) {
         prompt("Delay 9")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DOL9,DBF_INLINK) {
         prompt("Input link 9")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DO9,DBF_DOUBLE) {
@@ -240,17 +240,17 @@ recordtype(seq) {
     }
     field(LNK9,DBF_OUTLINK) {
         prompt("Output Link 9")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DLYA,DBF_DOUBLE) {
         prompt("Delay 10")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DOLA,DBF_INLINK) {
         prompt("Input link 10")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DOA,DBF_DOUBLE) {
@@ -259,17 +259,17 @@ recordtype(seq) {
     }
     field(LNKA,DBF_OUTLINK) {
         prompt("Output Link 10")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DLYB,DBF_DOUBLE) {
         prompt("Delay 11")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DOLB,DBF_INLINK) {
         prompt("Input link 11")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DOB,DBF_DOUBLE) {
@@ -278,17 +278,17 @@ recordtype(seq) {
     }
     field(LNKB,DBF_OUTLINK) {
         prompt("Output Link 11")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DLYC,DBF_DOUBLE) {
         prompt("Delay 12")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DOLC,DBF_INLINK) {
         prompt("Input link 12")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DOC,DBF_DOUBLE) {
@@ -297,17 +297,17 @@ recordtype(seq) {
     }
     field(LNKC,DBF_OUTLINK) {
         prompt("Output Link 12")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DLYD,DBF_DOUBLE) {
         prompt("Delay 13")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DOLD,DBF_INLINK) {
         prompt("Input link 13")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DOD,DBF_DOUBLE) {
@@ -316,17 +316,17 @@ recordtype(seq) {
     }
     field(LNKD,DBF_OUTLINK) {
         prompt("Output Link 13")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DLYE,DBF_DOUBLE) {
         prompt("Delay 14")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DOLE,DBF_INLINK) {
         prompt("Input link 14")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DOE,DBF_DOUBLE) {
@@ -335,17 +335,17 @@ recordtype(seq) {
     }
     field(LNKE,DBF_OUTLINK) {
         prompt("Output Link 14")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DLYF,DBF_DOUBLE) {
         prompt("Delay 15")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DOLF,DBF_INLINK) {
         prompt("Input link 15")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
     field(DOF,DBF_DOUBLE) {
@@ -354,7 +354,7 @@ recordtype(seq) {
     }
     field(LNKF,DBF_OUTLINK) {
         prompt("Output Link 15")
-        promptgroup(GUI_SEQ3)
+        promptgroup("42 - Link 8-F")
         interest(1)
     }
 }
diff --git a/src/std/rec/stateRecord.c b/src/std/rec/stateRecord.c
index b295ccbb7..a052b0728 100644
--- a/src/std/rec/stateRecord.c
+++ b/src/std/rec/stateRecord.c
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* recState.c - Record Support Routines for State records */
 /*
  *      Original Author: Bob Dalesio
diff --git a/src/std/rec/stateRecord.dbd b/src/std/rec/stateRecord.dbd
index c0a253e1c..6e43ddbba 100644
--- a/src/std/rec/stateRecord.dbd
+++ b/src/std/rec/stateRecord.dbd
@@ -3,15 +3,14 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 recordtype(state) {
 	include "dbCommon.dbd" 
 	field(VAL,DBF_STRING) {
 		prompt("Value")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("40 - Input")
 		asl(ASL0)
 		pp(TRUE)
 		size(20)
diff --git a/src/std/rec/stringinRecord.c b/src/std/rec/stringinRecord.c
index 02f454788..19f55866a 100644
--- a/src/std/rec/stringinRecord.c
+++ b/src/std/rec/stringinRecord.c
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* recStringin.c - Record Support Routines for Stringin records */
 /*
  *      Author: 	Janet Anderson
diff --git a/src/std/rec/stringinRecord.dbd b/src/std/rec/stringinRecord.dbd
index acafc8cf4..5b0b76813 100644
--- a/src/std/rec/stringinRecord.dbd
+++ b/src/std/rec/stringinRecord.dbd
@@ -3,9 +3,8 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 menu(stringinPOST) {
 	choice(stringinPOST_OnChange,"On Change")
@@ -15,7 +14,7 @@ recordtype(stringin) {
 	include "dbCommon.dbd" 
 	field(VAL,DBF_STRING) {
 		prompt("Current Value")
-		promptgroup(GUI_INPUTS)
+		promptgroup("40 - Input")
 		asl(ASL0)
 		pp(TRUE)
 		size(40)
@@ -28,24 +27,24 @@ recordtype(stringin) {
 	}
 	field(INP,DBF_INLINK) {
 		prompt("Input Specification")
-		promptgroup(GUI_INPUTS)
+		promptgroup("40 - Input")
 		interest(1)
 	}
 	field(MPST,DBF_MENU) {
 		prompt("Post Value Monitors")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		menu(stringinPOST)
 	}
 	field(APST,DBF_MENU) {
 		prompt("Post Archive Monitors")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		menu(stringinPOST)
 	}
 	field(SIOL,DBF_INLINK) {
 		prompt("Sim Input Specifctn")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SVAL,DBF_STRING) {
@@ -55,7 +54,7 @@ recordtype(stringin) {
 	}
 	field(SIML,DBF_INLINK) {
 		prompt("Sim Mode Location")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SIMM,DBF_MENU) {
@@ -65,7 +64,7 @@ recordtype(stringin) {
 	}
 	field(SIMS,DBF_MENU) {
 		prompt("Sim mode Alarm Svrty")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(2)
 		menu(menuAlarmSevr)
 	}
diff --git a/src/std/rec/stringoutRecord.c b/src/std/rec/stringoutRecord.c
index 1bd376176..ea9012911 100644
--- a/src/std/rec/stringoutRecord.c
+++ b/src/std/rec/stringoutRecord.c
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* recStringout.c - Record Support Routines for Stringout records */
 /*
  * Author: 	Janet Anderson
diff --git a/src/std/rec/stringoutRecord.dbd b/src/std/rec/stringoutRecord.dbd
index 25bd2fde9..fe0bae5d0 100644
--- a/src/std/rec/stringoutRecord.dbd
+++ b/src/std/rec/stringoutRecord.dbd
@@ -3,9 +3,8 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 menu(stringoutPOST) {
 	choice(stringoutPOST_OnChange,"On Change")
@@ -15,7 +14,7 @@ recordtype(stringout) {
 	include "dbCommon.dbd" 
 	field(VAL,DBF_STRING) {
 		prompt("Current Value")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		asl(ASL0)
 		pp(TRUE)
 		size(40)
@@ -28,40 +27,40 @@ recordtype(stringout) {
 	}
 	field(DOL,DBF_INLINK) {
 		prompt("Desired Output Loc")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("40 - Input")
 		interest(1)
 	}
 	field(OMSL,DBF_MENU) {
 		prompt("Output Mode Select")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(1)
 		menu(menuOmsl)
 	}
 	field(OUT,DBF_OUTLINK) {
 		prompt("Output Specification")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(1)
 	}
 	field(MPST,DBF_MENU) {
 		prompt("Post Value Monitors")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		menu(stringoutPOST)
 	}
 	field(APST,DBF_MENU) {
 		prompt("Post Archive Monitors")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		menu(stringoutPOST)
 	}
 	field(SIOL,DBF_OUTLINK) {
 		prompt("Sim Output Specifctn")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SIML,DBF_INLINK) {
 		prompt("Sim Mode Location")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SIMM,DBF_MENU) {
@@ -71,19 +70,19 @@ recordtype(stringout) {
 	}
 	field(SIMS,DBF_MENU) {
 		prompt("Sim mode Alarm Svrty")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(2)
 		menu(menuAlarmSevr)
 	}
 	field(IVOA,DBF_MENU) {
 		prompt("INVALID output action")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(2)
 		menu(menuIvoa)
 	}
 	field(IVOV,DBF_STRING) {
 		prompt("INVALID output value")
-		promptgroup(GUI_OUTPUT)
+		promptgroup("50 - Output")
 		interest(2)
 		size(40)
 	}
diff --git a/src/std/rec/subArrayRecord.c b/src/std/rec/subArrayRecord.c
index dd6d50a9c..197750b81 100644
--- a/src/std/rec/subArrayRecord.c
+++ b/src/std/rec/subArrayRecord.c
@@ -5,8 +5,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* recSubArray.c - Record Support Routines for SubArray records 
  *
  *
diff --git a/src/std/rec/subArrayRecord.dbd b/src/std/rec/subArrayRecord.dbd
index 4a0bfe0c6..7814a2e48 100644
--- a/src/std/rec/subArrayRecord.dbd
+++ b/src/std/rec/subArrayRecord.dbd
@@ -3,9 +3,8 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 recordtype(subArray) {
 	include "dbCommon.dbd" 
@@ -21,57 +20,57 @@ recordtype(subArray) {
 	}
 	field(PREC,DBF_SHORT) {
 		prompt("Display Precision")
-		promptgroup(GUI_COMMON)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(FTVL,DBF_MENU) {
 		prompt("Field Type of Value")
-		promptgroup(GUI_ALARMS)
+		promptgroup("30 - Action")
 		special(SPC_NOMOD)
 		interest(1)
 		menu(menuFtype)
 	}
 	field(INP,DBF_INLINK) {
 		prompt("Input Specification")
-		promptgroup(GUI_BITS1)
+		promptgroup("40 - Input")
 		interest(1)
 	}
 	field(EGU,DBF_STRING) {
-		prompt("Engineering Units Name")
-		promptgroup(GUI_BITS2)
+		prompt("Engineering Units")
+		promptgroup("80 - Display")
 		interest(1)
 		size(16)
 		prop(YES)
 	}
 	field(HOPR,DBF_DOUBLE) {
 		prompt("High Operating Range")
-		promptgroup(GUI_CALC)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(LOPR,DBF_DOUBLE) {
 		prompt("Low Operating Range")
-		promptgroup(GUI_CLOCK)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(MALM,DBF_ULONG) {
-		prompt("Maximum Elements  ")
-		promptgroup(GUI_CLOCK)
+		prompt("Maximum Elements")
+		promptgroup("30 - Action")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(NELM,DBF_ULONG) {
 		prompt("Number of Elements")
-		promptgroup(GUI_COMPRESS)
+		promptgroup("30 - Action")
 		pp(TRUE)
 		initial("1")
 	}
 	field(INDX,DBF_ULONG) {
 		prompt("Substring Index")
-		promptgroup(GUI_CONVERT)
+		promptgroup("30 - Action")
 		pp(TRUE)
 	}
 	field(BUSY,DBF_SHORT) {
diff --git a/src/std/rec/subRecord.c b/src/std/rec/subRecord.c
index f8808a849..50a5049b9 100644
--- a/src/std/rec/subRecord.c
+++ b/src/std/rec/subRecord.c
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* Record Support Routines for Subroutine records */
 /*
  *      Original Author: Bob Dalesio
diff --git a/src/std/rec/subRecord.dbd b/src/std/rec/subRecord.dbd
index 973cab7f1..48cfc1385 100644
--- a/src/std/rec/subRecord.dbd
+++ b/src/std/rec/subRecord.dbd
@@ -15,14 +15,14 @@ recordtype(sub) {
 	}
 	field(INAM,DBF_STRING) {
 		prompt("Init Routine Name")
-		promptgroup(GUI_SUB)
+		promptgroup("30 - Action")
 		special(SPC_NOMOD)
 		interest(1)
 		size(40)
 	}
 	field(SNAM,DBF_STRING) {
 		prompt("Subroutine Name")
-		promptgroup(GUI_SUB)
+		promptgroup("30 - Action")
 		special(SPC_MOD)
 		interest(1)
 		size(40)
@@ -37,127 +37,127 @@ recordtype(sub) {
 	}
 	field(INPA,DBF_INLINK) {
 		prompt("Input A")
-		promptgroup(GUI_INPUTS)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPB,DBF_INLINK) {
 		prompt("Input B")
-		promptgroup(GUI_INPUTS)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPC,DBF_INLINK) {
 		prompt("Input C")
-		promptgroup(GUI_INPUTS)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPD,DBF_INLINK) {
 		prompt("Input D")
-		promptgroup(GUI_INPUTS)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPE,DBF_INLINK) {
 		prompt("Input E")
-		promptgroup(GUI_INPUTS)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPF,DBF_INLINK) {
 		prompt("Input F")
-		promptgroup(GUI_INPUTS)
+		promptgroup("41 - Input A-F")
 		interest(1)
 	}
 	field(INPG,DBF_INLINK) {
 		prompt("Input G")
-		promptgroup(GUI_INPUTS)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPH,DBF_INLINK) {
 		prompt("Input H")
-		promptgroup(GUI_INPUTS)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPI,DBF_INLINK) {
 		prompt("Input I")
-		promptgroup(GUI_INPUTS)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPJ,DBF_INLINK) {
 		prompt("Input J")
-		promptgroup(GUI_INPUTS)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPK,DBF_INLINK) {
 		prompt("Input K")
-		promptgroup(GUI_INPUTS)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(INPL,DBF_INLINK) {
 		prompt("Input L")
-		promptgroup(GUI_INPUTS)
+		promptgroup("42 - Input G-L")
 		interest(1)
 	}
 	field(EGU,DBF_STRING) {
-		prompt("Units Name")
-		promptgroup(GUI_DISPLAY)
+		prompt("Engineering Units")
+		promptgroup("80 - Display")
 		interest(1)
 		size(16)
 		prop(YES)
 	}
 	field(HOPR,DBF_DOUBLE) {
-		prompt("High Operating Rng")
-		promptgroup(GUI_DISPLAY)
+		prompt("High Operating Range")
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(LOPR,DBF_DOUBLE) {
 		prompt("Low Operating Range")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(HIHI,DBF_DOUBLE) {
 		prompt("Hihi Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(LOLO,DBF_DOUBLE) {
 		prompt("Lolo Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(HIGH,DBF_DOUBLE) {
 		prompt("High Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(LOW,DBF_DOUBLE) {
 		prompt("Low Alarm Limit")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
 	}
 	field(PREC,DBF_SHORT) {
 		prompt("Display Precision")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(BRSV,DBF_MENU) {
 		prompt("Bad Return Severity")
-		promptgroup(GUI_SUB)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(HHSV,DBF_MENU) {
 		prompt("Hihi Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
@@ -165,7 +165,7 @@ recordtype(sub) {
 	}
 	field(LLSV,DBF_MENU) {
 		prompt("Lolo Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
@@ -173,7 +173,7 @@ recordtype(sub) {
 	}
 	field(HSV,DBF_MENU) {
 		prompt("High Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
@@ -181,7 +181,7 @@ recordtype(sub) {
 	}
 	field(LSV,DBF_MENU) {
 		prompt("Low Severity")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		prop(YES)
@@ -189,17 +189,17 @@ recordtype(sub) {
 	}
 	field(HYST,DBF_DOUBLE) {
 		prompt("Alarm Deadband")
-		promptgroup(GUI_ALARMS)
+		promptgroup("70 - Alarm")
 		interest(1)
 	}
 	field(ADEL,DBF_DOUBLE) {
 		prompt("Archive Deadband")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 	}
 	field(MDEL,DBF_DOUBLE) {
 		prompt("Monitor Deadband")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 	}
 	field(A,DBF_DOUBLE) {
diff --git a/src/std/rec/test/Makefile b/src/std/rec/test/Makefile
index 110d141a8..793312f9a 100644
--- a/src/std/rec/test/Makefile
+++ b/src/std/rec/test/Makefile
@@ -68,6 +68,14 @@ testHarness_SRCS += analogMonitorTest_registerRecordDeviceDriver.cpp
 TESTFILES += $(COMMON_DIR)/analogMonitorTest.dbd ../analogMonitorTest.db
 TESTS += analogMonitorTest
 
+TARGETS += $(COMMON_DIR)/regressTest.dbd
+regressTest_DBD += base.dbd
+TESTPROD_HOST += regressTest
+regressTest_SRCS += regressTest.c
+regressTest_SRCS += regressTest_registerRecordDeviceDriver.cpp
+TESTFILES += $(COMMON_DIR)/regressTest.dbd ../regressArray1.db
+TESTS += regressTest
+
 # epicsRunRecordTests runs all the test programs in a known working order.
 testHarness_SRCS += epicsRunRecordTests.c
 
diff --git a/src/std/rec/test/regressArray1.db b/src/std/rec/test/regressArray1.db
new file mode 100644
index 000000000..a09f3bfba
--- /dev/null
+++ b/src/std/rec/test/regressArray1.db
@@ -0,0 +1,9 @@
+record(waveform, "wf") {
+  field(FTVL, "DOUBLE")
+  field(NELM, "1")
+  field(FLNK, "co")
+}
+record(calcout, "co") {
+  field(CALC, "A")
+  field(INPA, "wf")
+}
diff --git a/src/std/rec/test/regressTest.c b/src/std/rec/test/regressTest.c
new file mode 100644
index 000000000..ccbe53189
--- /dev/null
+++ b/src/std/rec/test/regressTest.c
@@ -0,0 +1,73 @@
+/*************************************************************************\
+* Copyright (c) 2016 Michael Davidsaver
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
+ \*************************************************************************/
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+/*
+ * Test the some identified regressions
+ */
+
+void regressTest_registerRecordDeviceDriver(struct dbBase *);
+
+/*
+ * https://bugs.launchpad.net/epics-base/+bug/1577108
+ */
+static
+void testArrayLength1(void)
+{
+    waveformRecord *precwf;
+    calcoutRecord  *precco;
+    double *pbuf;
+
+    testdbPrepare();
+
+    testdbReadDatabase("regressTest.dbd", NULL, NULL);
+
+    regressTest_registerRecordDeviceDriver(pdbbase);
+
+    testdbReadDatabase("regressArray1.db", NULL, NULL);
+
+    precwf = (waveformRecord*)testdbRecordPtr("wf");
+    precco = (calcoutRecord*)testdbRecordPtr("co");
+
+    eltc(0);
+    testIocInitOk();
+    eltc(1);
+
+    dbScanLock((dbCommon*)precwf);
+    pbuf = (double*)precwf->bptr;
+    dbScanUnlock((dbCommon*)precwf);
+
+    testdbPutFieldOk("wf", DBF_DOUBLE, 2.0);
+
+    dbScanLock((dbCommon*)precwf);
+    testOk(precwf->nord==1, "wf.NORD = %u == 1", (unsigned)precwf->nord);
+    testOk(pbuf[0]==2.0, "wf.VAL[0] = %f == 2.0", pbuf[0]);
+    dbScanUnlock((dbCommon*)precwf);
+
+    dbScanLock((dbCommon*)precco);
+    testOk(precco->a==2.0, "co.A = %f == 2.0", precco->a);
+    dbScanUnlock((dbCommon*)precco);
+
+    testdbGetFieldEqual("co", DBF_DOUBLE, 2.0);
+
+    testIocShutdownOk();
+
+    testdbCleanup();
+}
+
+MAIN(regressTest)
+{
+    testPlan(5);
+    testArrayLength1();
+    return testDone();
+}
diff --git a/src/std/rec/waveformRecord.c b/src/std/rec/waveformRecord.c
index 293be79af..ab00a39fd 100644
--- a/src/std/rec/waveformRecord.c
+++ b/src/std/rec/waveformRecord.c
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* recWaveform.c - Record Support Routines for Waveform records */
 /*
  *      Original Author: Bob Dalesio
diff --git a/src/std/rec/waveformRecord.dbd.pod b/src/std/rec/waveformRecord.dbd.pod
index d28302801..db2fa05fb 100644
--- a/src/std/rec/waveformRecord.dbd.pod
+++ b/src/std/rec/waveformRecord.dbd.pod
@@ -56,50 +56,50 @@ recordtype(waveform) {
 	}
 	field(RARM,DBF_SHORT) {
 		prompt("Rearm the waveform")
-		promptgroup(GUI_WAVE)
+		promptgroup("30 - Action")
 		pp(TRUE)
 		interest(1)
 	}
 	field(PREC,DBF_SHORT) {
 		prompt("Display Precision")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(INP,DBF_INLINK) {
 		prompt("Input Specification")
-		promptgroup(GUI_INPUTS)
+		promptgroup("40 - Input")
 		interest(1)
 	}
 	field(EGU,DBF_STRING) {
-		prompt("Engineering Units Name")
-		promptgroup(GUI_DISPLAY)
+		prompt("Engineering Units")
+		promptgroup("80 - Display")
 		interest(1)
 		size(16)
 		prop(YES)
 	}
 	field(HOPR,DBF_DOUBLE) {
 		prompt("High Operating Range")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(LOPR,DBF_DOUBLE) {
 		prompt("Low Operating Range")
-		promptgroup(GUI_DISPLAY)
+		promptgroup("80 - Display")
 		interest(1)
 		prop(YES)
 	}
 	field(NELM,DBF_ULONG) {
 		prompt("Number of Elements")
-		promptgroup(GUI_WAVE)
+		promptgroup("30 - Action")
 		special(SPC_NOMOD)
 		interest(1)
 		initial("1")
 	}
 	field(FTVL,DBF_MENU) {
 		prompt("Field Type of Value")
-		promptgroup(GUI_WAVE)
+		promptgroup("30 - Action")
 		special(SPC_NOMOD)
 		interest(1)
 		menu(menuFtype)
@@ -120,12 +120,12 @@ recordtype(waveform) {
 	}
 	field(SIOL,DBF_INLINK) {
 		prompt("Sim Input Specifctn")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SIML,DBF_INLINK) {
 		prompt("Sim Mode Location")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(1)
 	}
 	field(SIMM,DBF_MENU) {
@@ -135,22 +135,22 @@ recordtype(waveform) {
 	}
 	field(SIMS,DBF_MENU) {
 		prompt("Sim mode Alarm Svrty")
-		promptgroup(GUI_INPUTS)
+		promptgroup("90 - Simulate")
 		interest(2)
 		menu(menuAlarmSevr)
 	}
 	field(MPST,DBF_MENU) {
-                prompt("Post Value Monitors")
-                promptgroup(GUI_DISPLAY)
-                interest(1)
-                menu(waveformPOST)
+		prompt("Post Value Monitors")
+		promptgroup("80 - Display")
+		interest(1)
+		menu(waveformPOST)
 	}
 	field(APST,DBF_MENU) {
-                prompt("Post Archive Monitors")
-                promptgroup(GUI_DISPLAY)
-                interest(1)
-                menu(waveformPOST)
-        }
+		prompt("Post Archive Monitors")
+		promptgroup("80 - Display")
+		interest(1)
+		menu(waveformPOST)
+	}
 	field(HASH,DBF_ULONG) {
 		prompt("Hash of OnChange data.")
 		interest(3)
diff --git a/src/std/softIoc/base.dbd b/src/std/softIoc/base.dbd
index 5c5632550..46fc57690 100644
--- a/src/std/softIoc/base.dbd
+++ b/src/std/softIoc/base.dbd
@@ -1,5 +1,3 @@
-# $Revision-Id$
-#
 # This file includes the standard record types and device support
 # provided by Base and (usually) loaded into all IOCs.
 
diff --git a/src/std/softIoc/softIocExit.db b/src/std/softIoc/softIocExit.db
index b5c027d70..c530f778a 100644
--- a/src/std/softIoc/softIocExit.db
+++ b/src/std/softIoc/softIocExit.db
@@ -1,7 +1,15 @@
-# $Revision-Id$
-#
+# softIocExit.db
+
 record(sub,"$(IOC):exit") {
-	field(DESC,"Exit subroutine")
-	field(SCAN,"Passive")
-	field(SNAM,"exit")
+    field(DESC,"Exit subroutine")
+    field(SCAN,"Passive")
+    field(SNAM,"exit")
+}
+
+record(stringin,"$(IOC):BaseVersion") {
+    field(DESC,"EPICS Base Version")
+    field(DTYP,"getenv")
+    field(INP,"@EPICS_VERSION_FULL")
+    field(PINI,"YES")
+    field(DISP,1)
 }
diff --git a/src/std/softIoc/softMain.cpp b/src/std/softIoc/softMain.cpp
index 13ecce884..8400a6554 100644
--- a/src/std/softIoc/softMain.cpp
+++ b/src/std/softIoc/softMain.cpp
@@ -7,8 +7,6 @@
 * found in the file LICENSE that is included with this distribution.
 \*************************************************************************/
 
-/* $Revision-Id$ */
-
 /* Author: Andrew Johnson	Date: 2003-04-08 */
 
 /* Usage:
diff --git a/src/template/base/makeBaseApp.pl b/src/template/base/makeBaseApp.pl
index 65091a0fb..d6da8adf8 100644
--- a/src/template/base/makeBaseApp.pl
+++ b/src/template/base/makeBaseApp.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/env perl
 
 # Authors: Ralph Lange, Marty Kraimer, Andrew Johnson and Janet Anderson
-# $Revision-Id$
 
 use FindBin qw($Bin);
 use lib ("$Bin/../../lib/perl", $Bin);
@@ -419,7 +418,8 @@ EOF
 }
 
 sub GetUser {
-    $user = $opt_u || $ENV{USER} || $ENV{USERNAME} || Win32::LoginName();
+    $user = $opt_u || $ENV{USER} || $ENV{USERNAME} || getlogin();
+    $user = Win32::LoginName() if !$user && $^ eq 'MSWin32';
 
     unless ($user) {
 	print "Strange, I cannot figure out your user name!\n";
diff --git a/src/template/base/top/caServerApp/vxEntry.cc b/src/template/base/top/caServerApp/vxEntry.cc
index 14984fe19..1cb240723 100644
--- a/src/template/base/top/caServerApp/vxEntry.cc
+++ b/src/template/base/top/caServerApp/vxEntry.cc
@@ -8,10 +8,8 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 //
-// $Revision-Id$
 // Author: Jeff HIll (LANL)
 //
-//
 
 #include 
 #include 
diff --git a/src/template/base/top/configure/RELEASE b/src/template/base/top/configure/RELEASE
index 84074fe15..ba28bcb26 100644
--- a/src/template/base/top/configure/RELEASE
+++ b/src/template/base/top/configure/RELEASE
@@ -14,19 +14,24 @@
 #  RELEASE.Common.$(T_A)
 #  RELEASE.$(EPICS_HOST_ARCH).$(T_A)
 #
-# This file should ONLY define paths to other support modules,
-# or include statements that pull in similar RELEASE files.
-# Build settings that are NOT module paths should appear in a
-# CONFIG_SITE file.
+# This file is parsed by both GNUmake and an EPICS Perl script,
+# so it can ONLY contain definititions of paths to other support
+# modules, variable definitions that are used in module paths,
+# and include statements that pull in other RELEASE files.
+# Variables may be used before their values have been set.
+# Build variables that are NOT used in paths should be set in
+# the CONFIG_SITE file.
 
-TEMPLATE_TOP=_TEMPLATE_TOP_
+# Variables and paths to dependent modules:
+#MODULES = /path/to/modules
+#MYMODULE = $(MODULES)/my-module
 
 # If using the sequencer, point SNCSEQ at its top directory:
-#SNCSEQ=$(EPICS_BASE)/../modules/soft/seq
+#SNCSEQ = $(MODULES)/seq-ver
 
-# EPICS_BASE usually appears last so other apps can override stuff:
-EPICS_BASE=_EPICS_BASE_
+# EPICS_BASE should appear last so earlier modules can override stuff:
+EPICS_BASE = _EPICS_BASE_
 
-# Set RULES here if you want to take build rules from somewhere
+# Set RULES here if you want to use build rules from somewhere
 # other than EPICS_BASE:
-#RULES=/path/to/epics/support/module/rules/x-y
+#RULES = $(MODULES)/build-rules
diff --git a/src/template/base/top/exampleApp/src/Makefile b/src/template/base/top/exampleApp/src/Makefile
index 024726e24..d319437ad 100644
--- a/src/template/base/top/exampleApp/src/Makefile
+++ b/src/template/base/top/exampleApp/src/Makefile
@@ -54,9 +54,6 @@ _APPNAME__SRCS += _APPNAME__registerRecordDeviceDriver.cpp
 _APPNAME__SRCS_DEFAULT += _APPNAME_Main.cpp
 _APPNAME__SRCS_vxWorks += -nil-
 
-# Add support from base/src/vxWorks if needed
-#_APPNAME__OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
-
 # Link in the code from our support library
 _APPNAME__LIBS += _APPNAME_Support
 
@@ -66,6 +63,7 @@ ifneq ($(SNCSEQ),)
     # Build sncExample into _APPNAME_Support
     sncExample_SNCFLAGS += +r
     _APPNAME__DBD += sncExample.dbd
+    # A .stt sequence program is *not* pre-processed:
     _APPNAME_Support_SRCS += sncExample.stt
     _APPNAME_Support_LIBS += seq pv
     _APPNAME__LIBS += seq pv
@@ -73,6 +71,7 @@ ifneq ($(SNCSEQ),)
     # Build sncProgram as a standalone program
     PROD_HOST += sncProgram
     sncProgram_SNCFLAGS += +m
+    # A .st sequence program *is* pre-processed:
     sncProgram_SRCS += sncProgram.st
     sncProgram_LIBS += seq pv
     sncProgram_LIBS += $(EPICS_BASE_HOST_LIBS)
diff --git a/src/template/base/top/exampleApp/src/xxxRecord.dbd b/src/template/base/top/exampleApp/src/xxxRecord.dbd
index 4a71c5409..12c1d6202 100644
--- a/src/template/base/top/exampleApp/src/xxxRecord.dbd
+++ b/src/template/base/top/exampleApp/src/xxxRecord.dbd
@@ -2,101 +2,102 @@ recordtype(xxx) {
 	include "dbCommon.dbd" 
 	field(VAL,DBF_DOUBLE) {
 		prompt("Current EGU Value")
-		asl(ASL0)
+                promptgroup("40 - Input")
+                asl(ASL0)
 		pp(TRUE)
 	}
 	field(INP,DBF_INLINK) {
 		prompt("Input Specification")
-		promptgroup(GUI_INPUTS)
+                promptgroup("40 - Input")
 		special(SPC_NOMOD)
 		interest(1)
 	}
 	field(PREC,DBF_SHORT) {
 		prompt("Display Precision")
-		promptgroup(GUI_DISPLAY)
+                promptgroup("80 - Display")
 		interest(1)
 	}
 	field(EGU,DBF_STRING) {
 		prompt("Engineering Units")
-		promptgroup(GUI_DISPLAY)
+                promptgroup("80 - Display")
 		interest(1)
 		size(16)
 	}
 	field(HOPR,DBF_FLOAT) {
 		prompt("High Operating Range")
-		promptgroup(GUI_DISPLAY)
+                promptgroup("80 - Display")
 		interest(1)
 	}
 	field(LOPR,DBF_FLOAT) {
 		prompt("Low Operating Range")
-		promptgroup(GUI_DISPLAY)
+                promptgroup("80 - Display")
 		interest(1)
 	}
 	field(HIHI,DBF_FLOAT) {
 		prompt("Hihi Alarm Limit")
-		promptgroup(GUI_ALARMS)
+                promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 	}
 	field(LOLO,DBF_FLOAT) {
 		prompt("Lolo Alarm Limit")
-		promptgroup(GUI_ALARMS)
+                promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 	}
 	field(HIGH,DBF_FLOAT) {
 		prompt("High Alarm Limit")
-		promptgroup(GUI_ALARMS)
+                promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 	}
 	field(LOW,DBF_FLOAT) {
 		prompt("Low Alarm Limit")
-		promptgroup(GUI_ALARMS)
+                promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 	}
 	field(HHSV,DBF_MENU) {
 		prompt("Hihi Severity")
-		promptgroup(GUI_ALARMS)
+                promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(LLSV,DBF_MENU) {
 		prompt("Lolo Severity")
-		promptgroup(GUI_ALARMS)
+                promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(HSV,DBF_MENU) {
 		prompt("High Severity")
-		promptgroup(GUI_ALARMS)
+                promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(LSV,DBF_MENU) {
 		prompt("Low Severity")
-		promptgroup(GUI_ALARMS)
+                promptgroup("70 - Alarm")
 		pp(TRUE)
 		interest(1)
 		menu(menuAlarmSevr)
 	}
 	field(HYST,DBF_DOUBLE) {
 		prompt("Alarm Deadband")
-		promptgroup(GUI_ALARMS)
+                promptgroup("70 - Alarm")
 		interest(1)
 	}
 	field(ADEL,DBF_DOUBLE) {
 		prompt("Archive Deadband")
-		promptgroup(GUI_DISPLAY)
+                promptgroup("80 - Display")
 		interest(1)
 	}
 	field(MDEL,DBF_DOUBLE) {
 		prompt("Monitor Deadband")
-		promptgroup(GUI_DISPLAY)
+                promptgroup("80 - Display")
 		interest(1)
 	}
 	field(LALM,DBF_DOUBLE) {
diff --git a/src/template/base/top/exampleBoot/ioc/Makefile@Common b/src/template/base/top/exampleBoot/ioc/Makefile@Common
index 64a3e8bf7..e064d7344 100644
--- a/src/template/base/top/exampleBoot/ioc/Makefile@Common
+++ b/src/template/base/top/exampleBoot/ioc/Makefile@Common
@@ -1,5 +1,4 @@
 TOP = ../..
 include $(TOP)/configure/CONFIG
-ARCH = _ARCH_
 TARGETS = envPaths
 include $(TOP)/configure/RULES.ioc
diff --git a/src/template/base/top/iocBoot/ioc/Makefile@Common b/src/template/base/top/iocBoot/ioc/Makefile@Common
index 64a3e8bf7..e064d7344 100644
--- a/src/template/base/top/iocBoot/ioc/Makefile@Common
+++ b/src/template/base/top/iocBoot/ioc/Makefile@Common
@@ -1,5 +1,4 @@
 TOP = ../..
 include $(TOP)/configure/CONFIG
-ARCH = _ARCH_
 TARGETS = envPaths
 include $(TOP)/configure/RULES.ioc
diff --git a/src/template/ext/makeBaseExt.pl b/src/template/ext/makeBaseExt.pl
index c4185ad53..a3bf895d8 100644
--- a/src/template/ext/makeBaseExt.pl
+++ b/src/template/ext/makeBaseExt.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/env perl
 
 # Authors: Ralph Lange, Marty Kraimer, Andrew Johnson and Janet Anderson
-# $Revision-Id$
 
 use Cwd;
 use Getopt::Std;
diff --git a/src/template/ext/top/Makefile b/src/template/ext/top/Makefile
index 053bc6ab8..91e678167 100644
--- a/src/template/ext/top/Makefile
+++ b/src/template/ext/top/Makefile
@@ -1,4 +1,4 @@
-# $Revision-Id$
+# Makefile at the top of an extensions tree
 
 TOP = .
 include $(TOP)/configure/CONFIG
diff --git a/src/template/ext/top/configure/Makefile b/src/template/ext/top/configure/Makefile
index 956ca1f05..6e6609842 100644
--- a/src/template/ext/top/configure/Makefile
+++ b/src/template/ext/top/configure/Makefile
@@ -1,4 +1,4 @@
-# $Revision-Id$
+# Makefile in extensions/configure directory
 
 TOP=..
 
diff --git a/src/template/ext/top/configure/RULES b/src/template/ext/top/configure/RULES
index 87f23cc85..7592a37c6 100644
--- a/src/template/ext/top/configure/RULES
+++ b/src/template/ext/top/configure/RULES
@@ -1,4 +1,4 @@
-# $Revision-Id$
+# extensions/configure/RULES
 
 include $(CONFIG)/RULES
 -include $(TOP)/configure/RULES_PYTHON
diff --git a/src/template/ext/top/configure/RULES_DIRS b/src/template/ext/top/configure/RULES_DIRS
index b3ee47beb..dd6904367 100644
--- a/src/template/ext/top/configure/RULES_DIRS
+++ b/src/template/ext/top/configure/RULES_DIRS
@@ -1,3 +1,3 @@
-# $Revision-Id$
+# extensions/configure/RULES_DIRS
 
 include $(CONFIG)/RULES_DIRS
diff --git a/src/template/ext/top/configure/RULES_IDL b/src/template/ext/top/configure/RULES_IDL
index c48eb8db5..3610bcc21 100644
--- a/src/template/ext/top/configure/RULES_IDL
+++ b/src/template/ext/top/configure/RULES_IDL
@@ -1,4 +1,4 @@
-# $Revision-Id$
+# extensions/configure/RULES_IDL
 
 ifdef T_A
 ifeq ($(findstring Host,$(VALID_BUILDS)),Host)
diff --git a/src/template/ext/top/configure/RULES_JAVA b/src/template/ext/top/configure/RULES_JAVA
index 0285c7cd5..b6ffa3f0f 100644
--- a/src/template/ext/top/configure/RULES_JAVA
+++ b/src/template/ext/top/configure/RULES_JAVA
@@ -7,8 +7,6 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Revision-Id$
-#
 
 
 ifeq ($(BUILD_CLASS),HOST)
diff --git a/src/template/ext/top/configure/RULES_PYTHON b/src/template/ext/top/configure/RULES_PYTHON
index 41bdc9e65..49dffa02b 100644
--- a/src/template/ext/top/configure/RULES_PYTHON
+++ b/src/template/ext/top/configure/RULES_PYTHON
@@ -1,4 +1,4 @@
-# $Revision-Id$
+# extensions/configure/RULES_PYTHON
 
 ifdef T_A
 ifeq ($(findstring Host,$(VALID_BUILDS)),Host)
diff --git a/src/template/ext/top/configure/RULES_TOP b/src/template/ext/top/configure/RULES_TOP
index b3b5c8d2f..1f81d3d39 100644
--- a/src/template/ext/top/configure/RULES_TOP
+++ b/src/template/ext/top/configure/RULES_TOP
@@ -1,4 +1,4 @@
-# $Revision-Id$
+# extensions/configure/RULES_TOP
 
 include $(CONFIG)/RULES_TOP
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.Common.Common b/src/template/ext/top/configure/os/CONFIG_SITE.Common.Common
index e6ea50981..21363a633 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.Common.Common
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.Common.Common
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.aix-ppc-gnu.aix-ppc-gnu b/src/template/ext/top/configure/os/CONFIG_SITE.aix-ppc-gnu.aix-ppc-gnu
index aa02c0941..19d65aead 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.aix-ppc-gnu.aix-ppc-gnu
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.aix-ppc-gnu.aix-ppc-gnu
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.aix-ppc.aix-ppc b/src/template/ext/top/configure/os/CONFIG_SITE.aix-ppc.aix-ppc
index d3ace4e2a..3f40e0b37 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.aix-ppc.aix-ppc
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.aix-ppc.aix-ppc
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86 b/src/template/ext/top/configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86
index 948b39afe..f1745159b 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.darwin-ppc.darwin-ppc b/src/template/ext/top/configure/os/CONFIG_SITE.darwin-ppc.darwin-ppc
index d546a6f3a..d8fb7c158 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.darwin-ppc.darwin-ppc
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.darwin-ppc.darwin-ppc
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.darwin-ppcx86.darwin-ppcx86 b/src/template/ext/top/configure/os/CONFIG_SITE.darwin-ppcx86.darwin-ppcx86
index e4c0927bd..6e31ffdb4 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.darwin-ppcx86.darwin-ppcx86
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.darwin-ppcx86.darwin-ppcx86
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.darwin-x86.darwin-x86 b/src/template/ext/top/configure/os/CONFIG_SITE.darwin-x86.darwin-x86
index 522510666..9e98c70ef 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.darwin-x86.darwin-x86
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.darwin-x86.darwin-x86
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.freebsd-x86_64.freebsd-x86_64 b/src/template/ext/top/configure/os/CONFIG_SITE.freebsd-x86_64.freebsd-x86_64
index 300f2be27..c4d1d5670 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.freebsd-x86_64.freebsd-x86_64
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.freebsd-x86_64.freebsd-x86_64
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.linux-ppc.linux-ppc b/src/template/ext/top/configure/os/CONFIG_SITE.linux-ppc.linux-ppc
index bd4ed29c2..4d78b29d7 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.linux-ppc.linux-ppc
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.linux-ppc.linux-ppc
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86-debug.linux-x86-debug b/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86-debug.linux-x86-debug
index bd4ed29c2..4d78b29d7 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86-debug.linux-x86-debug
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86-debug.linux-x86-debug
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86.linux-athlon b/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86.linux-athlon
index aa78c9f65..25036ccac 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86.linux-athlon
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86.linux-athlon
@@ -1,6 +1,3 @@
-
-#
-# $Revision-Id$
 #
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86.linux-x86 b/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86.linux-x86
index b24d14bdd..8641a9d27 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86.linux-x86
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86.linux-x86
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug b/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug
index bd4ed29c2..4d78b29d7 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64 b/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64
index d2ab00e9d..8d1386636 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc-debug.solaris-sparc-debug b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc-debug.solaris-sparc-debug
index d2e6e2627..b0b61ce0a 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc-debug.solaris-sparc-debug
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc-debug.solaris-sparc-debug
@@ -1,6 +1,3 @@
-
-#
-# $Revision-Id$
 #
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc-gnu.solaris-sparc-gnu b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc-gnu.solaris-sparc-gnu
index db0be679f..b0b61ce0a 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc-gnu.solaris-sparc-gnu
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc-gnu.solaris-sparc-gnu
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc.solaris-sparc b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc.solaris-sparc
index 23d2ffb3e..bd113bea3 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc.solaris-sparc
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc.solaris-sparc
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc64-gnu.solaris-sparc64-gnu b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc64-gnu.solaris-sparc64-gnu
index 8de3cfde9..e8b88e0de 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc64-gnu.solaris-sparc64-gnu
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc64-gnu.solaris-sparc64-gnu
@@ -1,6 +1,3 @@
-
-#
-# $Revision-Id$
 #
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc64.solaris-sparc64 b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc64.solaris-sparc64
index 2d4e3a497..87628e74e 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc64.solaris-sparc64
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc64.solaris-sparc64
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86-debug.solaris-x86-debug b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86-debug.solaris-x86-debug
index 78dd969b6..2c322fcfa 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86-debug.solaris-x86-debug
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86-debug.solaris-x86-debug
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86-gnu.solaris-x86-gnu b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86-gnu.solaris-x86-gnu
index 808b367f0..bf9746289 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86-gnu.solaris-x86-gnu
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86-gnu.solaris-x86-gnu
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86.solaris-x86 b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86.solaris-x86
index 7260652b4..299dc0834 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86.solaris-x86
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86.solaris-x86
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86_64.solaris-x86_64 b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86_64.solaris-x86_64
index a85e513f2..9ac039a5b 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86_64.solaris-x86_64
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86_64.solaris-x86_64
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin b/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin
index 97416906c..f6ca56942 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin
@@ -1,6 +1,3 @@
-
-#
-# $Revision-Id$
 #
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-debug.win32-x86-debug b/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-debug.win32-x86-debug
index 74e929e9e..ebc1b8238 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-debug.win32-x86-debug
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-debug.win32-x86-debug
@@ -1,6 +1,3 @@
-
-#
-# $Revision-Id$
 #
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-mingw.win32-x86-mingw b/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-mingw.win32-x86-mingw
index 97416906c..f6ca56942 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-mingw.win32-x86-mingw
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-mingw.win32-x86-mingw
@@ -1,6 +1,3 @@
-
-#
-# $Revision-Id$
 #
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.windows-x64.windows-x64 b/src/template/ext/top/configure/os/CONFIG_SITE.windows-x64.windows-x64
index 641ba4291..68a0c149a 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.windows-x64.windows-x64
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.windows-x64.windows-x64
@@ -1,6 +1,4 @@
 #
-# $Revision-Id$
-#
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
diff --git a/src/template/ext/top/src/Makefile b/src/template/ext/top/src/Makefile
index 4b367d431..d672087ca 100644
--- a/src/template/ext/top/src/Makefile
+++ b/src/template/ext/top/src/Makefile
@@ -1,5 +1,3 @@
-# $Revision-Id$
-
 TOP = ..
 include $(TOP)/configure/CONFIG
 
diff --git a/src/tools/DBD/Base.pm b/src/tools/DBD/Base.pm
index e258e650a..0751c68fd 100644
--- a/src/tools/DBD/Base.pm
+++ b/src/tools/DBD/Base.pm
@@ -12,7 +12,7 @@ our @ISA = qw(Exporter);
 
 our @EXPORT = qw(&pushContext &popContext &dieContext &warnContext &is_reserved
     &escapeCcomment &escapeCstring $RXident $RXname $RXuint $RXint $RXhex $RXoct
-    $RXuintx $RXintx $RXnum $RXdqs $RXsqs $RXstr);
+    $RXuintx $RXintx $RXnum $RXdqs $RXstr);
 
 
 our $RXident = qr/ [a-zA-Z] [a-zA-Z0-9_]* /x;
@@ -25,8 +25,7 @@ our $RXuintx = qr/ ( $RXhex | $RXoct | $RXuint ) /ox;
 our $RXintx =  qr/ ( $RXhex | $RXoct | $RXint ) /ox;
 our $RXnum =   qr/ -? (?: \d+ | \d* \. \d+ ) (?: [eE] [-+]? \d+ )? /x;
 our $RXdqs =   qr/ " (?: [^"] | \\" )* " /x;
-our $RXsqs =   qr/ ' (?: [^'] | \\' )* ' /x;
-our $RXstr =   qr/ ( $RXname | $RXnum | $RXdqs | $RXsqs ) /ox;
+our $RXstr =   qr/ ( $RXname | $RXnum | $RXdqs ) /ox;
 
 our @context;
 
diff --git a/src/tools/DBD/Menu.pm b/src/tools/DBD/Menu.pm
index 244234f20..e5521ed49 100644
--- a/src/tools/DBD/Menu.pm
+++ b/src/tools/DBD/Menu.pm
@@ -60,10 +60,11 @@ sub toDeclaration {
     my @choices = map {
         sprintf "    %-31s /* %s */", @{$_}[0], escapeCcomment(@{$_}[1]);
     } $this->choices;
+    my $num = scalar @choices;
     return "typedef enum {\n" .
                join(",\n", @choices) .
-           ",\n    ${name}_NUM_CHOICES\n" .
-           "} $name;\n\n";
+           "\n} $name;\n" .
+           "#define ${name}_NUM_CHOICES $num\n\n";
 }
 
 sub toDefinition {
diff --git a/src/tools/DBD/Recfield.pm b/src/tools/DBD/Recfield.pm
index d38a081fa..73a98123c 100644
--- a/src/tools/DBD/Recfield.pm
+++ b/src/tools/DBD/Recfield.pm
@@ -27,7 +27,7 @@ our %field_types = (
 our %field_attrs = (
     asl         => qr/^ASL[01]$/,
     initial     => qr/^.*$/,
-    promptgroup => qr/^GUI_\w+$/,
+    promptgroup => qr/^.*$/,
     prompt      => qr/^.*$/,
     special     => qr/^(?:SPC_\w+|\d{3,})$/,
     pp          => qr/^(?:TRUE|FALSE)$/,
@@ -39,6 +39,35 @@ our %field_attrs = (
     prop        => qr/^(?:YES|NO)$/
 );
 
+# Convert old promptgroups into new-style
+my %promptgroupMap = (
+    GUI_COMMON   => '10 - Common',
+    GUI_ALARMS   => '70 - Alarm',
+    GUI_BITS1    => '41 - Bits (1)',
+    GUI_BITS2    => '42 - Bits (2)',
+    GUI_CALC     => '30 - Action',
+    GUI_CLOCK    => '30 - Action',
+    GUI_COMPRESS => '30 - Action',
+    GUI_CONVERT  => '60 - Convert',
+    GUI_DISPLAY  => '80 - Display',
+    GUI_HIST     => '30 - Action',
+    GUI_INPUTS   => '40 - Input',
+    GUI_LINKS    => '40 - Link',
+    GUI_MBB      => '30 - Action',
+    GUI_MOTOR    => '30 - Action',
+    GUI_OUTPUT   => '50 - Output',
+    GUI_PID      => '30 - Action',
+    GUI_PULSE    => '30 - Action',
+    GUI_SELECT   => '40 - Input',
+    GUI_SEQ1     => '51 - Output (1)',
+    GUI_SEQ2     => '52 - Output (2)',
+    GUI_SEQ3     => '53 - Output (3)',
+    GUI_SUB      => '30 - Action',
+    GUI_TIMER    => '30 - Action',
+    GUI_WAVE     => '30 - Action',
+    GUI_SCAN     => '20 - Scan',
+);
+
 sub new {
     my ($class, $name, $type) = @_;
     dieContext("Illegal field type '$type', valid field types are:",
@@ -74,6 +103,8 @@ sub number {
 
 sub add_attribute {
     my ($this, $attr, $value) = @_;
+    $value = $promptgroupMap{$value}
+        if $attr eq 'promptgroup' && exists $promptgroupMap{$value};
     my $match = $field_attrs{$attr};
     if (defined $match) {
         dieContext("Bad value '$value' for field attribute '$attr'")
diff --git a/src/tools/EPICS/Copy.pm b/src/tools/EPICS/Copy.pm
index 59cc17fa8..d61800e0e 100644
--- a/src/tools/EPICS/Copy.pm
+++ b/src/tools/EPICS/Copy.pm
@@ -5,8 +5,6 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# $Revision-Id$
-
 use Carp;
 
 # Copy directories and files from a template
diff --git a/src/tools/EPICS/Path.pm b/src/tools/EPICS/Path.pm
index 4ddbbc59e..b86c88007 100644
--- a/src/tools/EPICS/Path.pm
+++ b/src/tools/EPICS/Path.pm
@@ -5,8 +5,6 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# $Revision-Id$
-
 package EPICS::Path;
 require 5.000;
 require Exporter;
diff --git a/src/tools/EPICS/Readfile.pm b/src/tools/EPICS/Readfile.pm
index 1b6cab21d..4358a6ad2 100644
--- a/src/tools/EPICS/Readfile.pm
+++ b/src/tools/EPICS/Readfile.pm
@@ -5,8 +5,6 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# $Id$
-
 package EPICS::Readfile;
 require 5.000;
 require Exporter;
diff --git a/src/tools/EPICS/Release.pm b/src/tools/EPICS/Release.pm
index 577444dc4..e2c4a6826 100644
--- a/src/tools/EPICS/Release.pm
+++ b/src/tools/EPICS/Release.pm
@@ -5,8 +5,6 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# $Revision-Id$
-
 use Carp;
 
 #
diff --git a/src/tools/EPICS/macLib.pm b/src/tools/EPICS/macLib.pm
index 9ae40314e..412c6d709 100644
--- a/src/tools/EPICS/macLib.pm
+++ b/src/tools/EPICS/macLib.pm
@@ -5,8 +5,6 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# $Id$
-
 package EPICS::macLib::entry;
 
 sub new ($$) {
diff --git a/src/tools/assembleSnippets.pl b/src/tools/assembleSnippets.pl
index 52291efe8..e6f0c77a3 100644
--- a/src/tools/assembleSnippets.pl
+++ b/src/tools/assembleSnippets.pl
@@ -5,8 +5,6 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# $Id$
-
 use strict;
 use warnings;
 
diff --git a/src/tools/convertRelease.pl b/src/tools/convertRelease.pl
index 9a425c954..919e3a54d 100644
--- a/src/tools/convertRelease.pl
+++ b/src/tools/convertRelease.pl
@@ -8,8 +8,6 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
-# $Revision-Id$
-#
 # Convert configure/RELEASE file(s) into something else.
 #
 
@@ -77,7 +75,7 @@ my @apps   = ('TOP');   # Records the order of definitions in RELEASE file
 my $relfile = "$top/configure/RELEASE";
 die "Can't find $relfile" unless (-f $relfile);
 readReleaseFiles($relfile, \%macros, \@apps, $arch);
-expandRelease(\%macros, \@apps);
+expandRelease(\%macros);
 
 
 # This is a perl switch statement:
@@ -136,6 +134,7 @@ sub relPaths {
 }
 
 sub binDirs {
+    die "Architecture not set (use -a option)\n" unless ($arch);
     my @includes = grep !m/^ (RULES | TEMPLATE_TOP) $/x, @apps;
     my @path;
     foreach my $app (@includes) {
@@ -167,7 +166,6 @@ sub cdCommands {
     my $ioc = $cwd;
     $ioc =~ s/^.*\///;  # iocname is last component of directory name
     
-    print OUT "putenv(\"ARCH=$arch\")\n";
     print OUT "putenv(\"IOC=$ioc\")\n";
     
     foreach my $app (@includes) {
@@ -190,7 +188,6 @@ sub cdCommands {
 # Include parentheses anyway in case CEXP users want to use this.
 #
 sub envPaths {
-    die "Architecture not set (use -a option)" unless ($arch);
     my @includes = grep !m/^ (RULES | TEMPLATE_TOP) $/x, @apps;
     
     unlink($outfile);
@@ -199,7 +196,6 @@ sub envPaths {
     my $ioc = $cwd;
     $ioc =~ s/^.*\///;  # iocname is last component of directory name
     
-    print OUT "epicsEnvSet(\"ARCH\",\"$arch\")\n";
     print OUT "epicsEnvSet(\"IOC\",\"$ioc\")\n";
     
     foreach my $app (@includes) {
@@ -219,13 +215,13 @@ sub checkRelease {
     delete $macros{RULES};
     delete $macros{TOP};
     delete $macros{TEMPLATE_TOP};
-    
+
     while (my ($app, $path) = each %macros) {
         my %check = (TOP => $path);
         my @order = ();
         my $relfile = "$path/configure/RELEASE";
         readReleaseFiles($relfile, \%check, \@order, $arch);
-        expandRelease(\%check, \@order);
+        expandRelease(\%check);
         delete $check{TOP};
         delete $check{EPICS_HOST_ARCH};
         
@@ -242,7 +238,35 @@ sub checkRelease {
             }
         }
     }
-    print "\n" if ($status);
+
+    my @modules = grep(!m/^(RULES|TOP|TEMPLATE_TOP)$/, @apps);
+    my $app = shift @modules;
+    my $latest = AbsPath($macros{$app});
+    my %paths = ($latest => $app);
+    foreach $app (@modules) {
+        my $path = AbsPath($macros{$app});
+        if ($path ne $latest && exists $paths{$path}) {
+            my $prev = $paths{$path};
+            print "\n" unless ($status);
+            print "This application's RELEASE file(s) define\n";
+            print "\t$app = $macros{$app}\n";
+            print "after but not adjacent to\n\t$prev = $macros{$prev}\n";
+            print "both of which resolve to $path\n"
+                if $path ne $macros{$app} || $path ne $macros{$prev};
+            $status = 2;
+        }
+        $paths{$path} = $app;
+        $latest = $path;
+    }
+    if ($status == 2) {
+        print "Module definitions that share paths must be grouped together.\n";
+        print "Either remove a definition, or move it to a line immediately\n";
+        print "above or below the other(s).\n";
+        print "Any non-module definitions belong in configure/CONFIG_SITE.\n";
+        $status = 1;
+    }
+
+    print "\n" if $status;
     exit $status;
 }
 
diff --git a/src/tools/cvsclean.pl b/src/tools/cvsclean.pl
index b1398fda5..8dac418d7 100644
--- a/src/tools/cvsclean.pl
+++ b/src/tools/cvsclean.pl
@@ -8,8 +8,6 @@
 # in the file LICENSE that is included with this distribution. 
 #*************************************************************************
 
-# $Revision-Id$
-#
 # Find and delete cvs .#* and editor backup *~
 # files from all dirs of the directory tree.
 
diff --git a/src/tools/dbdExpand.pl b/src/tools/dbdExpand.pl
index f111bd98d..71f938418 100644
--- a/src/tools/dbdExpand.pl
+++ b/src/tools/dbdExpand.pl
@@ -7,8 +7,6 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# $Id$
-
 use strict;
 
 use FindBin qw($Bin);
@@ -30,6 +28,8 @@ my @path = map { split /[:;]/ } @opt_I; # FIXME: Broken on Win32?
 my $macros = EPICS::macLib->new(@opt_S);
 my $dbd = DBD->new();
 
+$macros->suppressWarning(1);
+
 # Calculate filename for the dependency warning message below
 my $dep = $opt_o;
 my $dot_d = '';
diff --git a/src/tools/dbdReport.pl b/src/tools/dbdReport.pl
index a90a9c9c0..876ec0abb 100644
--- a/src/tools/dbdReport.pl
+++ b/src/tools/dbdReport.pl
@@ -7,8 +7,6 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# $Id$
-
 use FindBin qw($Bin);
 use lib "$Bin/../../lib/perl";
 
diff --git a/src/tools/dbdToHtml.pl b/src/tools/dbdToHtml.pl
index 25064ce6e..2c0417cbb 100644
--- a/src/tools/dbdToHtml.pl
+++ b/src/tools/dbdToHtml.pl
@@ -6,8 +6,6 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# $Id$
-
 use strict;
 
 use FindBin qw($Bin);
diff --git a/src/tools/dbdToMenuH.pl b/src/tools/dbdToMenuH.pl
index e1d640c16..eaa236902 100644
--- a/src/tools/dbdToMenuH.pl
+++ b/src/tools/dbdToMenuH.pl
@@ -7,8 +7,6 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# $Id$
-
 use FindBin qw($Bin);
 use lib "$Bin/../../lib/perl";
 
diff --git a/src/tools/dbdToRecordtypeH.pl b/src/tools/dbdToRecordtypeH.pl
index 0516a58bf..ccf6b21b2 100644
--- a/src/tools/dbdToRecordtypeH.pl
+++ b/src/tools/dbdToRecordtypeH.pl
@@ -7,8 +7,6 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# $Id$
-
 use FindBin qw($Bin);
 use lib "$Bin/../../lib/perl";
 
diff --git a/src/tools/dos2unix.pl b/src/tools/dos2unix.pl
index 4940fd5f2..35163ac1f 100644
--- a/src/tools/dos2unix.pl
+++ b/src/tools/dos2unix.pl
@@ -10,7 +10,6 @@
 #*************************************************************************
 
 # Converts text file in DOS CR/LF format to unix ISO format
-#  $Revision-Id$
 
 @files=@ARGV;
 
diff --git a/src/tools/expandVars.pl b/src/tools/expandVars.pl
index c61bfbf6e..01e65fb3a 100644
--- a/src/tools/expandVars.pl
+++ b/src/tools/expandVars.pl
@@ -6,8 +6,6 @@
 # Author: Andrew Johnson 
 # Date: 10 February 2005
 #
-# $Revision-Id$
-#
 
 use strict;
 
diff --git a/src/tools/fullPathName.pl b/src/tools/fullPathName.pl
index 0b1bdc0dd..c8ac49a12 100644
--- a/src/tools/fullPathName.pl
+++ b/src/tools/fullPathName.pl
@@ -6,8 +6,6 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# $Revision-Id$
-
 # Determines an absolute pathname for its argument,
 # which may be either a relative or absolute path and
 # might have trailing directory names that don't exist yet.
diff --git a/src/tools/makeIncludeDbd.pl b/src/tools/makeIncludeDbd.pl
index 4b0a25b84..f4ab8be3d 100644
--- a/src/tools/makeIncludeDbd.pl
+++ b/src/tools/makeIncludeDbd.pl
@@ -5,8 +5,6 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-#
-# $Revision-Id$
 
 use strict;
 use File::Basename;
diff --git a/src/tools/munch.pl b/src/tools/munch.pl
index 2aee71344..f62b579ad 100644
--- a/src/tools/munch.pl
+++ b/src/tools/munch.pl
@@ -8,8 +8,6 @@
 # in the file LICENSE that is included with this distribution. 
 #*************************************************************************
 
-#  $Revision-Id$
-
 use strict;
 use warnings;
 
diff --git a/src/tools/podRemove.pl b/src/tools/podRemove.pl
index 66f09e308..14fbf58f0 100644
--- a/src/tools/podRemove.pl
+++ b/src/tools/podRemove.pl
@@ -6,8 +6,6 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# $Revision-Id$
-
 use strict;
 use warnings;
 
diff --git a/src/tools/podToHtml.pl b/src/tools/podToHtml.pl
index e950f6c6e..81716ae37 100644
--- a/src/tools/podToHtml.pl
+++ b/src/tools/podToHtml.pl
@@ -6,8 +6,6 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# $Revision-Id$
-
 use strict;
 use warnings;
 
diff --git a/src/tools/test/Menu.plt b/src/tools/test/Menu.plt
index 97305b8a9..8c5540f6a 100644
--- a/src/tools/test/Menu.plt
+++ b/src/tools/test/Menu.plt
@@ -25,8 +25,9 @@ ok !$menu->legal_choice('Choice 3'), 'Third choice not legal';
 is_deeply $menu->choice(2), undef, 'Third choice undefined';
 
 like $menu->toDeclaration, qr/ ^
-    \s* typedef \s+ enum \s+ {
-    \s+     ch1 \s+ \/\* [^*]* \*\/,
-    \s+     ch2 \s+ \/\* [^*]* \*\/,
-    \s+     test_NUM_CHOICES ,?
-    \s+ } \s+ test; \s* $ /x, 'C declaration';
+    \s* typedef \s+ enum \s+ \{ \s* \n
+    \s*     ch1 \s+ \/\* [^*]* \*\/, \s* \n
+    \s*     ch2 \s+ \/\* [^*]* \*\/ \s* \n
+    \s* \} \s* test \s* ; \s* \n
+    \s* \# \s* define \s+ test_NUM_CHOICES \s+ 2 \s* \n
+    \s* $ /x, 'C declaration';
diff --git a/startup/EpicsHostArch.pl b/startup/EpicsHostArch.pl
index e6babf6d3..09f7ffddd 100755
--- a/startup/EpicsHostArch.pl
+++ b/startup/EpicsHostArch.pl
@@ -9,7 +9,6 @@ eval 'exec perl -S $0 ${1+"$@"}'  # -*- Mode: perl -*-
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# $Revision-Id$
 # Returns the Epics host architecture suitable
 # for assigning to the EPICS_HOST_ARCH variable
 
diff --git a/startup/cygwin.bat b/startup/cygwin.bat
index 2d3a1567e..ff75b5335 100755
--- a/startup/cygwin.bat
+++ b/startup/cygwin.bat
@@ -8,7 +8,6 @@ REM  EPICS BASE Versions 3.13.7
 REM  and higher are distributed subject to a Software License Agreement found
 REM  in file LICENSE that is included with this distribution.
 REM *************************************************************************
-REM  $Revision-Id$
 REM
 REM  Site-specific EPICS environment settings
 REM 
diff --git a/startup/win32.bat b/startup/win32.bat
index 5c0448fe8..af9155dd7 100755
--- a/startup/win32.bat
+++ b/startup/win32.bat
@@ -8,7 +8,6 @@ REM  EPICS BASE Versions 3.13.7
 REM  and higher are distributed subject to a Software License Agreement found
 REM  in file LICENSE that is included with this distribution.
 REM *************************************************************************
-REM  $Revision-Id$
 REM
 REM  Site-specific EPICS environment settings
 REM