Merge branch '7.0' into PSI-7.0

modules/ca/src/template/top/caClientApp/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2003 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP=..
 
 include $(TOP)/configure/CONFIG

modules/ca/src/template/top/caClientApp/caExample.c

@@ -1,3 +1,7 @@
+/* SPDX-FileCopyrightText: 1998 Argonne National Laboratory */
+
+/* SPDX-License-Identifier: EPICS */
+
 /*caExample.c*/
 #include <stddef.h>
 #include <stdlib.h>

modules/ca/src/template/top/caClientApp/caMonitor.c

@@ -1,3 +1,7 @@
+/* SPDX-FileCopyrightText: 2000 Argonne National Laboratory */
+
+/* SPDX-License-Identifier: EPICS */
+
 /*caMonitor.c*/
 
 /* This example accepts the name of a file containing a list of pvs to monitor.

modules/ca/src/template/top/caPerlApp/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2018 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP=..
 
 include $(TOP)/configure/CONFIG

modules/ca/src/template/top/caPerlApp/caget.pl

@@ -1,5 +1,9 @@
 #!/usr/bin/env perl
 
+# SPDX-FileCopyrightText: 2008 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 use strict;
 
 # This construct sets @INC to search lib/perl of all RELEASE entries

modules/ca/src/template/top/caPerlApp/cainfo.pl

@@ -1,5 +1,9 @@
 #!/usr/bin/env perl
 
+# SPDX-FileCopyrightText: 2008 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 use strict;
 
 # This construct sets @INC to search lib/perl of all RELEASE entries

modules/ca/src/template/top/caPerlApp/camonitor.pl

@@ -1,5 +1,9 @@
 #!/usr/bin/env perl
 
+# SPDX-FileCopyrightText: 2008 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 use strict;
 
 # This construct sets @INC to search lib/perl of all RELEASE entries

modules/ca/src/template/top/caPerlApp/caput.pl

@@ -1,5 +1,9 @@
 #!/usr/bin/env perl
 
+# SPDX-FileCopyrightText: 2008 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 use strict;
 
 # This construct sets @INC to search lib/perl of all RELEASE entries

modules/ca/src/tools/caget.c

@@ -343,6 +343,7 @@ static int caget (pv *pvs, int nPvs, RequestT request, OutputT format,
         default :
             break;
         }
+        free(pvs[n].value);
     }
     return 0;
 }
@@ -388,7 +389,7 @@ int main (int argc, char *argv[])
     int digits = 0;             /* getopt() no. of float digits */
 
     int nPvs;                   /* Number of PVs */
-    pv* pvs;                    /* Array of PV structures */
+    pv* pvs = NULL;             /* Array of PV structures */
 
     LINE_BUFFER(stdout);        /* Configure stdout buffering */
 
@@ -556,6 +557,7 @@ int main (int argc, char *argv[])
         result = caget(pvs, nPvs, request, format, type, count);
 
                                 /* Shut down Channel Access */
+    free(pvs);
     ca_context_destroy();
 
     return result;

modules/database/src/ioc/bpt/makeBpt.c

@@ -224,6 +224,8 @@ got_header:
     fprintf(outFile,"}\n");
     fclose(inFile);
     fclose(outFile);
+    free(outFilename);
+    free(pname);
     return(0);
 }
 

modules/database/src/ioc/db/dbChannelIO.cpp

@@ -14,6 +14,8 @@
  *  505 665 1831
  */
 
+#define USE_TYPED_DBEVENT
+
 #include <string>
 #include <stdexcept>
 

modules/database/src/ioc/db/dbContext.cpp

@@ -13,6 +13,8 @@
  *  505 665 1831
  */
 
+#define USE_TYPED_DBEVENT
+
 #include <limits.h>
 
 #include "epicsMutex.h"

modules/database/src/ioc/db/dbContextReadNotifyCache.cpp

@@ -12,6 +12,8 @@
  * Author Jeff Hill
  */
 
+#define USE_TYPED_DBEVENT
+
 #include <stdlib.h>
 
 #include "epicsMutex.h"

modules/database/src/ioc/db/dbEvent.c

@@ -19,6 +19,8 @@
  */
 
 #define EPICS_PRIVATE_API
+#define USE_TYPED_DBEVENT
+
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>

modules/database/src/ioc/db/dbEvent.h

@@ -32,6 +32,15 @@ struct dbChannel;
 struct db_field_log;
 struct evSubscrip;
 
+#ifdef USE_TYPED_DBEVENT
+struct dbEventContext; // use dbEventCtx
+typedef struct evSubscrip* dbEventSubscription;
+typedef struct dbEventContext* dbEventCtx;
+#else
+typedef void * dbEventSubscription;
+typedef void * dbEventCtx;
+#endif
+
 DBCORE_API int db_event_list (
     const char *name, unsigned level);
 DBCORE_API int dbel (
@@ -39,8 +48,6 @@ DBCORE_API int dbel (
 DBCORE_API int db_post_events (
     void *pRecord, void *pField, unsigned caEventMask );
 
-typedef void * dbEventCtx;
-
 typedef void EXTRALABORFUNC (void *extralabor_arg);
 DBCORE_API dbEventCtx db_init_events (void);
 DBCORE_API int db_start_events (
@@ -63,7 +70,6 @@ DBCORE_API void db_init_event_freelists (void);
 typedef void EVENTFUNC (void *user_arg, struct dbChannel *chan,
     int eventsRemaining, struct db_field_log *pfl);
 
-typedef void * dbEventSubscription;
 DBCORE_API dbEventSubscription db_add_event (
     dbEventCtx ctx, struct dbChannel *chan,
     EVENTFUNC *user_sub, void *user_arg, unsigned select);

modules/database/src/ioc/db/dbPutNotifyBlocker.cpp

@@ -15,6 +15,8 @@
  *  505 665 1831
  */
 
+#define USE_TYPED_DBEVENT
+
 #include <string>
 #include <stdexcept>
 

modules/database/src/ioc/db/dbSubscriptionIO.cpp

@@ -14,6 +14,8 @@
  *  505 665 1831
  */
 
+#define USE_TYPED_DBEVENT
+
 #include <string>
 #include <stdexcept>
 

modules/database/src/ioc/db/dbUnitTest.c

@@ -14,6 +14,7 @@
 #include <string.h>
 
 #define EPICS_PRIVATE_API
+#define USE_TYPED_DBEVENT
 
 #include "dbmf.h"
 #include "epicsUnitTest.h"

modules/database/src/ioc/dbStatic/dbStaticLib.c

@@ -2219,13 +2219,11 @@ long dbInitRecordLinks(dbRecordType *rtyp, struct dbCommon *prec)
 
         } else if(dbCanSetLink(plink, &link_info, devsup)!=0) {
             errlogPrintf(ERL_ERROR ": %s.%s: can't initialize link type %s with \"%s\" (type %s)\n",
-                         prec->name, pflddes->name, pamaplinkType[plink->type].strvalue,
-                         plink->text, pamaplinkType[link_info.ltype].strvalue);
+                         prec->name, pflddes->name, pamaplinkType[plink->type].strvalue, plink->text, pamaplinkType[link_info.ltype].strvalue);
 
         } else if(dbSetLink(plink, &link_info, devsup)) {
             errlogPrintf(ERL_ERROR ": %s.%s: failed to initialize link type %s with \"%s\" (type %s)\n",
-                         prec->name, pflddes->name, pamaplinkType[plink->type].strvalue,
-                         plink->text, pamaplinkType[link_info.ltype].strvalue);
+                         prec->name, pflddes->name, pamaplinkType[plink->type].strvalue, plink->text, pamaplinkType[link_info.ltype].strvalue);
         }
         free(plink->text);
         plink->text = NULL;

modules/database/src/template/top/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1997 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # Makefile at top of application tree
 TOP = .
 include $(TOP)/configure/CONFIG

modules/database/src/template/top/exampleApp/Db/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1998 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP=../..
 include $(TOP)/configure/CONFIG
 #----------------------------------------

modules/database/src/template/top/exampleApp/Db/_APPNAME_Version.db

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2015 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 record(lsi, "$(user):_APPNAME_:version") {
     field(DTYP, "_APPNAME_ version")
     field(DESC, "Version string")

modules/database/src/template/top/exampleApp/Db/circle.db

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2017 ITER Organization
+#
+# SPDX-License-Identifier: EPICS
+
 record(ao, "$(user):circle:step") {
   field(VAL , "1.0")
   field(DRVL, "0.0")

modules/database/src/template/top/exampleApp/Db/dbExample1.db

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1998 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 record(ai, "$(user):aiExample")
 {
 	field(DESC, "Analog input")

modules/database/src/template/top/exampleApp/Db/dbExample2.db

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1998 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 record(calc, "$(user):calcExample$(no)")
 {
 	alias("$(user):calc$(no)")

modules/database/src/template/top/exampleApp/Db/dbSubExample.db

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2002 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 record(sub,"$(user):subExample")
 {
     field(INAM,"mySubInit")

modules/database/src/template/top/exampleApp/Db/user.substitutions

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2006 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # Example substitutions file
 
 file "db/circle.db" {

modules/database/src/template/top/exampleApp/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1997 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # Makefile at top of application tree
 TOP = ..
 include $(TOP)/configure/CONFIG

modules/database/src/template/top/exampleApp/src/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1998 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP=../..
 
 include $(TOP)/configure/CONFIG

modules/database/src/template/top/exampleApp/src/_APPNAME_Hello.c

@@ -1,3 +1,7 @@
+/* SPDX-FileCopyrightText: 2005 Argonne National Laboratory */
+
+/* SPDX-License-Identifier: EPICS */
+
 /* Example showing how to register a new command with iocsh */
 
 #include <stdio.h>

modules/database/src/template/top/exampleApp/src/_APPNAME_Hello.dbd

@@ -1 +1,5 @@
+# SPDX-FileCopyrightText: 2005 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 registrar(helloRegister)

modules/database/src/template/top/exampleApp/src/_APPNAME_Main.cpp

@@ -1,3 +1,7 @@
+// SPDX-FileCopyrightText: 2000 Argonne National Laboratory
+//
+// SPDX-License-Identifier: EPICS
+
 /* _APPNAME_Main.cpp */
 /* Author:  Marty Kraimer Date:    17MAR2000 */
 

modules/database/src/template/top/exampleApp/src/dbSubExample.c

@@ -1,3 +1,7 @@
+/* SPDX-FileCopyrightText: 2002 Argonne National Laboratory */
+
+/* SPDX-License-Identifier: EPICS */
+
 #include <stdio.h>
 
 #include <dbDefs.h>

modules/database/src/template/top/exampleApp/src/dbSubExample.dbd

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2004 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 variable(mySubDebug)
 function(mySubInit)
 function(mySubProcess)

modules/database/src/template/top/exampleApp/src/devXxxSoft.c

@@ -1,3 +1,7 @@
+/* SPDX-FileCopyrightText: 1998 Argonne National Laboratory */
+
+/* SPDX-License-Identifier: EPICS */
+
 /* devXxxSoft.c */
 /* Example device support module */
 

modules/database/src/template/top/exampleApp/src/dev_APPNAME_Version.c

@@ -1,3 +1,7 @@
+/* SPDX-FileCopyrightText: 2015 Argonne National Laboratory */
+
+/* SPDX-License-Identifier: EPICS */
+
 /* dev_APPNAME_Version.c */
 /* Example device support for the lsi (long string input) record
  * providing the module version string as the value

modules/database/src/template/top/exampleApp/src/dev_APPNAME_Version.dbd

@@ -1 +1,5 @@
+# SPDX-FileCopyrightText: 2015 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 device(lsi,INST_IO,dev_CSAFEAPPNAME_Version,"_APPNAME_ version")

modules/database/src/template/top/exampleApp/src/initTrace.c

@@ -1,3 +1,7 @@
+/* SPDX-FileCopyrightText: 2008 Argonne National Laboratory */
+
+/* SPDX-License-Identifier: EPICS */
+
 /* initTrace.c */
 
 /*

modules/database/src/template/top/exampleApp/src/initTrace.dbd

@@ -1 +1,5 @@
+# SPDX-FileCopyrightText: 2008 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 registrar(initTraceRegister)

modules/database/src/template/top/exampleApp/src/sncExample.dbd

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2004 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # The name below is derived from the name of the SNL program
 # inside the source file, not from its filename. Here the
 # program is called sncExample, but is compiled in both the

modules/database/src/template/top/exampleApp/src/sncExample.stt

@@ -20,3 +20,9 @@ ss ss1 {
         } state low
     }
 }
+
+/*
+SPDX-FileCopyrightText: 1998 Argonne National Laboratory
+
+SPDX-License-Identifier: EPICS
+*/

modules/database/src/template/top/exampleApp/src/sncProgram.st

@@ -1 +1,7 @@
 #include "../sncExample.stt"
+
+/*
+SPDX-FileCopyrightText: 2004 Argonne National Laboratory
+
+SPDX-License-Identifier: EPICS
+*/

modules/database/src/template/top/exampleApp/src/xxxRecord.c

@@ -1,3 +1,7 @@
+/* SPDX-FileCopyrightText: 1998 Argonne National Laboratory */
+
+/* SPDX-License-Identifier: EPICS */
+
 /* xxxRecord.c */
 /* Example record support module */
 

modules/database/src/template/top/exampleApp/src/xxxRecord.dbd

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1998 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 recordtype(xxx) {
 	include "dbCommon.dbd" 
 	field(VAL,DBF_DOUBLE) {

modules/database/src/template/top/exampleApp/src/xxxSupport.dbd

@@ -1,2 +1,6 @@
+# SPDX-FileCopyrightText: 2003 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 include "xxxRecord.dbd"
 device(xxx,CONSTANT,devXxxSoft,"Soft Channel")

modules/database/src/template/top/exampleBoot/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1997 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP = ..
 include $(TOP)/configure/CONFIG
 DIRS += $(wildcard *ioc*)

modules/database/src/template/top/exampleBoot/ioc/Makefile@Common

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1998 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP = ../..
 include $(TOP)/configure/CONFIG
 ARCH = $(EPICS_HOST_ARCH)

modules/database/src/template/top/exampleBoot/ioc/Makefile@cygwin

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2014 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP = ../..
 include $(TOP)/configure/CONFIG
 ARCH = _ARCH_

modules/database/src/template/top/exampleBoot/ioc/Makefile@vxWorks

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1998 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP = ../..
 include $(TOP)/configure/CONFIG
 ARCH = _ARCH_

modules/database/src/template/top/exampleBoot/ioc/Makefile@win32

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2008 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP = ../..
 include $(TOP)/configure/CONFIG
 ARCH = _ARCH_

modules/database/src/template/top/exampleBoot/ioc/Makefile@windows

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2014 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP = ../..
 include $(TOP)/configure/CONFIG
 ARCH = _ARCH_

modules/database/src/template/top/exampleBoot/ioc/README@Common

@@ -7,3 +7,7 @@ and check the executable name on the first line of the st.cmd file
 
 You may need to change the name of the .dbd file given in the
 st.cmd's dbLoadDatabase() command before starting the ioc.
+
+
+SPDX-FileCopyrightText: 2001 Argonne National Laboratory
+SPDX-License-Identifier: EPICS

modules/database/src/template/top/exampleBoot/ioc/README@RTEMS

@@ -4,3 +4,7 @@ contents to
 
 Then load the executable into the IOC (floppy disk, network boot, debugger,
 etc.) and start it.
+
+
+SPDX-FileCopyrightText: 2001 Argonne National Laboratory
+SPDX-License-Identifier: EPICS

modules/database/src/template/top/exampleBoot/ioc/st.cmd@Common

@@ -1,5 +1,9 @@
 #!../../bin/_ARCH_/_APPNAME_
 
+#- SPDX-FileCopyrightText: 2000 Argonne National Laboratory
+#-
+#- SPDX-License-Identifier: EPICS
+
 #- You may have to change _APPNAME_ to something else
 #- everywhere it appears in this file
 

modules/database/src/template/top/exampleBoot/ioc/st.cmd@RTEMS

@@ -1,3 +1,7 @@
+#- SPDX-FileCopyrightText: 2001 Argonne National Laboratory
+#-
+#- SPDX-License-Identifier: EPICS
+
 #- Example RTEMS startup script
 
 #- You may have to change _APPNAME_ to something else

modules/database/src/template/top/exampleBoot/ioc/st.cmd@vxWorks

@@ -1,3 +1,7 @@
+#- SPDX-FileCopyrightText: 1998 Argonne National Laboratory
+#-
+#- SPDX-License-Identifier: EPICS
+
 #- Example vxWorks startup file
 
 #- The following is needed if your board support package doesn't at boot time

modules/database/src/template/top/exampleBoot/nfsCommands@RTEMS

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2005 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 #- Instructions for creating and using a real nfsCommands file
 #- 
 #- in order to use nfs do the following:

modules/database/src/template/top/exampleBoot/nfsCommands@vxWorks

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1997 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 #- Instructions for creating and using a real nfsCommands file
 #- 
 #- in order to use nfs do the following:

modules/database/src/template/top/iocApp/Db/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1998 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP=../..
 include $(TOP)/configure/CONFIG
 #----------------------------------------

modules/database/src/template/top/iocApp/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1997 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # Makefile at top of application tree
 TOP = ..
 include $(TOP)/configure/CONFIG

modules/database/src/template/top/iocApp/src/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2003 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP=../..
 
 include $(TOP)/configure/CONFIG

modules/database/src/template/top/iocApp/src/_APPNAME_Main.cpp

@@ -1,3 +1,7 @@
+// SPDX-FileCopyrightText: 2000 Argonne National Laboratory
+//
+// SPDX-License-Identifier: EPICS
+
 /* _APPNAME_Main.cpp */
 /* Author:  Marty Kraimer Date:    17MAR2000 */
 

modules/database/src/template/top/iocBoot/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1997 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP = ..
 include $(TOP)/configure/CONFIG
 DIRS += $(wildcard *ioc*)

modules/database/src/template/top/iocBoot/ioc/Makefile@Common

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1998 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP = ../..
 include $(TOP)/configure/CONFIG
 ARCH = $(EPICS_HOST_ARCH)

modules/database/src/template/top/iocBoot/ioc/Makefile@cygwin

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2014 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP = ../..
 include $(TOP)/configure/CONFIG
 ARCH = _ARCH_

modules/database/src/template/top/iocBoot/ioc/Makefile@vxWorks

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1998 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP = ../..
 include $(TOP)/configure/CONFIG
 ARCH = _ARCH_

modules/database/src/template/top/iocBoot/ioc/Makefile@win32

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2008 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP = ../..
 include $(TOP)/configure/CONFIG
 ARCH = _ARCH_

modules/database/src/template/top/iocBoot/ioc/Makefile@windows

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2014 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP = ../..
 include $(TOP)/configure/CONFIG
 ARCH = _ARCH_

modules/database/src/template/top/iocBoot/ioc/st.cmd@Common

@@ -1,5 +1,9 @@
 #!../../bin/_ARCH_/_APPNAME_
 
+#- SPDX-FileCopyrightText: 2003 Argonne National Laboratory
+#-
+#- SPDX-License-Identifier: EPICS
+
 #- You may have to change _APPNAME_ to something else
 #- everywhere it appears in this file
 

modules/database/src/template/top/iocBoot/ioc/st.cmd@Cross

@@ -1,5 +1,9 @@
 #!../../bin/_ARCH_/_APPNAME_
 
+#- SPDX-FileCopyrightText: 2005 Argonne National Laboratory
+#-
+#- SPDX-License-Identifier: EPICS
+
 #- You may have to change _APPNAME_ to something else
 #- everywhere it appears in this file
 

modules/database/src/template/top/iocBoot/ioc/st.cmd@RTEMS

@@ -1,3 +1,7 @@
+#- SPDX-FileCopyrightText: 2001 Argonne National Laboratory
+#-
+#- SPDX-License-Identifier: EPICS
+
 #- Example RTEMS startup script
 
 #- You may have to change _APPNAME_ to something else

modules/database/src/template/top/iocBoot/ioc/st.cmd@vxWorks

@@ -1,3 +1,7 @@
+#- SPDX-FileCopyrightText: 1998 Argonne National Laboratory
+#-
+#- SPDX-License-Identifier: EPICS
+
 #- Example vxWorks startup file
 
 #- The following is needed if your board support package doesn't at boot time

modules/database/src/template/top/iocBoot/nfsCommands@RTEMS

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2005 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 #- Instructions for creating and using a real nfsCommands file
 #- 
 #- in order to use nfs do the following:

modules/database/src/template/top/iocBoot/nfsCommands@vxWorks

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1997 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 #- Instructions for creating and using a real nfsCommands file
 #- 
 #- in order to use nfs do the following:

modules/database/src/template/top/supportApp/Db/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1998 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP=../..
 include $(TOP)/configure/CONFIG
 #----------------------------------------

modules/database/src/template/top/supportApp/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1997 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # Makefile at top of application tree
 TOP = ..
 include $(TOP)/configure/CONFIG

modules/database/src/template/top/supportApp/src/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2003 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP=../..
 
 include $(TOP)/configure/CONFIG

modules/database/src/template/top/supportApp/src/_APPNAME_.dbd

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2003 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # provide definitions such as
 #include "xxxRecord.dbd"
 #device(xxx,CONSTANT,devXxxSoft,"SoftChannel")

modules/libcom/RTEMS/posix/rtems_config.c

@@ -26,7 +26,14 @@ extern void *POSIX_Init(void *argument);
 #define CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE  (64*1024)
 
 #define CONFIGURE_MAXIMUM_PERIODS 	5
+/*
+ * Override in configure/CONFIG_SITE.local with:
+ *
+ * OP_SYS_CFLAGS += -DCONFIGURE_MICROSECONDS_PER_TICK=1000
+ */
+#ifndef CONFIGURE_MICROSECONDS_PER_TICK
 #define CONFIGURE_MICROSECONDS_PER_TICK 10000
+#endif
 #define CONFIGURE_MALLOC_STATISTICS     1
 /* MINIMUM_STACK_SIZE == 8K */
 #define CONFIGURE_EXTRA_TASK_STACKS         (4000 * RTEMS_MINIMUM_STACK_SIZE)

modules/libcom/src/osi/os/WIN32/epicsMath.h

@@ -19,6 +19,15 @@
 #define finite(D) _finite(D)
 #endif
 
+#if !defined(__cplusplus) || (defined(_MSC_VER) && (_MSC_VER < 1800))
+
+/* these are macros in C but usually inline functions in C++
+ * so macro ifndef does not work as a check in c++
+ * In a recent VS2022 update redefining as macros causes a conflict and
+ * compile time error. It looks like VS2013 and above supply
+ * isnan and isinf functions for in C++ so no need to create them
+ */
+
 #ifndef isnan
 #define isnan(D) _isnan(D)
 #endif
@@ -27,6 +36,8 @@
 #define isinf(D) ( !_finite(D) && !_isnan(D) )
 #endif
 
+#endif /* ifndef __cplusplus */
+
 #ifdef __cplusplus
 extern "C" {
 #endif

src/template/base/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1997 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP=../../..
 
 include $(TOP)/configure/CONFIG

src/template/base/makeBaseApp.pl

@@ -1,5 +1,9 @@
 #!/usr/bin/env perl
 
+# SPDX-FileCopyrightText: 1997 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # Authors: Ralph Lange, Marty Kraimer, Andrew Johnson and Janet Anderson
 
 use FindBin qw($RealBin);

src/template/base/top/.gitignore

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2022 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # Install directories
 /bin/
 /cfg/

src/template/base/top/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1997 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # Makefile at top of application tree
 TOP = .
 include $(TOP)/configure/CONFIG

src/template/base/top/configure/CONFIG

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1997 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # CONFIG - Load build configuration data
 #
 # Do not make changes to this file!

src/template/base/top/configure/CONFIG_SITE

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2006 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # CONFIG_SITE
 
 # Make any application-specific changes to the EPICS build

src/template/base/top/configure/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1999 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP=..
 
 include $(TOP)/configure/CONFIG

src/template/base/top/configure/RELEASE

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1997 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # RELEASE - Location of external support modules
 #
 # IF YOU CHANGE ANY PATHS in this file or make API changes to

src/template/base/top/configure/RULES

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2000 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # RULES
 
 include $(CONFIG)/RULES

src/template/base/top/configure/RULES.ioc

@@ -1,2 +1,6 @@
+# SPDX-FileCopyrightText: 1999 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 #RULES.ioc
 include $(CONFIG)/RULES.ioc

src/template/base/top/configure/RULES_DIRS

@@ -1,2 +1,6 @@
+# SPDX-FileCopyrightText: 1999 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 #RULES_DIRS
 include $(CONFIG)/RULES_DIRS

src/template/base/top/configure/RULES_TOP

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 1997 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 #RULES_TOP
 include $(CONFIG)/RULES_TOP
 

src/template/ext/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2000 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 TOP=../../..
 
 include $(TOP)/configure/CONFIG

src/template/ext/makeBaseExt.pl

@@ -1,5 +1,9 @@
 #!/usr/bin/env perl
 
+# SPDX-FileCopyrightText: 2000 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # Authors: Ralph Lange, Marty Kraimer, Andrew Johnson and Janet Anderson
 
 use Cwd;

src/template/ext/top/.gitignore

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2022 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # Install directories
 /bin/
 /cfg/

src/template/ext/top/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2000 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # Makefile at the top of an extensions tree
 
 TOP = .

src/template/ext/top/README

@@ -3,3 +3,6 @@ Notes:
 Each time you add a new extension in the src directory you
 must add the extension directory name to src/Makefile.
 
+
+SPDX-FileCopyrightText: 2000 Argonne National laboratory
+SPDX-License-Identifier: EPICS

src/template/ext/top/configure/CONFIG

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2000 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # CONFIG - Load build configuration data
 #
 # Do not make changes to this file!

src/template/ext/top/configure/CONFIG_SITE

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2006 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # CONFIG_SITE
 #
 # Make any extensions-specific changes to the EPICS build

src/template/ext/top/configure/Makefile

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2000 Argonne National Laboratory
+#
+# SPDX-License-Identifier: EPICS
+
 # Makefile in extensions/configure directory
 
 TOP=..