Merge lp:~epics-core/epics-base/add-rtems-4.12-api into lp:~epics-core/epics-base/3.16

[Andrew Johnson]

Heinz's RTEMS-4.12 port with the additional OS_API flag and reorganized to allow switching between kernel and posix implementations. For RTEMS the flag's value is set automatically based on a new RTEMS_SERIES setting in CONFIG_SITE.Common.RTEMS.

I can't implement Michael's request to use explicit paths to the source files without making significant changes to the build rules, and that would probably break a large number of external modules; the OS_API approach is backwards compatible.

I have checked that this branch builds against both RTEMS-4.9.2 and 4.10.2, but I don't have RTEMS-4.12 here to try it against. I have reservations about some of the posix implementations which I will bring up in review comments.

[Andrew Johnson (anj)]

Various inline comments and questions.

[Andrew Johnson (anj)]

A couple more inline comments/questions.

[lp:~epics-core/epics-base/add-rtems-4.12-api]

12746. By Heinz Junkes on 2017-04-28

in 'configure/os/CONFIG.Common.RTEMS-beatnik
set MY_DO_BOOTP to rtems_bsdnet_do_bootp as I have checked just
   "network booting" with dhcp. Booting with NVRAM-settings not tested until now

in src/libCom/RTEMS/posix/rtems_netconfig.c
Interface named defined in ./configure/os/CONFIG.Common.RTEMS-beatnik
ARCH_DEP_CFLAGS += -DETH_NAME_1=mve1
ARCH_DEP_CFAGS += -DETH_NAME_2=mve2
done just for powerpc-beatnik

Initial date in src/libCom/RTEMS/rtems_init.c
100 years after the sinking of the Titanik, I was 50 years old ;-)

src/libCom/osi/os/RTEMS-posix/devLibVMEOSD.c
I still do not know where where routine bspExtMemProb and bspExtInit() come from.

src/libCom/osi/os/posix/osdThread.c
No special rtems-version. I modified the "standard" posix osdThread.c
Add __thread (thread local variable) instead of posix key.
Other stack-space, printk statements, all with #if defined (__rtems__).
Hope this is ok.

12747. By Andrew Johnson on 2017-04-28

Network config changes, to generalize

12748. By mdavidsaver on 2017-05-01

libCom: rtems < 4.12 doesn't have SO_REUSEPORT

12749. By mdavidsaver on 2017-05-01

libCom/RTEMS: avoid multiple defs w/ RTEMS < 4.12

[Andrew Johnson (anj)]

This branch is *not* ready to merge, sorry, it needs some major cleaning up in places.

Please remove the extraneous comments from the README file.

There are some changes related to multicast options which will probably conflict with my osiSockTest branch (which is aimed at 3.15 but should be merged up first). The osiSockTest branch changes should take precedence over those from this branch.

Please remove the call to epicsThreadShowAll() from testHarness() in epicsUnitTest.c. There appear to be a few other extraneous changes (e.g. adding or removing blank lines to files which are otherwise unchanged) which I would like to see deleted. Code that should be indented but isn't, extraneous commented out lines etc. — these kinds of changes should never have been committed in the first place.

The various rtems-specific includes that have been added to a number of files (e.g. errlog.c) really should be put in an RTEMS-specific osd* header file, although I'm not sure which. We have tried to remove all OS-conditional includes from the general EPICS sources, and I don't want to let them back in again here.

I frown on the use of C++ // comments in .c files. Maybe they don't matter any more with the latest compilers, but I still have to support systems with compilers that don't allow them.

Does this branch include (some of) Michael's osiaddrinfo branch? There are changes in it which seem to be related to that and have his name on them, but I don't know the specifics. That branch had problems on MacOS and some other architectures, so this makes me a little nervous.

review: Needs Fixing

[Heinz Junkes (junkes)]

Dear Andrew,
thank you for your review.
For me it looks not like a diff to the merge request (and push) I made at ITER on 5th of october.

I pushed my code to git+ssh://<email address hidden>/~epics-core/epics-base/+git/add-rtems-4.12-api

git log shows :

commit 6633ba5483732cd715420f874a85aed11e7df5fb
Author: Heinz Junkes <email address hidden>
Date: Thu Oct 5 14:45:19 2017 +0200

    add define rtems for SO_REUSEPORT etc

commit 2c707a1deebb1072fe77068c0a5fa389aa266c04
Author: Heinz Junkes <email address hidden>
Date: Thu Oct 5 09:24:55 2017 +0200

    RTEMS4.12

commit fdfd324fa760521e106de6165042ceffc5bad4a1
Author: Michael Davidsaver <email address hidden>
Date: Sun Jun 18 20:53:28 2017 +0200

    travis-ci: run RTEMS tests
…

Cheers,
Heinz

> On 19 Oct 2017, at 04:17, Andrew Johnson <email address hidden> wrote:
>
> Review: Needs Fixing
>
> This branch is *not* ready to merge, sorry, it needs some major cleaning up in places.
>
> Please remove the extraneous comments from the README file.
>
> There are some changes related to multicast options which will probably conflict with my osiSockTest branch (which is aimed at 3.15 but should be merged up first). The osiSockTest branch changes should take precedence over those from this branch.
>
> Please remove the call to epicsThreadShowAll() from testHarness() in epicsUnitTest.c. There appear to be a few other extraneous changes (e.g. adding or removing blank lines to files which are otherwise unchanged) which I would like to see deleted. Code that should be indented but isn't, extraneous commented out lines etc. — these kinds of changes should never have been committed in the first place.
>
> The various rtems-specific includes that have been added to a number of files (e.g. errlog.c) really should be put in an RTEMS-specific osd* header file, although I'm not sure which. We have tried to remove all OS-conditional includes from the general EPICS sources, and I don't want to let them back in again here.
>
> I frown on the use of C++ // comments in .c files. Maybe they don't matter any more with the latest compilers, but I still have to support systems with compilers that don't allow them.
>
> Does this branch include (some of) Michael's osiaddrinfo branch? There are changes in it which seem to be related to that and have his name on them, but I don't know the specifics. That branch had problems on MacOS and some other architectures, so this makes me a little nervous.
>
> --
> https://code.launchpad.net/~epics-core/epics-base/add-rtems-4.12-api/+merge/320503
> Your team EPICS Core Developers is subscribed to branch lp:~epics-core/epics-base/3.16.

[Andrew Johnson (anj)]

Hello Heinz,

Ahhh, this merge request is for the old Bazaar branch, my sincere apologies for not noticing that. I will mark this one as old and propose a merge of your new version.

- Andrew

Unmerged revisions

12749. By mdavidsaver on 2017-05-01

libCom/RTEMS: avoid multiple defs w/ RTEMS < 4.12

12748. By mdavidsaver on 2017-05-01

libCom: rtems < 4.12 doesn't have SO_REUSEPORT

12747. By Andrew Johnson on 2017-04-28

Network config changes, to generalize

12746. By Heinz Junkes on 2017-04-28

in 'configure/os/CONFIG.Common.RTEMS-beatnik
set MY_DO_BOOTP to rtems_bsdnet_do_bootp as I have checked just
   "network booting" with dhcp. Booting with NVRAM-settings not tested until now

in src/libCom/RTEMS/posix/rtems_netconfig.c
Interface named defined in ./configure/os/CONFIG.Common.RTEMS-beatnik
ARCH_DEP_CFLAGS += -DETH_NAME_1=mve1
ARCH_DEP_CFAGS += -DETH_NAME_2=mve2
done just for powerpc-beatnik

Initial date in src/libCom/RTEMS/rtems_init.c
100 years after the sinking of the Titanik, I was 50 years old ;-)

src/libCom/osi/os/RTEMS-posix/devLibVMEOSD.c
I still do not know where where routine bspExtMemProb and bspExtInit() come from.

src/libCom/osi/os/posix/osdThread.c
No special rtems-version. I modified the "standard" posix osdThread.c
Add __thread (thread local variable) instead of posix key.
Other stack-space, printk statements, all with #if defined (__rtems__).
Hope this is ok.

12745. By Andrew Johnson on 2017-03-20

Convert to OS_API layout

12744. By Andrew Johnson on 2017-03-20

Support for OS_API variable

12743. By Heinz Junkes <email address hidden> on 2017-03-13

RTEMS4.12 Port for EPICS 3.16

=== modified file 'Makefile'
--- Makefile	2016-05-22 12:38:18 +0000
+++ Makefile	2017-05-01 18:36:52 +0000
@@ -8,6 +8,7 @@
 #*************************************************************************
 
 TOP = .
+
 include $(TOP)/configure/CONFIG
 
 # Bootstrap resolution: tools not installed yet

=== modified file 'README'
--- README	2017-02-01 17:57:04 +0000
+++ README	2017-05-01 18:36:52 +0000
@@ -22,3 +22,24 @@
 websites etc. is available on the EPICS home page at
 	http://www.aps.anl.gov/epics/
 
+hpj:
+In configure/CONFIG_COMMON add RTEMS_XVERSION
+$(addprefix $(dir)/, os/$(OS_CLASS)$(RTEMS_XVERSION) $(POSIX_$(POSIX)) os/default ))
+
+add to $Home/configure/CONFIG_USER
+
+#FHI
+EPICS_SITE_VERSION = fhi
+#
+RTEMS_VERSION = 4.12
+#to use new libcom osd files
+RTEMS_XVERSION = 4.12
+
+RTEMS_BASE = /home/h1/RTEMS/rtems-$(RTEMS_VERSION)
+
+# Runs on beatnik board (MVME6100)
+CROSS_COMPILER_TARGET_ARCHS = RTEMS-beatnik
+
+ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=rtems_bsdnet_do_bootp
+ARCH_DEP_CFLAGS += -DBSP_NVRAM_BASE_ADDR=0xf1110000
+

=== modified file 'configure/CONFIG_COMMON'
--- configure/CONFIG_COMMON	2017-02-01 17:57:04 +0000
+++ configure/CONFIG_COMMON	2017-05-01 18:36:52 +0000
@@ -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.
 #*************************************************************************
 #
 #  CONFIG_COMMON
@@ -136,10 +136,11 @@
 #--------------------------------------------------
 # vpath directories
 POSIX_YES = os/posix
+OS_IMPL_DIRS = $(if $(OS_API),os/$(OS_CLASS)-$(OS_API),) os/$(OS_CLASS)
 GENERIC_SRC_DIRS = .. $(SRC_DIRS)
-OS_SRC_DIRS += . $(foreach dir, .. $(SRC_DIRS), \
-       $(addprefix $(dir)/, os/$(OS_CLASS) $(POSIX_$(POSIX)) os/default ))
-CMPLR_SRC_DIRS += . $(foreach dir, .. $(SRC_DIRS), \
+OS_SRC_DIRS += . $(foreach dir, $(GENERIC_SRC_DIRS), \
+       $(addprefix $(dir)/, $(OS_IMPL_DIRS) $(POSIX_$(POSIX)) os/default ))
+CMPLR_SRC_DIRS += . $(foreach dir, $(GENERIC_SRC_DIRS), \
        $(addprefix $(dir)/, compiler/$(CMPLR_CLASS) compiler/default ))
 ALL_SRC_DIRS = $(CMPLR_SRC_DIRS) $(OS_SRC_DIRS) $(GENERIC_SRC_DIRS)
 
@@ -261,7 +262,7 @@
 LIBRARY_SRC_CFLAGS=$($(patsubst $*,SHRLIB,$(findstring $*,$(LIBRARY_SRCS)))_CFLAGS)
 
 #--------------------------------------------------
-# prefix, suffix, and ldflags for loadable shared libraries 
+# prefix, suffix, and ldflags for loadable shared libraries
 TARGET_LIB_LDFLAGS=$($(patsubst $*,LOADABLE_,$(findstring $*,$(LOADABLE_LIBRARY)))SHRLIB_LDFLAGS)
 LOADABLE_SHRLIB_PREFIX=$(SHRLIB_PREFIX)
 LOADABLE_SHRLIB_SUFFIX=$(SHRLIB_SUFFIX)
@@ -459,5 +460,5 @@
 SOURCE_INC = $(wildcard $(file) $(SOURCE_INC_bbb) )
 SOURCE_INC_bbb = $(foreach dir, $(ALL_SRC_DIRS), $(SOURCE_INC_aaa)  )
 SOURCE_INC_aaa = $(addsuffix /$(file), $(dir) )
- 
+
 endif

=== modified file 'configure/os/CONFIG.Common.RTEMS'
--- configure/os/CONFIG.Common.RTEMS	2016-05-22 12:38:18 +0000
+++ configure/os/CONFIG.Common.RTEMS	2017-05-01 18:36:52 +0000
@@ -91,14 +91,27 @@
 OS_CLASS = RTEMS
 
 #--------------------------------------------------
+# operating system API (src/os/<os_class>-<os_api>)
+OS_API_4.7 = kernel
+OS_API_4.8 = kernel
+OS_API_4.9 = kernel
+OS_API_4.10 = kernel
+OS_API_4.11 = $(error RTEMS-4.11 is not currently supported)
+# Later RTEMS versions will use posix, no need to specify
+OS_API = $(firstword $(OS_API_$(RTEMS_SERIES)) posix)
+
+#--------------------------------------------------
 # Operating system flags
 OP_SYS_LDLIBS += -lrtemsCom -lc -lrtemscpu -lCom -lnfs -lm
-OP_SYS_LDFLAGS += $(CPU_CFLAGS) -u Init \
+
+OP_SYS_LDFLAGS_posix += -u POSIX_Init
+OP_SYS_LDFLAGS_kernel += -u Init \
                  $(PROJECT_RELEASE)/lib/no-dpmem.rel \
                  $(PROJECT_RELEASE)/lib/no-mp.rel \
                  $(PROJECT_RELEASE)/lib/no-part.rel \
                  $(PROJECT_RELEASE)/lib/no-signal.rel \
                  $(PROJECT_RELEASE)/lib/no-rtmon.rel
+OP_SYS_LDFLAGS += $(CPU_CFLAGS) $(OP_SYS_LDFLAGS_$(OS_API))
 
 MOD_SYS_LDFLAGS += $(CPU_CFLAGS) -Wl,-r -nostdlib
 

=== modified file 'configure/os/CONFIG.Common.RTEMS-beatnik'
--- configure/os/CONFIG.Common.RTEMS-beatnik	2016-05-21 02:27:03 +0000
+++ configure/os/CONFIG.Common.RTEMS-beatnik	2017-05-01 18:36:52 +0000
@@ -1,19 +1,20 @@
-#
 # CONFIG.Common.RTEMS-beatnik
+#
 # Author: Dayle Kotturi <[e-mail]>
 #
-# All RTEMS targets use the same Makefile fragment
+# Site-specific adjustments to these settings belong
+# in the file CONFIG_SITE.Common.RTEMS-beatnik
 #
+
 EXE = .elf
 RTEMS_TARGET_CPU = powerpc
 GNU_TARGET = powerpc-rtems
-ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
+
+# Flags for *all* beatnik builds
 ARCH_DEP_CFLAGS += -DHAVE_MOTLOAD
 ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_MBUF_SPACE=2048
 ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120
 
-OP_SYS_LDLIBS += -lbspExt
-
 MUNCH_SUFFIX = .boot
 MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD

=== modified file 'configure/os/CONFIG.Common.RTEMS-mvme3100'
--- configure/os/CONFIG.Common.RTEMS-mvme3100	2016-05-21 02:27:03 +0000
+++ configure/os/CONFIG.Common.RTEMS-mvme3100	2017-05-01 18:36:52 +0000
@@ -1,18 +1,20 @@
-#
 # CONFIG.Common.RTEMS-mvme3100
+#
 # Author: W. Eric Norum <[e-mail]>
 #
-# All RTEMS targets use the same Makefile fragment
+# Site-specific adjustments to these settings belong
+# in the file CONFIG_SITE.Common.RTEMS-mvme3100
 #
 EXE = .elf
 RTEMS_TARGET_CPU = powerpc
 GNU_TARGET = powerpc-rtems
+
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 ARCH_DEP_CFLAGS += -DHAVE_MOTLOAD
 ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_MBUF_SPACE=2048
 ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120
 
-OP_SYS_LDLIBS += -lbspExt
+# OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
 MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))

=== modified file 'configure/os/CONFIG_SITE.Common.RTEMS'
--- configure/os/CONFIG_SITE.Common.RTEMS	2016-05-21 02:27:03 +0000
+++ configure/os/CONFIG_SITE.Common.RTEMS	2017-05-01 18:36:52 +0000
@@ -3,11 +3,29 @@
 # Site-specific information for all RTEMS targets
 #-------------------------------------------------------
 
+# RTEMS Series and Version
+
+#RTEMS_SERIES = 4.9
+#RTEMS_VERSION = 4.9.2
+
+RTEMS_SERIES = 4.10
+RTEMS_VERSION = 4.10.2
+
+#RTEMS_SERIES = 4.12
+#RTEMS_VERSION = 4.12
+
+
 # Where to find RTEMS
 #
+#RTEMS_BASE = /your/path/to/rtems-$(RTEMS_VERSION)
+
 # APS:
-RTEMS_VERSION = 4.10.2
 RTEMS_BASE = /usr/local/vw/rtems/rtems-$(RTEMS_VERSION)
+#RTEMS_BASE = /local/anj/RTEMS/rtems-4.12
+
+# FHI:
+#RTEMS_BASE = /home/rtems/RTEMS/rtems-$(RTEMS_VERSION)
+
 
 # Cross-compile toolchain in $(RTEMS_TOOLS)/bin
 #
@@ -24,7 +42,7 @@
 # network configuration you must uncomment and specify your Internet
 # Domain Name here
 #
-#OP_SYS_CFLAGS += -DRTEMS_NETWORK_CONFIG_DNS_DOMAINNAME=<domainname>
+OP_SYS_CFLAGS += -DRTEMS_NETWORK_CONFIG_DNS_DOMAINNAME=<domainname>
 
 # Select the command-line-input library to use
 #

=== added file 'configure/os/CONFIG_SITE.Common.RTEMS-beatnik'
--- configure/os/CONFIG_SITE.Common.RTEMS-beatnik	1970-01-01 00:00:00 +0000
+++ configure/os/CONFIG_SITE.Common.RTEMS-beatnik	2017-05-01 18:36:52 +0000
@@ -0,0 +1,22 @@
+# CONFIG_SITE.Common.RTEMS-beatnik
+#
+# Site-specific overrides for RTEMS-beatnik target
+#
+
+# Any sites using the beatnik BSP on more than one kind of MVME
+# board may have difficulties with this release...
+
+# These settings are for MVME6100 boards:
+ARCH_DEP_CFLAGS += -DUSE_ALTIVEC
+
+ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_DRIVER_NAME_1=mve1
+#ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_IP4_ADDR_1=192.168.4.1
+#ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_IP4_MASK_1=255.255.254.0
+
+ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_DRIVER_NAME_2=mve2
+#ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_IP4_ADDR_2=192.168.6.2
+#ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_IP4_MASK_2=255.255.254.0
+
+# Uncomment this to link against libbspExt
+#OP_SYS_LDLIBS += -lbspExt
+

=== added file 'configure/os/CONFIG_SITE.Common.RTEMS-mvme3100'
--- configure/os/CONFIG_SITE.Common.RTEMS-mvme3100	1970-01-01 00:00:00 +0000
+++ configure/os/CONFIG_SITE.Common.RTEMS-mvme3100	2017-05-01 18:36:52 +0000
@@ -0,0 +1,19 @@
+# CONFIG_SITE.Common.RTEMS-mvme3100
+#
+# Site-specific overrides for RTEMS-mvme3100 target
+#
+
+# Any sites using the beatnik BSP on more than one kind of MVME
+# board may have difficulties with this release...
+
+#ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_DRIVER_NAME_1=?
+#ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_IP4_ADDR_1=192.168.4.1
+#ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_IP4_MASK_1=255.255.254.0
+
+#ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_DRIVER_NAME_2=?
+#ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_IP4_ADDR_2=192.168.6.2
+#ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_IP4_MASK_2=255.255.254.0
+
+# Uncomment this to link against libbspExt
+#OP_SYS_LDLIBS += -lbspExt
+

=== modified file 'configure/os/CONFIG_SITE.Common.RTEMS-pc386'
--- configure/os/CONFIG_SITE.Common.RTEMS-pc386	2002-08-20 16:18:05 +0000
+++ configure/os/CONFIG_SITE.Common.RTEMS-pc386	2017-05-01 18:36:52 +0000
@@ -1,3 +1,15 @@
+# CONFIG_SITE.Common.RTEMS-pc386
 #
 # Site-specific overrides for RTEMS-pc386 target
 #
+
+# These NICs support run-time probing:
+#ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_DRIVER_NAME_1=fxp1
+#ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_DRIVER_ATTACH_1=rtems_fxp_attach
+#ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_IP4_ADDR_1=192.168.4.1
+#ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_IP4_MASK_1=255.255.254.0
+
+#ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_DRIVER_NAME_2=ep0
+#ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_DRIVER_ATTACH_2=rtems_3c509_driver_attach
+#ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_IP4_ADDR_2=192.168.6.2
+#ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_IP4_MASK_2=255.255.254.0

=== modified file 'documentation/RELEASE_NOTES.html'
--- documentation/RELEASE_NOTES.html	2017-02-01 17:57:04 +0000
+++ documentation/RELEASE_NOTES.html	2017-05-01 18:36:52 +0000
@@ -21,6 +21,35 @@
 
 -->
 
+<h3>Support for RTEMS 4.12</h3>
+
+<p>The next major release of the RTEMS real-time OS will be version 4.12 which
+contains many changes including the ability to support SMP systems. The earlier
+EPICS support for RTEMS made use of various RTEMS-specific kernel APIs which
+cannot be used on an SMP system, so the changes here required a completely new
+port to the Posix real-time APIs that RTEMS-4.12 now recommends. A new RTEMS
+configuration variable RTEMS_SERIES has been added which should be set to the
+first two components of the OS version number, e.g. 4.9. When this is 4.12 or
+greater the new libCom/osi/os/RTEMS-posix source files will be used; the older
+API source files can now be found in libCom/osi/os/RTEMS-kernel, and those which
+are common to both installations are in libCom/osi/os/RTEMS.</p>
+
+<p>Note that EPICS Base can only be built for a single RTEMS version at a time.
+  The RTEMS version number is set in the CONFIG_SITE.Common.RTEMS file and
+  cannot be different for specific targets. This allows different header files
+  to be used and installed for the two different APIs.</p>
+
+<h3>Support for multiple APIs in the same OS</h3>
+
+<p>The build configuration files for a particular build target may now select
+between multiple implementations with different OS APIs by setting the GNUmake
+variable <tt>OS_API</tt>. This changes the search path used for OS-specific
+source files, inserting a directory <tt>os/$(OS_CLASS)-$(OS_API)</tt> before
+the existing <tt>os/$(OS_CLASS)</tt> directory. Note though that the include
+file search path does not change, so OS-specific header files must be able to
+handle both APIs simultaneously, and their source files should go in the
+<tt>os/$(OS_CLASS)</tt> directory.</p>
+
 <h3>Echoless comments in iocsh</h3>
 
 <p>The way comments are parsed by the iocsh interpreter has changed. The

=== modified file 'src/ioc/rsrv/caservertask.c'
--- src/ioc/rsrv/caservertask.c	2016-08-30 14:36:51 +0000
+++ src/ioc/rsrv/caservertask.c	2017-05-01 18:36:52 +0000
@@ -308,13 +308,17 @@
         }
 #ifdef IP_ADD_MEMBERSHIP
         {
+#if defined(__rtems__)
+	    char flag = 1;
+#else
             int flag = 1;
+#endif
             if (setsockopt(beaconSocket, IPPROTO_IP, IP_MULTICAST_LOOP,
                            (char *)&flag, sizeof(flag))<0) {
                 char sockErrBuf[64];
                 epicsSocketConvertErrnoToString (
                             sockErrBuf, sizeof ( sockErrBuf ) );
-                errlogPrintf("rsrv: failed to set mcast loopback\n");
+                errlogPrintf("rsrv: failed to set mcast loopback (%d:%s)\n", errno, sockErrBuf);
             }
         }
 #endif

=== modified file 'src/libCom/RTEMS/Makefile'
--- src/libCom/RTEMS/Makefile	2011-11-14 23:42:50 +0000
+++ src/libCom/RTEMS/Makefile	2017-05-01 18:36:52 +0000
@@ -9,6 +9,8 @@
 TOP=../../..
 include $(TOP)/configure/CONFIG
 
+SRC_DIRS += ../$(OS_API)
+
 INC += epicsRtemsInitHooks.h
 
 rtemsCom_SRCS += rtems_init.c

=== added directory 'src/libCom/RTEMS/kernel'
=== renamed file 'src/libCom/RTEMS/rtems_config.c' => 'src/libCom/RTEMS/kernel/rtems_config.c'
--- src/libCom/RTEMS/rtems_config.c	2016-05-22 12:38:18 +0000
+++ src/libCom/RTEMS/kernel/rtems_config.c	2017-05-01 18:36:52 +0000
@@ -1,17 +1,17 @@
 /*************************************************************************\
 * Copyright (c) 2002 The University of Saskatchewan
-* 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.
 \*************************************************************************/
 /*
  * RTEMS configuration for EPICS
  *      Author: W. Eric Norum
- *              [e-mail]
- *              [phone]
  */
 
 #include <rtems.h>
+#include <epicsVersion.h>
+#define RTEMS_VERSION_INT \
+     VERSION_INT(__RTEMS_MAJOR__, __RTEMS_MINOR__, __RTEMS_REVISION__, 0)
 
 /*
  ***********************************************************************
@@ -20,7 +20,7 @@
  */
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
-#if __RTEMS_MAJOR__>4 || (__RTEMS_MAJOR__==4 && __RTEMS_MINOR__>9) || (__RTEMS_MAJOR__==4 && __RTEMS_MINOR__==9 && __RTEMS_REVISION__==99)
+#if RTEMS_VERSION_INT >= VERSION_INT(4, 9, 99, 0)
 #  define CONFIGURE_UNIFIED_WORK_AREAS
 #else
 #  define CONFIGURE_EXECUTIVE_RAM_SIZE (2000*1024)

=== renamed file 'src/libCom/RTEMS/rtems_netconfig.c' => 'src/libCom/RTEMS/kernel/rtems_netconfig.c'
--- src/libCom/RTEMS/rtems_netconfig.c	2016-05-22 12:38:18 +0000
+++ src/libCom/RTEMS/kernel/rtems_netconfig.c	2017-05-01 18:36:52 +0000
@@ -19,55 +19,70 @@
 extern void rtems_bsdnet_loopattach();
 static struct rtems_bsdnet_ifconfig loopback_config = {
     "lo0",                          /* name */
-    (int (*)(struct rtems_bsdnet_ifconfig *, int))rtems_bsdnet_loopattach, /* attach function */
-    NULL,                           /* link to next interface */
+    (int (*)(struct rtems_bsdnet_ifconfig *, int))rtems_bsdnet_loopattach,
+    NULL,                           /* last interface */
     "127.0.0.1",                    /* IP address */
     "255.0.0.0",                    /* IP net mask */
 };
 
+#define stringOf(x) #x
+#define STRING(x) stringOf(x)
+
 /*
- * The following conditionals select the network interface card.
- *
- * On RTEMS-pc386 targets all network drivers which support run-time
- * probing are linked. 
- * On other targets the network interface specified by the board-support
- * package is used.
- * To use a different NIC for a particular application, copy this file to the
- * application directory and make the appropriate changes.
+ * The following configures up to 2 network interface card(s) using
+ * settings in either configure/os/CONFIG_SITE.Common.RTEMS or in a
+ * BSP-specific configure/os/CONFIG_SITE.Common.RTEMS-<bsp> file.
+ * If no settings are provided, it uses the BSP's defaults instead.
  */
-#if defined(__i386__)
-extern int rtems_fxp_attach (struct rtems_bsdnet_ifconfig *, int);
-static struct rtems_bsdnet_ifconfig fxp_driver_config = {
-    "fxp1",                             /* name */
-    rtems_fxp_attach,                   /* attach function */
-    &loopback_config,                   /* link to next interface */
-};
-extern int rtems_3c509_driver_attach (struct rtems_bsdnet_ifconfig *, int);
-static struct rtems_bsdnet_ifconfig e3c509_driver_config = {
-    "ep0",                              /* name */
-    rtems_3c509_driver_attach,          /* attach function */
-    &fxp_driver_config,                 /* link to next interface */
-};
-#define FIRST_DRIVER_CONFIG &e3c509_driver_config
-#else
-
-# if defined(__PPC)
-  /*
-   * FIXME: This really belongs in the BSP
-   */
-#  ifndef RTEMS_BSP_NETWORK_DRIVER_NAME
-#   define RTEMS_BSP_NETWORK_DRIVER_NAME "dc1"
-#  endif
-#  ifndef RTEMS_BSP_NETWORK_DRIVER_ATTACH
-#   define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_dec21140_driver_attach
-    extern int rtems_dec21140_driver_attach();
-#  endif
-# endif
-
+
+#if defined(RTEMS_NETWORK_DRIVER_NAME_1)
+
+  #if defined(RTEMS_NETWORK_DRIVER_NAME_2)
+    static struct rtems_bsdnet_ifconfig netdriver_config_2 = {
+        STRING(RTEMS_NETWORK_DRIVER_NAME_2),
+    #if defined(RTEMS_NETWORK_DRIVER_ATTACH_2)
+        RTEMS_NETWORK_DRIVER_ATTACH_2,  /* specific attach function */
+    #else
+        RTEMS_BSP_NETWORK_DRIVER_ATTACH,    /* default attach function */
+    #endif
+        &loopback_config,                   /* loopback interface */
+    #if defined(RTEMS_NETWORK_IP4_ADDR_2)
+        STRING(RTEMS_NETWORK_IP4_ADDR_2),
+      #if defined(RTEMS_NETWORK_IP4_MASK_2)
+        STRING(RTEMS_NETWORK_IP4_MASK_2),
+      #endif
+    #endif
+    };
+  #endif /* RTEMS_NETWORK_DRIVER_NAME_2 */
+
+  static struct rtems_bsdnet_ifconfig netdriver_config = {
+      STRING(RTEMS_NETWORK_DRIVER_NAME_1),
+  #if defined(RTEMS_NETWORK_DRIVER_ATTACH_1)
+      RTEMS_NETWORK_DRIVER_ATTACH_1,  /* specific attach function */
+  #else
+      RTEMS_BSP_NETWORK_DRIVER_ATTACH,    /* default attach function */
+  #endif
+  #if defined(RTEMS_NETWORK_DRIVER_NAME_2)
+      &netdriver_config_2,                /* link to next interface */
+  #else
+      &loopback_config,                   /* loopback interface */
+  #endif
+  #if defined(RTEMS_NETWORK_IP4_ADDR_1)
+      STRING(RTEMS_NETWORK_IP4_ADDR_1),
+    #if defined(RTEMS_NETWORK_IP4_MASK_1)
+      STRING(RTEMS_NETWORK_IP4_MASK_1),
+    #endif
+  #endif
+  };
+  #define FIRST_DRIVER_CONFIG &netdriver_config
+
+#else /* RTEMS_NETWORK_DRIVER_NAME_1 */
+
+/* Use the BSP-provided standard macros */
 static struct rtems_bsdnet_ifconfig bsp_driver_config = {
     RTEMS_BSP_NETWORK_DRIVER_NAME,      /* name */
     RTEMS_BSP_NETWORK_DRIVER_ATTACH,    /* attach function */
-    &loopback_config,                   /* link to next interface */
+    &loopback_config,                   /* loopback interface */
 };
 #define FIRST_DRIVER_CONFIG &bsp_driver_config
 
@@ -77,9 +92,7 @@
  * Allow configure/os/CONFIG_SITE.Common.RTEMS to provide domain name
  */
 #ifdef RTEMS_NETWORK_CONFIG_DNS_DOMAINNAME
-# define XSTR(x) STR(x)
-# define STR(x) #x
-# define MY_DOMAINNAME XSTR(RTEMS_NETWORK_CONFIG_DNS_DOMAINNAME)
+# define MY_DOMAINNAME STRING(RTEMS_NETWORK_CONFIG_DNS_DOMAINNAME)
 #else
 # define MY_DOMAINNAME NULL
 #endif

=== added directory 'src/libCom/RTEMS/posix'
=== added file 'src/libCom/RTEMS/posix/rtems_config.c'
--- src/libCom/RTEMS/posix/rtems_config.c	1970-01-01 00:00:00 +0000
+++ src/libCom/RTEMS/posix/rtems_config.c	2017-05-01 18:36:52 +0000
@@ -0,0 +1,88 @@
+/*************************************************************************\
+* Copyright (c) 2002 The University of Saskatchewan
+* Copyright (c) 2017 Fritz-Haber-Institut der Max-Planck-Gesellschafto* EPICS
+* BASE is distributed subject to a Software License Agreement found
+* * in file LICENSE that is included with this distribution.
+\*************************************************************************/
+/*
+ * RTEMS configuration for EPICS
+ *      Author: W. Eric Norum
+ *              Heinz Junkes
+ *
+ * Version for RTEMS-4.12
+ */
+
+#include <rtems.h>
+
+/*
+ ***********************************************************************
+ *                         RTEMS CONFIGURATION                         *
+ ***********************************************************************
+ */
+
+extern void *EPICS_WITH_POSIX_Init(void *argument);
+ 
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+#define CONFIGURE_POSIX_INIT_THREAD_ENTRY_POINT EPICS_WITH_POSIX_Init
+/*
+ * nfs is using rtems tasks
+ */
+#define CONFIGURE_MAXIMUM_TASKS 		5 
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES    	5
+#define CONFIGURE_MAXIMUM_SEMAPHORES  		5
+#define CONFIGURE_MAXIMUM_EVENTS    		5
+
+#define CONFIGURE_MAXIMUM_POSIX_MUTEXES     	300
+#define CONFIGURE_MAXIMUM_POSIX_THREADS     	200
+#define CONFIGURE_MAXIMUM_POSIX_KEYS            200 	
+#define CONFIGURE_MAXIMUM_POSIX_KEY_VALUE_PAIRS 200 
+#define CONFIGURE_MAXIMUM_POSIX_SPINLOCKS   	100
+#define CONFIGURE_MAXIMUM_POSIX_SEMAPHORES  	300
+#define CONFIGURE_MAXIMUM_POSIX_TIMERS      	100
+#define CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUES  100
+#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 300
+ 
+#define CONFIGURE_UNIFIED_WORK_AREAS
+
+#define CONFIGURE_MAXIMUM_PERIODS 	5
+#define CONFIGURE_MICROSECONDS_PER_TICK 10000
+#define CONFIGURE_MALLOC_STATISTICS     1
+/* MINIMUM_STACK_SIZE == 8K */
+#define CONFIGURE_EXTRA_TASK_STACKS         (1000 * RTEMS_MINIMUM_STACK_SIZE)
+ 
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+ 
+#define CONFIGURE_FILESYSTEM_DEVFS
+#define CONFIGURE_FILESYSTEM_TFTPFS
+#define CONFIGURE_FILESYSTEM_NFS
+#define CONFIGURE_FILESYSTEM_IMFS
+#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
+#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 150
+ 
+#define CONFIGURE_MAXIMUM_NFS_MOUNTS 		3
+#define CONFIGURE_MAXIMUM_USER_EXTENSIONS 	5
+
+#define CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE  (64*1024)
+ 
+#define CONFIGURE_MAXIMUM_DRIVERS 8
+
+//#define CONFIGURE_INITIAL_EXTENSIONS { .fatal = fatal_extension }
+
+#define CONFIGURE_INIT
+
+
+/*
+ * This should be made BSP dependent, not CPU dependent but I know of no
+ * appropriate conditionals to use.
+ * The new general time support makes including the RTC driverr less important.
+ */
+#if !defined(mpc604) && !defined(__mc68040__) && !defined(__mcf5200__) && \
+    !defined(mpc7455) && !defined(__arm__)  && !defined(__nios2__)
+    /* don't have RTC code */
+#define CONFIGURE_APPLICATION_NEEDS_RTC_DRIVER
+#endif
+
+
+#include <bsp.h>
+#include <rtems/confdefs.h>

=== added file 'src/libCom/RTEMS/posix/rtems_netconfig.c'
--- src/libCom/RTEMS/posix/rtems_netconfig.c	1970-01-01 00:00:00 +0000
+++ src/libCom/RTEMS/posix/rtems_netconfig.c	2017-05-01 18:36:52 +0000
@@ -0,0 +1,126 @@
+/*************************************************************************\
+* Copyright (c) 2002 The University of Saskatchewan
+* Copyright (c) 2017 Fritz-Haber-Institut der Max-Planck-Gesellschaft
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution. 
+\*************************************************************************/
+/*
+ * RTEMS network configuration for EPICS
+ *      Author: W. Eric Norum
+ *              Heinz Junkes
+ *
+ * Version for RTEMS-4.12
+ *
+ * This file can be copied to an application source dirctory
+ * and modified to override the values shown below.
+ */
+#include <stdio.h>
+#include <bsp.h>
+#include <rtems/rtems_bsdnet.h>
+
+#define stringOf(x) #x
+#define STRING(x) stringOf(x)
+
+/*
+ * The following configures up to 2 network interface card(s) using
+ * settings in either configure/os/CONFIG_SITE.Common.RTEMS or in a
+ * BSP-specific configure/os/CONFIG_SITE.Common.RTEMS-<bsp> file.
+ * If no settings are provided, it uses the BSP's defaults instead.
+ */
+
+#if defined(RTEMS_NETWORK_DRIVER_NAME_1)
+
+  #if defined(RTEMS_NETWORK_DRIVER_NAME_2)
+    static struct rtems_bsdnet_ifconfig netdriver_config_2 = {
+        STRING(RTEMS_NETWORK_DRIVER_NAME_2),
+    #if defined(RTEMS_NETWORK_DRIVER_ATTACH_2)
+        RTEMS_NETWORK_DRIVER_ATTACH_2,  /* specific attach function */
+    #else
+        RTEMS_BSP_NETWORK_DRIVER_ATTACH,    /* default attach function */
+    #endif
+        NULL,                               /* last interface */
+    #if defined(RTEMS_NETWORK_IP4_ADDR_2)
+        STRING(RTEMS_NETWORK_IP4_ADDR_2),
+      #if defined(RTEMS_NETWORK_IP4_MASK_2)
+        STRING(RTEMS_NETWORK_IP4_MASK_2),
+      #endif
+    #endif
+    };
+  #endif /* RTEMS_NETWORK_DRIVER_NAME_2 */
+
+  static struct rtems_bsdnet_ifconfig netdriver_config = {
+      STRING(RTEMS_NETWORK_DRIVER_NAME_1),
+  #if defined(RTEMS_NETWORK_DRIVER_ATTACH_1)
+      RTEMS_NETWORK_DRIVER_ATTACH_1,  /* specific attach function */
+  #else
+      RTEMS_BSP_NETWORK_DRIVER_ATTACH,    /* default attach function */
+  #endif
+  #if defined(RTEMS_NETWORK_DRIVER_NAME_2)
+      &netdriver_config_2,                /* link to next interface */
+  #else
+      NULL,                               /* last interface */
+  #endif
+  #if defined(RTEMS_NETWORK_IP4_ADDR_1)
+      STRING(RTEMS_NETWORK_IP4_ADDR_1),
+    #if defined(RTEMS_NETWORK_IP4_MASK_1)
+      STRING(RTEMS_NETWORK_IP4_MASK_1),
+    #endif
+  #endif
+  };
+  #define FIRST_DRIVER_CONFIG &netdriver_config
+
+#else /* RTEMS_NETWORK_DRIVER_NAME_1 */
+
+/* Use the BSP-provided standard macros */
+static struct rtems_bsdnet_ifconfig bsp_driver_config = {
+    RTEMS_BSP_NETWORK_DRIVER_NAME,      /* name */
+    RTEMS_BSP_NETWORK_DRIVER_ATTACH,    /* attach function */
+    NULL,                               /* last interface */
+};
+#define FIRST_DRIVER_CONFIG &bsp_driver_config
+
+#endif
+
+/*
+ * Allow configure/os/CONFIG_SITE.Common.RTEMS to provide domain name
+ */
+#ifdef RTEMS_NETWORK_CONFIG_DNS_DOMAINNAME
+# define MY_DOMAINNAME STRING(RTEMS_NETWORK_CONFIG_DNS_DOMAINNAME)
+#else
+# define MY_DOMAINNAME NULL
+#endif
+
+/*
+ * Allow non-BOOTP network configuration
+ */
+#ifndef MY_DO_BOOTP
+# define MY_DO_BOOTP rtems_bsdnet_do_bootp
+#endif
+
+/*
+ * Allow site- and BSP-specific network buffer space configuration.
+ * The macro values are specified in KBytes.
+ */
+#ifndef RTEMS_NETWORK_CONFIG_MBUF_SPACE
+# define RTEMS_NETWORK_CONFIG_MBUF_SPACE 180
+#endif
+#ifndef RTEMS_NETWORK_CONFIG_CLUSTER_SPACE
+# define RTEMS_NETWORK_CONFIG_CLUSTER_SPACE 350
+#endif
+
+/*
+ * Network configuration
+ */
+struct rtems_bsdnet_config rtems_bsdnet_config = {
+    FIRST_DRIVER_CONFIG,   /* Link to next interface */
+    MY_DO_BOOTP,           /* How to find network config */
+    10,                    /* If 0 then the network daemons will run at a */
+                           /*   priority just less than the lowest-priority */
+                           /*   EPICS scan thread. */
+                           /* If non-zero then the network daemons will run */
+                           /*   at this *RTEMS* priority */
+    RTEMS_NETWORK_CONFIG_MBUF_SPACE*1024,
+    RTEMS_NETWORK_CONFIG_CLUSTER_SPACE*1024,
+    NULL,                  /* Host name */
+    MY_DOMAINNAME,         /* Domain name */
+};

=== modified file 'src/libCom/RTEMS/rtems_init.c'
--- src/libCom/RTEMS/rtems_init.c	2017-02-01 17:57:04 +0000
+++ src/libCom/RTEMS/rtems_init.c	2017-05-01 18:36:52 +0000
@@ -25,12 +25,19 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <rtems.h>
+#include <epicsVersion.h>
+#define RTEMS_VERSION_INT \
+    VERSION_INT(__RTEMS_MAJOR__, __RTEMS_MINOR__, __RTEMS_REVISION__, 0)
 #include <rtems/malloc.h>
 #include <rtems/error.h>
 #include <rtems/stackchk.h>
 #include <rtems/rtems_bsdnet.h>
 #include <rtems/imfs.h>
 #include <librtemsNfs.h>
+#if RTEMS_VERSION_INT >= VERSION_INT(4, 11, 99, 0)
+#include <rtems/libio.h>
+#include <sys/stat.h>
+#endif
 #include <bsp.h>
 
 #include "epicsThread.h"
@@ -44,6 +51,13 @@
 #include "osdTime.h"
 
 #include "epicsRtemsInitHooks.h"
+#if RTEMS_VERSION_INT >= VERSION_INT(4, 11, 99, 0)
+#include <rtems/malloc.h>
+#include <rtems/score/heap.h>
+#include <pthread.h>
+#include <assert.h>
+#define rtems_test_assert(_a) assert(_a)
+#endif
 
 /*
  * Prototypes for some functions not in header files
@@ -52,6 +66,49 @@
 int fileno(FILE *);
 int main(int argc, char **argv);
 
+//Helper function must be made useful
+#if RTEMS_VERSION_INT >= VERSION_INT(4, 11, 99, 0)
+
+static int get_current_prio( pthread_t thread ) 
+{ 
+rtems_status_code sc; 
+rtems_task_priority prio; 
+int max; 
+
+sc = rtems_task_set_priority( thread, RTEMS_CURRENT_PRIORITY, &prio ); 
+rtems_test_assert( sc == RTEMS_SUCCESSFUL ); 
+
+max = sched_get_priority_max( SCHED_FIFO ); 
+
+return max + 1 - (int) prio; 
+} 
+
+//We are using posix map osi 0-100 to posix 100-200
+int epicsThreadGetOsiPriorityValue(int ossPriority)
+{
+  if (ossPriority > 200) {
+    return epicsThreadPriorityMax;
+  }
+  else if (ossPriority < 100) {
+    return epicsThreadPriorityMin;
+  }
+  else {
+    return ((unsigned int)ossPriority - 100u);
+  }
+}
+int epicsThreadGetOssPriorityValue(unsigned int osiPriority)
+{
+  if (osiPriority > 99) {
+    return 200;
+  }
+  else {
+    return ((signed int)osiPriority + 100u);
+  }
+}
+#else
+/* see osdThread.c */
+#endif
+
 static void
 logReset (void)
 {
@@ -61,10 +118,12 @@
     if (fp) {
         char buf[80];
         fp(buf, sizeof buf);
-        errlogPrintf ("Startup after %s.\n", buf);
+        //errlogPrintf ("Startup after %s.\n", buf);
+        printk ("Startup after %s.\n", buf);
     }
     else {
-        errlogPrintf ("Startup.\n");
+        //errlogPrintf ("Startup.\n");
+        printk ("Startup.\n");
     }
 }
 
@@ -79,9 +138,12 @@
 static void
 delayedPanic (const char *msg)
 {
+#if RTEMS_VERSION_INT >= VERSION_INT(4, 11, 99, 0)
+    rtems_task_wake_after (rtems_clock_get_ticks_per_second());
+#else
     extern rtems_interval rtemsTicksPerSecond;
-
     rtems_task_wake_after (rtemsTicksPerSecond);
+#endif
     rtems_panic (msg);
 }
 
@@ -171,9 +233,7 @@
 }
 
 #ifndef OMIT_NFS_SUPPORT
-#if __RTEMS_MAJOR__>4 || \
-   (__RTEMS_MAJOR__==4 && __RTEMS_MINOR__>9) || \
-   (__RTEMS_MAJOR__==4 && __RTEMS_MINOR__==9 && __RTEMS_REVISION__==99)
+#if RTEMS_VERSION_INT >= VERSION_INT(4, 9, 99, 0)
 int
 nfsMount(char *uidhost, char *path, char *mntpoint)
 {
@@ -187,6 +247,13 @@
     }
     sprintf(dev, "%s:%s", uidhost, path);
     printf("Mount %s on %s\n", dev, mntpoint);
+#if RTEMS_VERSION_INT >= VERSION_INT(4, 11, 99, 0)
+   rval = mount_and_make_target_path (
+        dev, mntpoint, RTEMS_FILESYSTEM_TYPE_NFS,
+        RTEMS_FILESYSTEM_READ_WRITE, NULL );
+   if(rval)
+      perror("mount failed");
+#else
     if (rtems_mkdir(mntpoint, S_IRWXU | S_IRWXG | S_IRWXO))
         printf("Warning -- unable to make directory \"%s\"\n", mntpoint);
     if (mount(dev, mntpoint, RTEMS_FILESYSTEM_TYPE_NFS,
@@ -196,6 +263,7 @@
     else {
         rval = 0;
     }
+#endif
     free(dev);
     return rval;
 }
@@ -210,9 +278,7 @@
 {
 #ifdef OMIT_NFS_SUPPORT
     printf ("***** Initializing TFTP *****\n");
-#if __RTEMS_MAJOR__>4 || \
-   (__RTEMS_MAJOR__==4 && __RTEMS_MINOR__>9) || \
-   (__RTEMS_MAJOR__==4 && __RTEMS_MINOR__==9 && __RTEMS_REVISION__==99)
+#if RTEMS_VERSION_INT >= VERSION_INT(4, 9, 99, 0)
     mount_and_make_target_path(NULL,
                                "/TFTP",
                                RTEMS_FILESYSTEM_TYPE_TFTPFS,
@@ -246,6 +312,7 @@
     printf ("***** Initializing NFS *****\n");
     NFS_INIT
     if (env_nfsServer && env_nfsPath && env_nfsMountPoint) {
+        printf(" bin in environment kram ...\n");
         server_name = env_nfsServer;
         server_path = env_nfsPath;
         mount_point = env_nfsMountPoint;
@@ -309,10 +376,11 @@
                                           "%[^:] : / %s",
                                           pServerName,
                                           pServerPath + 1u );
+
                 if ( scanfStatus ==  2 ) {
                     pServerPath[0u]= '/';
                     server_name = pServerName;
-                    server_path = pServerPath;
+                    server_path = mount_point = pServerPath;
                 }
                 else {
                     free ( pServerName );
@@ -332,8 +400,6 @@
             argv[1] = abspath;
         }
     }
-    errlogPrintf("nfsMount(\"%s\", \"%s\", \"%s\")\n",
-                 server_name, server_path, mount_point);
     nfsMount(server_name, server_path, mount_point);
 #endif
 }
@@ -357,7 +423,6 @@
         perror("error: fixup_hosts stat /etc/hosts");
         return;
     }
-
     ret = mkdir("/etc", 0775);
     if(ret!=0 && errno!=EEXIST)
     {
@@ -374,7 +439,6 @@
     {
         perror("error: failed to write /etc/hosts");
     }
-
     fclose(fp);
 }
 
@@ -444,11 +508,19 @@
 static const iocshFuncDef heapSpaceFuncDef = {"heapSpace",0,NULL};
 static void heapSpaceCallFunc(const iocshArgBuf *args)
 {
+#if RTEMS_VERSION_INT >= VERSION_INT(4, 11, 99, 0)
+    Heap_Information_block info;
+    double x;
+
+    malloc_info (&info);
+    x = info.Stats.size - (unsigned long)(info.Stats.lifetime_allocated - info.Stats.lifetime_freed);
+#else
     rtems_malloc_statistics_t s;
     double x;
 
     malloc_get_statistics(&s);
     x = s.space_available - (unsigned long)(s.lifetime_allocated - s.lifetime_freed);
+#endif
     if (x >= 1024*1024)
         printf("Heap space: %.1f MB\n", x / (1024 * 1024));
     else
@@ -513,13 +585,14 @@
  * Ensure that the configuration object files
  * get pulled in from the library
  */
-extern rtems_configuration_table Configuration;
+#if RTEMS_VERSION_INT < VERSION_INT(4, 11, 99, 0)
+extern rtems_configuration_table Configuration;                      
 extern struct rtems_bsdnet_config rtems_bsdnet_config;
 const void *rtemsConfigArray[] = {
     &Configuration,
     &rtems_bsdnet_config
 };
-
+#endif
 /*
  * Hook to ensure that BSP cleanup code gets run on exit
  */
@@ -532,13 +605,21 @@
 /*
  * RTEMS Startup task
  */
+#if RTEMS_VERSION_INT >= VERSION_INT(4, 11, 99, 0)
+void *
+EPICS_WITH_POSIX_Init (void *argument)
+#else
 rtems_task
 Init (rtems_task_argument ignored)
+#endif
 {
+<<<<<<< TREE
     int                 result;
+=======
+    int                i;
+>>>>>>> MERGE-SOURCE
     char               *argv[3]         = { NULL, NULL, NULL };
     char               *cp;
-    rtems_task_priority newpri;
     rtems_status_code   sc;
     rtems_time_of_day   now;
 
@@ -562,10 +643,20 @@
     /*
      * Override RTEMS configuration
      */
-    rtems_task_set_priority (
-                     RTEMS_SELF,
-                     epicsThreadGetOssPriorityValue(epicsThreadPriorityIocsh),
-                     &newpri);
+#if RTEMS_VERSION_INT >= VERSION_INT(4, 11, 99, 0)
+    int policy;
+    struct sched_param param;
+
+    if (pthread_getschedparam(pthread_self(), &policy, &param) != 0)
+      delayedPanic("pthread_getschedparam failed");
+    param.sched_priority = epicsThreadGetOssPriorityValue(epicsThreadPriorityIocsh);
+    if (pthread_setschedparam(pthread_self(), policy, &param) != 0)
+      delayedPanic("pthread_setschedparam failed");
+#else
+    rtems_task_priority newpri;
+    rtems_task_set_priority (RTEMS_SELF,
+        epicsThreadGetOssPriorityValue(epicsThreadPriorityIocsh), &newpri);
+#endif
 
     /*
      * Create a reasonable environment
@@ -580,6 +671,7 @@
     printf("\n***** RTEMS Version: %s *****\n",
         rtems_get_version_string());
 
+    printf("\n***** RTEMS min stack size : %d\n", RTEMS_MINIMUM_STACK_SIZE);
     /*
      * Start network
      */
@@ -616,12 +708,16 @@
      * It is very likely that other time synchronization facilities in EPICS
      * will soon override this value.
      */
+#if RTEMS_VERSION_INT >= VERSION_INT(4, 11, 99, 0)
+    if (rtems_clock_get_tod(&now) != RTEMS_SUCCESSFUL) {
+#else
     if (rtems_clock_get(RTEMS_CLOCK_GET_TOD,&now) != RTEMS_SUCCESSFUL) {
-        now.year = 2001;
-        now.month = 1;
-        now.day = 1;
-        now.hour = 0;
-        now.minute = 0;
+#endif
+        now.year = 2012;
+        now.month = 4;
+        now.day = 14;
+        now.hour = 7;
+        now.minute = 23;
         now.second = 0;
         now.ticks = 0;
         if ((sc = rtems_clock_set (&now)) != RTEMS_SUCCESSFUL)
@@ -649,7 +745,23 @@
         }
     }
     tzset();
+#if RTEMS_VERSION_INT >= VERSION_INT(4, 11, 99, 0)
+    // osdTimeRegister() was called during C++ initialization
+#else
     osdTimeRegister();
+#endif
+
+    /*
+     * Some network diagnotics
+     */
+
+     // rtems_bsdnet_show_mbuf_stats (void);
+     rtems_bsdnet_show_if_stats ();
+     rtems_bsdnet_show_ip_stats ();
+     rtems_bsdnet_show_icmp_stats ();
+     rtems_bsdnet_show_inet_routes ();
+     //rtems_bsdnet_show_udp_stats (void);
+     //rtems_bsdnet_show_tcp_stats (void);
 
     /*
      * Run the EPICS startup script
@@ -664,5 +776,12 @@
     result = main ((sizeof argv / sizeof argv[0]) - 1, argv);
     printf ("***** IOC application terminating *****\n");
     epicsThreadSleep(1.0);
+<<<<<<< TREE
     epicsExit(result);
+=======
+    epicsExit(0);
+#if RTEMS_VERSION_INT >= VERSION_INT(4, 11, 99, 0)
+    return NULL;
+#endif
+>>>>>>> MERGE-SOURCE
 }

=== modified file 'src/libCom/calc/postfix.c'
--- src/libCom/calc/postfix.c	2016-05-22 12:38:18 +0000
+++ src/libCom/calc/postfix.c	2017-05-01 18:36:52 +0000
@@ -27,6 +27,10 @@
 #include "postfixPvt.h"
 #include "shareLib.h"
 
+#ifdef USE_ALTIVEC
+#pragma GCC push_options
+#pragma GCC optimize ("O0")
+#endif
 
 /* declarations for postfix */
 
@@ -624,3 +628,13 @@
 	}
     }
 }
+/*
+#if __RTEMS_MAJOR__>4 || \
+	   (__RTEMS_MAJOR__==4 && __RTEMS_MINOR__>11) || \
+   (__RTEMS_MAJOR__==4 && __RTEMS_MINOR__==11 && __RTEMS_REVISION__==99)
+*/
+#ifdef USE_ALTIVEC
+#pragma GCC pop_options
+#endif
+/* #endif */
+

=== modified file 'src/libCom/error/errlog.c'
--- src/libCom/error/errlog.c	2015-08-13 15:44:52 +0000
+++ src/libCom/error/errlog.c	2017-05-01 18:36:52 +0000
@@ -34,6 +34,10 @@
 #include "epicsStdio.h"
 #include "epicsExit.h"
 
+#if defined(__rtems__)
+#include <rtems/bspIo.h>
+#include <rtems.h>
+#endif
 
 #define BUFFER_SIZE 1280
 #define MAX_MESSAGE_SIZE 256
@@ -117,6 +121,7 @@
     }
 
     errlogInit(0);
+
     isOkToBlock = epicsThreadIsOkToBlock();
 
     if (pvtData.atExit || (isOkToBlock && pvtData.toConsole)) {

=== modified file 'src/libCom/misc/epicsUnitTest.c'
--- src/libCom/misc/epicsUnitTest.c	2016-05-22 12:38:18 +0000
+++ src/libCom/misc/epicsUnitTest.c	2017-05-01 18:36:52 +0000
@@ -248,6 +248,7 @@
 
 void testHarness(void) {
     epicsThreadOnce(&onceFlag, testOnce, NULL);
+epicsThreadShowAll(1);
     epicsAtExit(testHarnessExit, NULL);
     Harness = 1;
     Programs = 0;

=== modified file 'src/libCom/osi/os/Linux/osdSock.h'
--- src/libCom/osi/os/Linux/osdSock.h	2017-01-23 23:20:51 +0000
+++ src/libCom/osi/os/Linux/osdSock.h	2017-05-01 18:36:52 +0000
@@ -26,8 +26,10 @@
 #include <arpa/inet.h>
 #include <net/if.h>
 #include <netdb.h>
+#include <ifaddrs.h> /* getifaddrs() */
 #include <unistd.h> /* close() and others */
 
+#define USE_IFADDRS
 
 typedef int                     SOCKET;
 #define INVALID_SOCKET          (-1)

=== added directory 'src/libCom/osi/os/RTEMS-kernel'
=== renamed file 'src/libCom/osi/os/RTEMS/devLibVMEOSD.c' => 'src/libCom/osi/os/RTEMS-kernel/devLibVMEOSD.c'
=== renamed file 'src/libCom/osi/os/RTEMS/epicsAtomicOSD.cpp' => 'src/libCom/osi/os/RTEMS-kernel/epicsAtomicOSD.cpp'
=== renamed file 'src/libCom/osi/os/RTEMS/epicsAtomicOSD.h' => 'src/libCom/osi/os/RTEMS-kernel/epicsAtomicOSD.h'
=== renamed file 'src/libCom/osi/os/RTEMS/osdEvent.c' => 'src/libCom/osi/os/RTEMS-kernel/osdEvent.c'
=== renamed file 'src/libCom/osi/os/RTEMS/osdEvent.h' => 'src/libCom/osi/os/RTEMS-kernel/osdEvent.h'
=== renamed file 'src/libCom/osi/os/RTEMS/osdFindSymbol.c' => 'src/libCom/osi/os/RTEMS-kernel/osdFindSymbol.c'
=== renamed file 'src/libCom/osi/os/RTEMS/osdMessageQueue.c' => 'src/libCom/osi/os/RTEMS-kernel/osdMessageQueue.c'
=== renamed file 'src/libCom/osi/os/RTEMS/osdMessageQueue.h' => 'src/libCom/osi/os/RTEMS-kernel/osdMessageQueue.h'
=== renamed file 'src/libCom/osi/os/RTEMS/osdMutex.c' => 'src/libCom/osi/os/RTEMS-kernel/osdMutex.c'
=== renamed file 'src/libCom/osi/os/RTEMS/osdMutex.h' => 'src/libCom/osi/os/RTEMS-kernel/osdMutex.h'
=== renamed file 'src/libCom/osi/os/RTEMS/osdPoolStatus.c' => 'src/libCom/osi/os/RTEMS-kernel/osdPoolStatus.c'
=== renamed file 'src/libCom/osi/os/RTEMS/osdProcess.c' => 'src/libCom/osi/os/RTEMS-kernel/osdProcess.c'
=== renamed file 'src/libCom/osi/os/RTEMS/osdReadline.c' => 'src/libCom/osi/os/RTEMS-kernel/osdReadline.c'
=== renamed file 'src/libCom/osi/os/RTEMS/osdSignal.cpp' => 'src/libCom/osi/os/RTEMS-kernel/osdSignal.cpp'
=== renamed file 'src/libCom/osi/os/RTEMS/osdSock.h' => 'src/libCom/osi/os/RTEMS-kernel/osdSock.h'
=== renamed file 'src/libCom/osi/os/RTEMS/osdSpin.c' => 'src/libCom/osi/os/RTEMS-kernel/osdSpin.c'
=== renamed file 'src/libCom/osi/os/RTEMS/osdStrtod.h' => 'src/libCom/osi/os/RTEMS-kernel/osdStrtod.h'
=== renamed file 'src/libCom/osi/os/RTEMS/osdThread.c' => 'src/libCom/osi/os/RTEMS-kernel/osdThread.c'
=== renamed file 'src/libCom/osi/os/RTEMS/osdThread.h' => 'src/libCom/osi/os/RTEMS-kernel/osdThread.h'
=== renamed file 'src/libCom/osi/os/RTEMS/osdThreadExtra.c' => 'src/libCom/osi/os/RTEMS-kernel/osdThreadExtra.c'
=== renamed file 'src/libCom/osi/os/RTEMS/osdTime.cpp' => 'src/libCom/osi/os/RTEMS-kernel/osdTime.cpp'
=== renamed file 'src/libCom/osi/os/RTEMS/osdTime.h' => 'src/libCom/osi/os/RTEMS-kernel/osdTime.h'
=== renamed file 'src/libCom/osi/os/RTEMS/osiUnistd.h' => 'src/libCom/osi/os/RTEMS-kernel/osiUnistd.h'
=== added directory 'src/libCom/osi/os/RTEMS-posix'
=== added file 'src/libCom/osi/os/RTEMS-posix/devLibVMEOSD.c'
--- src/libCom/osi/os/RTEMS-posix/devLibVMEOSD.c	1970-01-01 00:00:00 +0000
+++ src/libCom/osi/os/RTEMS-posix/devLibVMEOSD.c	2017-05-01 18:36:52 +0000
@@ -0,0 +1,367 @@
+/*************************************************************************\
+* Copyright (c) 2008 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.
+* Copyright (c) 2017 Fritz-Haber-Institut der Max-Planck-Gesellschaft
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution. 
+\*************************************************************************/
+
+/*      RTEMS port by Till Straumann, <[e-mail]>
+ *            3/2002
+ *
+ *  Adapted to rtems4.12
+ *    removed include bsp/bspExt.h
+ */
+
+#include <epicsStdio.h>
+#include <epicsExit.h>
+#include <rtems.h>
+#include <bsp.h>
+#include "devLibVME.h"
+#include <epicsInterrupt.h>
+
+#if defined(__PPC__) || defined(__mcf528x__)
+
+#if defined(__PPC__)
+#include <bsp/VME.h>
+#endif
+
+
+typedef void    myISR (void *pParam);
+
+static myISR *isrFetch(unsigned vectorNumber, void **parg);
+
+/*
+ * this routine needs to be in the symbol table
+ * for this code to work correctly
+ */
+static void unsolicitedHandlerEPICS(int vectorNumber);
+
+static myISR *defaultHandlerAddr[]={
+    (myISR*)unsolicitedHandlerEPICS,
+};
+
+/*
+ * Make sure that the CR/CSR addressing mode is defined.
+ * (it may not be in some BSPs).
+ */
+#ifndef VME_AM_CSR
+#  define VME_AM_CSR (0x2f)
+#endif
+
+/*
+ * we use a translation between an EPICS encoding
+ * and a vxWorks encoding here
+ * to reduce dependency of drivers on vxWorks
+ *
+ * we assume that the BSP are configured to use these
+ * address modes by default
+ */
+#define EPICSAddrTypeNoConvert -1
+int EPICStovxWorksAddrType[] 
+                = {
+                VME_AM_SUP_SHORT_IO,
+                VME_AM_STD_SUP_DATA,
+                VME_AM_EXT_SUP_DATA,
+                EPICSAddrTypeNoConvert,
+                VME_AM_CSR
+            };
+
+/*
+ * maps logical address to physical address, but does not detect
+ * two device drivers that are using the same address range
+ */
+static long rtemsDevMapAddr (epicsAddressType addrType, unsigned options,
+        size_t logicalAddress, size_t size, volatile void **ppPhysicalAddress);
+
+/*
+ * a bus error safe "wordSize" read at the specified address which returns 
+ * unsuccessful status if the device isnt present
+ */
+static long rtemsDevReadProbe (unsigned wordSize, volatile const void *ptr, void *pValue);
+
+/*
+ * a bus error safe "wordSize" write at the specified address which returns 
+ * unsuccessful status if the device isnt present
+ */
+static long rtemsDevWriteProbe (unsigned wordSize, volatile void *ptr, const void *pValue);
+
+static long rtemsDevConnectInterruptVME (
+    unsigned vectorNumber,
+    void (*pFunction)(),
+    void  *parameter);
+
+static long rtemsDevDisconnectInterruptVME (
+    unsigned vectorNumber,
+    void (*pFunction)() 
+);
+
+static long rtemsDevEnableInterruptLevelVME (unsigned level);
+
+static long rtemsDevDisableInterruptLevelVME (unsigned level);
+
+static int rtemsDevInterruptInUseVME (unsigned vectorNumber);
+
+/* RTEMS specific init */
+
+/*devA24Malloc and devA24Free are not implemented*/
+static void *devA24Malloc(size_t size) { return 0;}
+static void devA24Free(void *pBlock) {};
+static long rtemsDevInit(void);
+
+/*
+ * used by bind in devLib.c
+ */
+static devLibVME rtemsVirtualOS = {
+    rtemsDevMapAddr, rtemsDevReadProbe, rtemsDevWriteProbe, 
+    rtemsDevConnectInterruptVME, rtemsDevDisconnectInterruptVME,
+    rtemsDevEnableInterruptLevelVME, rtemsDevDisableInterruptLevelVME,
+    devA24Malloc,devA24Free,rtemsDevInit,rtemsDevInterruptInUseVME
+};
+devLibVME *pdevLibVME = &rtemsVirtualOS;
+
+/* RTEMS specific initialization */
+static long
+rtemsDevInit(void)
+{
+    /* assume the vme bridge has been initialized by bsp */
+    /* init BSP extensions [memProbe etc.] */
+    return bspExtInit();
+}
+
+/*
+ * devConnectInterruptVME
+ *
+ * wrapper to minimize driver dependency on OS
+ */
+static long rtemsDevConnectInterruptVME (
+    unsigned vectorNumber,
+    void (*pFunction)(),
+    void  *parameter)
+{
+    int status;
+
+
+    if (devInterruptInUseVME(vectorNumber)) {
+        return S_dev_vectorInUse; 
+    }
+    status = BSP_installVME_isr(
+            vectorNumber,
+            pFunction,
+            parameter);       
+    if (status) {
+        return S_dev_vecInstlFail;
+    }
+
+    return 0;
+}
+
+/*
+ *
+ *  devDisconnectInterruptVME()
+ *
+ *  wrapper to minimize driver dependency on OS
+ *
+ *  The parameter pFunction should be set to the C function pointer that 
+ *  was connected. It is used as a key to prevent a driver from removing 
+ *  an interrupt handler that was installed by another driver
+ *
+ */
+static long rtemsDevDisconnectInterruptVME (
+    unsigned vectorNumber,
+    void (*pFunction)() 
+)
+{
+    void (*psub)();
+    void  *arg;
+    int status;
+
+    /*
+     * If pFunction not connected to this vector
+     * then they are probably disconnecting from the wrong vector
+     */
+    psub = isrFetch(vectorNumber, &arg);
+    if(psub != pFunction){
+        return S_dev_vectorNotInUse;
+    }
+
+    status = BSP_removeVME_isr(
+        vectorNumber,
+        psub,
+        arg) ||
+     BSP_installVME_isr(
+        vectorNumber,
+        (BSP_VME_ISR_t)unsolicitedHandlerEPICS,
+        (void*)vectorNumber);        
+    if(status){
+        return S_dev_vecInstlFail;
+    }
+
+    return 0;
+}
+
+/*
+ * enable VME interrupt level
+ */
+static long rtemsDevEnableInterruptLevelVME (unsigned level)
+{
+    return BSP_enableVME_int_lvl(level);
+}
+
+/*
+ * disable VME interrupt level
+ */
+static long rtemsDevDisableInterruptLevelVME (unsigned level)
+{
+    return BSP_disableVME_int_lvl(level);
+}
+
+/*
+ * rtemsDevMapAddr ()
+ */
+static long rtemsDevMapAddr (epicsAddressType addrType, unsigned options,
+            size_t logicalAddress, size_t size, volatile void **ppPhysicalAddress)
+{
+    long status;
+
+    if (ppPhysicalAddress==NULL) {
+        return S_dev_badArgument;
+    }
+
+    if (EPICStovxWorksAddrType[addrType] == EPICSAddrTypeNoConvert)
+    {
+        *ppPhysicalAddress = (void *) logicalAddress;
+    }
+    else
+    {
+        status = BSP_vme2local_adrs(EPICStovxWorksAddrType[addrType],
+                        logicalAddress, (unsigned long *)ppPhysicalAddress);
+        if (status) {
+            return S_dev_addrMapFail;
+        }
+    }
+
+    return 0;
+}
+
+/*
+ * a bus error safe "wordSize" read at the specified address which returns 
+ * unsuccessful status if the device isnt present
+ */
+rtems_status_code bspExtMemProbe(void *addr, int write, int size, void *pval);
+static long rtemsDevReadProbe (unsigned wordSize, volatile const void *ptr, void *pValue)
+{
+    long status;
+
+    /*
+     * this global variable exists in the nivxi library
+     */
+    status = bspExtMemProbe ((void*)ptr, 0/*read*/, wordSize, pValue);
+    if (status!=RTEMS_SUCCESSFUL) {
+        return S_dev_noDevice;
+    }
+
+    return 0;
+}
+
+/*
+ * a bus error safe "wordSize" write at the specified address which returns 
+ * unsuccessful status if the device isnt present
+ */
+static long rtemsDevWriteProbe (unsigned wordSize, volatile void *ptr, const void *pValue)
+{
+    long status;
+
+    /*
+     * this global variable exists in the nivxi library
+     */
+    status = bspExtMemProbe ((void*)ptr, 1/*write*/, wordSize, (void*)pValue);
+    if (status!=RTEMS_SUCCESSFUL) {
+        return S_dev_noDevice;
+    }
+
+    return 0;
+}
+
+/*
+ *      isrFetch()
+ */
+static myISR *isrFetch(unsigned vectorNumber, void **parg)
+{
+    /*
+     * fetch the handler or C stub attached at this vector
+     */
+    return (myISR *) BSP_getVME_isr(vectorNumber,parg);
+}
+
+/*
+ * determine if a VME interrupt vector is in use
+ */
+static int rtemsDevInterruptInUseVME (unsigned vectorNumber)
+{
+    int i;
+    myISR *psub;
+    void *arg;
+
+    psub = isrFetch (vectorNumber,&arg);
+
+    if (!psub)
+        return FALSE;
+
+    /*
+     * its a C routine. Does it match a default handler?
+     */
+    for (i=0; i<NELEMENTS(defaultHandlerAddr); i++) {
+        if (defaultHandlerAddr[i] == psub) {
+            return FALSE;
+        }
+    }
+
+    return TRUE;
+}
+
+
+/*
+ *  unsolicitedHandlerEPICS()
+ *      what gets called if they disconnect from an
+ *  interrupt and an interrupt arrives on the
+ *  disconnected vector
+ *
+ *  NOTE: RTEMS may pass additional arguments - hope
+ *        this doesn't disturb this handler...
+ *
+ *  A cleaner way would be having a OS dependent
+ *  macro to declare handler prototypes...
+ *
+ */
+static void unsolicitedHandlerEPICS(int vectorNumber)
+{
+    /*
+     * call epicInterruptContextMessage()
+     * and not errMessage()
+     * so we are certain that printf()
+     * does not get called at interrupt level
+     *
+     * NOTE: current RTEMS implementation only
+     *       allows a static string to be passed
+     */
+    epicsInterruptContextMessage(
+        "Interrupt to EPICS disconnected vector"
+        );
+}
+
+#endif /* defined(__PPC__) && defined(mpc750) */
+
+/*
+ * Some vxWorks convenience routines
+ */
+void
+bcopyLongs(char *source, char *destination, int nlongs)
+{
+    const long *s = (long *)source;
+    long *d = (long *)destination;
+    while(nlongs--)
+        *d++ = *s++;
+}

=== added file 'src/libCom/osi/os/RTEMS-posix/osdInterrupt.c'
--- src/libCom/osi/os/RTEMS-posix/osdInterrupt.c	1970-01-01 00:00:00 +0000
+++ src/libCom/osi/os/RTEMS-posix/osdInterrupt.c	2017-05-01 18:36:52 +0000
@@ -0,0 +1,59 @@
+/*************************************************************************\
+* Copyright (c) 2009 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. 
+\*************************************************************************/
+/* osi/default/osdInterrupt.c */
+
+/* Author:  Marty Kraimer Date:    15JUL99 */
+
+#include <stddef.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <stdio.h>
+
+#define epicsExportSharedSymbols
+#include "epicsMutex.h"
+#include "epicsThread.h"
+#include "cantProceed.h"
+#include "errlog.h"
+#include "epicsInterrupt.h"
+
+#include <rtems/bspIo.h>
+#include <rtems.h>
+
+epicsShareFunc int epicsInterruptLock()
+{
+    rtems_interrupt_level level;
+
+    rtems_interrupt_disable (level);
+    return level;
+}
+
+epicsShareFunc void epicsInterruptUnlock(int key)
+{
+    rtems_interrupt_level level = key;
+
+    rtems_interrupt_enable (level);
+}
+
+epicsShareFunc int epicsInterruptIsInterruptContext()
+{
+        return rtems_interrupt_is_in_progress ();
+}
+
+epicsShareFunc void epicsInterruptContextMessage(const char *message)
+{
+    printk("%s", message);
+}
+
+
+
+
+
+
+

=== added file 'src/libCom/osi/os/RTEMS-posix/osdMessageQueue.cpp'
--- src/libCom/osi/os/RTEMS-posix/osdMessageQueue.cpp	1970-01-01 00:00:00 +0000
+++ src/libCom/osi/os/RTEMS-posix/osdMessageQueue.cpp	2017-05-01 18:36:52 +0000
@@ -0,0 +1,163 @@
+/*************************************************************************\
+* 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.
+* Copyright (c) 2017 Fritz-Haber-Institut der Max-Planck-Gesellschaft
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
+\*************************************************************************/
+/*
+ *      Author  W. Eric Norum
+ *              Heinz Junkes
+ *
+ * Adapted to rtems4.12
+ *   -> posix message queues 
+ *   remove all internal calls (_xxx), remove e.g. Objects_Locations etc.
+ */
+
+/*
+ * We want to access information which is
+ * normally hidden from application programs.
+ */
+#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__ 1
+
+#define epicsExportSharedSymbols
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <rtems.h>
+#include <rtems/error.h>
+#include "epicsMessageQueue.h"
+#include "errlog.h"
+#include <epicsAtomic.h>
+
+#include <errno.h>
+#include <mqueue.h>
+#include <fcntl.h>
+
+epicsShareFunc epicsMessageQueueId epicsShareAPI
+epicsMessageQueueCreate(unsigned int capacity, unsigned int maximumMessageSize)
+{
+  struct mq_attr the_attr;
+  epicsMessageQueueId id = (epicsMessageQueueId)calloc(1, sizeof(*id));
+
+  epicsAtomicIncrIntT(&id->idCnt);
+  sprintf(id->name, "MQ_%010d",epicsAtomicGetIntT(&id->idCnt));    
+  the_attr.mq_maxmsg = capacity;
+  the_attr.mq_msgsize = maximumMessageSize;
+  id->id = mq_open(id->name, O_RDWR | O_CREAT | O_EXCL, 0644, &the_attr);
+  if (id->id < 0) { 
+    errlogPrintf ("Can't create message queue: %s\n", strerror (errno));
+    return NULL;
+  }
+  return id;
+}
+
+epicsShareFunc void epicsShareAPI epicsMessageQueueDestroy(
+    epicsMessageQueueId id)
+{
+  int rv;
+  rv = mq_close(id->id);
+  if( rv ) { 
+    errlogPrintf("epicsMessageQueueDestroy mq_close failed: %s\n",
+                         strerror(rv));
+  }
+  rv = mq_unlink(id->name);
+  if( rv ) { 
+    errlogPrintf("epicsMessageQueueDestroy mq_unlink %s failed: %s\n",
+                         id->name, strerror(rv));
+  }
+  free(id);
+}
+
+epicsShareFunc int epicsShareAPI epicsMessageQueueTrySend(
+    epicsMessageQueueId id,
+    void *message,
+    unsigned int messageSize)
+{
+  struct timespec ts;
+  clock_gettime(CLOCK_REALTIME, &ts);
+  return mq_timedsend(id->id, (char const *)message, messageSize, 0, &ts); 
+}
+
+epicsShareFunc int epicsShareAPI epicsMessageQueueSendWithTimeout(
+    epicsMessageQueueId id,
+    void *message,
+    unsigned int messageSize,
+    double timeout)
+{
+  struct timespec ts;
+  unsigned long micros;
+    
+  // assume timeout in sec
+  micros = (unsigned long)(timeout * 1000000.0);
+  clock_gettime(CLOCK_REALTIME, &ts);
+  ts.tv_sec += micros / 1000000L;
+  ts.tv_nsec += (micros % 1000000L) * 1000L;
+
+  return  mq_timedsend (id->id, (const char *)message, messageSize, 0, &ts);
+}
+
+epicsShareFunc int epicsShareAPI epicsMessageQueueTryReceive(
+    epicsMessageQueueId id,
+    void *message,
+    unsigned int size)
+{
+    struct timespec ts;
+    clock_gettime(CLOCK_REALTIME, &ts);
+    return mq_timedreceive(id->id, (char *)message, size, NULL, &ts);
+}
+
+epicsShareFunc int epicsShareAPI epicsMessageQueueReceiveWithTimeout(
+    epicsMessageQueueId id,
+    void *message,
+    unsigned int size,
+    double timeout)
+{
+    unsigned long micros;
+    struct timespec ts;
+    
+    micros = (unsigned long)(timeout * 1000000.0);
+    clock_gettime(CLOCK_REALTIME, &ts);
+    ts.tv_sec += micros / 1000000L;
+    ts.tv_nsec += (micros % 1000000L) * 1000L;
+
+    return mq_timedreceive(id->id, (char *)message, size, NULL, &ts);
+}
+
+epicsShareFunc int epicsShareAPI epicsMessageQueuePending(
+            epicsMessageQueueId id)
+{
+  int rv;
+  struct mq_attr the_attr;
+
+  rv = mq_getattr(id->id, &the_attr);    
+  if (rv) {
+    errlogPrintf("Epics Message queue %x (%s) get attr failed: %s\n",
+                         (unsigned int)id->id, id->name, strerror(rv));
+        return -1;
+    }
+    return the_attr.mq_curmsgs;
+}
+
+epicsShareFunc void epicsShareAPI epicsMessageQueueShow(
+            epicsMessageQueueId id,
+                int level)
+{
+  int rv;
+  struct mq_attr the_attr;
+
+  rv = mq_getattr(id->id, &the_attr);    
+  if (rv) {
+    errlogPrintf("Epics Message queue %x (%s) get attr failed: %s\n",
+                         (unsigned int)id->id, id->id, strerror(rv));
+    }
+
+    printf("Message Queue Used:%ld  Max Msg:%lu", the_attr.mq_curmsgs, the_attr.mq_maxmsg);
+    if (level >= 1)
+       printf("  Maximum size:%lu", the_attr.mq_msgsize);
+
+    printf("\n");
+}

=== added file 'src/libCom/osi/os/RTEMS-posix/osdMessageQueue.h'
--- src/libCom/osi/os/RTEMS-posix/osdMessageQueue.h	1970-01-01 00:00:00 +0000
+++ src/libCom/osi/os/RTEMS-posix/osdMessageQueue.h	2017-05-01 18:36:52 +0000
@@ -0,0 +1,31 @@
+/*************************************************************************\
+ * * 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.
+ * * Copyright (c) 2017 Fritz-Haber-Institut der Max-Planck-Gesellschaft
+ * * EPICS BASE is distributed subject to a Software License Agreement found
+ * * in file LICENSE that is included with this distribution.
+ * \*************************************************************************/
+/*
+ *      Author  W. Eric Norum
+ *              Heinz Junkes
+ *
+ * Eric's note : Very thin shims around vxWorks routines
+ *
+ * Adapted to rtems4.12
+ *   -> posix message queues 
+ */
+
+#include <rtems.h>
+#include <mqueue.h>
+
+struct epicsMessageQueueOSD {
+    mqd_t id;
+    char  name[24];
+    int	  idCnt;
+
+};
+
+#define epicsMessageQueueSend(q,m,l) (mq_send((q)->id, (const char*)(m), (l), 0))
+#define epicsMessageQueueReceive(q,m,s) (mq_receive((q)->id, (char*)(m), (s), NULL))

=== added file 'src/libCom/osi/os/RTEMS-posix/osdMutex.c'
--- src/libCom/osi/os/RTEMS-posix/osdMutex.c	1970-01-01 00:00:00 +0000
+++ src/libCom/osi/os/RTEMS-posix/osdMutex.c	2017-05-01 18:36:52 +0000
@@ -0,0 +1,6 @@
+#include <rtems.h>
+#include <rtems/error.h>
+#include <rtems/rtems/tasks.h>
+#include <rtems/score/threadimpl.h>
+
+#include "../posix/osdMutex.c"

=== added file 'src/libCom/osi/os/RTEMS-posix/osdPoolStatus.c'
--- src/libCom/osi/os/RTEMS-posix/osdPoolStatus.c	1970-01-01 00:00:00 +0000
+++ src/libCom/osi/os/RTEMS-posix/osdPoolStatus.c	2017-05-01 18:36:52 +0000
@@ -0,0 +1,34 @@
+/*************************************************************************\
+* 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.
+* Copyright (c) 2017 Fritz-Haber-Institut der Max-Planck-Gesellschaft
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution. 
+\*************************************************************************/
+
+/*
+ *     Heinz Junkes
+ *     Adapted to rtems4.12
+ */
+
+#include <rtems.h>
+#include <rtems/malloc.h>
+#include <rtems/score/heap.h>
+#define epicsExportSharedSymbols
+#include "osiPoolStatus.h"
+
+/*
+ * osiSufficentSpaceInPool ()
+ * 
+ */
+epicsShareFunc int epicsShareAPI osiSufficentSpaceInPool ( size_t contiguousBlockSize )
+{
+    unsigned long n;
+    Heap_Information_block info;
+
+    malloc_info( &info );
+    n = info.Stats.size - (unsigned long)(info.Stats.lifetime_allocated - info.Stats.lifetime_freed);
+    return (n > (50000 + contiguousBlockSize));
+}

=== added file 'src/libCom/osi/os/RTEMS-posix/osdSock.h'
--- src/libCom/osi/os/RTEMS-posix/osdSock.h	1970-01-01 00:00:00 +0000
+++ src/libCom/osi/os/RTEMS-posix/osdSock.h	2017-05-01 18:36:52 +0000
@@ -0,0 +1,111 @@
+/*************************************************************************\
+* Copyright (c) 2002 The University of Saskatchewan
+* Copyright (c) 2017 Fritz-Haber-Institut der Max-Planck-Gesellschaft
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution. 
+\*************************************************************************/
+/*
+ * RTEMS osdSock.h
+ *      Author: W. Eric Norum
+ *              Heinz Junkes
+ *
+ * Adapted to rtems4.12             
+ */
+#ifndef osdSockH
+#define osdSockH
+
+#include <errno.h>
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <netdb.h>
+#include <ifaddrs.h> /* getifaddrs() */
+#include <unistd.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int select(int  n,  fd_set  *readfds,  fd_set  *writefds, fd_set *exceptfds, struct timeval *timeout);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#ifndef IPPORT_USERRESERVED
+#define IPPORT_USERRESERVED 5000
+#endif
+
+#define USE_IFADDRS
+
+typedef int                     SOCKET;
+#define INVALID_SOCKET          (-1)
+#define SOCKERRNO               errno
+#define socket_ioctl(A,B,C)     ioctl(A,B,C)
+typedef int osiSockIoctl_t;
+typedef socklen_t osiSocklen_t;
+
+#define FD_IN_FDSET(FD) ((FD)<FD_SETSIZE)
+
+#define SOCK_EWOULDBLOCK EWOULDBLOCK
+#define SOCK_ENOBUFS ENOBUFS
+#define SOCK_ECONNRESET ECONNRESET
+#define SOCK_ETIMEDOUT ETIMEDOUT
+#define SOCK_EADDRINUSE EADDRINUSE
+#define SOCK_EADDRNOTAVAIL EADDRNOTAVAIL
+#define SOCK_ECONNREFUSED ECONNREFUSED
+#define SOCK_ECONNABORTED ECONNABORTED
+#define SOCK_EINPROGRESS EINPROGRESS
+#define SOCK_EISCONN EISCONN
+#define SOCK_EALREADY EALREADY
+#define SOCK_EINVAL EINVAL
+#define SOCK_EINTR EINTR
+#define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
+#define SOCK_SHUTDOWN EPIPE
+#define SOCK_ENOTSOCK ENOTSOCK
+#define SOCK_EBADF EBADF
+
+// already defined in newlib
+//#define bzero(p,n) memset(p,0,n)
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#ifndef INADDR_LOOPBACK
+#define       INADDR_LOOPBACK         (u_long)0x7F000001
+#endif
+
+#ifndef INADDR_NONE
+#   define INADDR_NONE (0xffffffff)
+#endif 
+
+/*
+ * For shutdown()
+ */
+#ifndef SHUT_RD
+#   define SHUT_RD 0
+#endif
+
+#ifndef SHUT_WR
+#   define SHUT_WR 1
+#endif
+
+#ifndef SHUT_RDWR
+#   define SHUT_RDWR 2
+#endif
+
+/*
+ * Ensure that we get the right network code in default/osdNetIntf.c.
+ */
+#define ifreq_size(pifreq) (pifreq->ifr_addr.sa_len + sizeof(pifreq->ifr_name))
+
+#endif /*osdSockH*/

=== modified file 'src/libCom/osi/os/WIN32/osdNetIntf.c'
--- src/libCom/osi/os/WIN32/osdNetIntf.c	2017-02-01 17:57:04 +0000
+++ src/libCom/osi/os/WIN32/osdNetIntf.c	2017-05-01 18:36:52 +0000
@@ -3,6 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
+* Copyright (c) 2015 Brookhaven Science Associates as Operator of
+*     Brookhaven National Lab.
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
@@ -40,214 +42,110 @@
 #include "epicsThread.h"
 #include "epicsVersion.h"
 
-static osiSockAddr      osiLocalAddrResult;
-static epicsThreadOnceId osiLocalAddrId = EPICS_THREAD_ONCE_INIT;
-
-/*
- * osiLocalAddr ()
- */
 static void osiLocalAddrOnce ( void *raw )
 {
-    SOCKET              *psocket = raw;
-    osiSockAddr         addr;
-    int                 status;
-    INTERFACE_INFO      *pIfinfo;
-    INTERFACE_INFO      *pIfinfoList = NULL;
-    unsigned            nelem;
-    DWORD               numifs;
-    DWORD               cbBytesReturned;
-
-    memset ( (void *) &addr, '\0', sizeof ( addr ) );
-    addr.sa.sa_family = AF_UNSPEC;
-
-    /* only valid for winsock 2 and above */
-    if ( wsaMajorVersion() < 2 ) {
-        goto fail;
-    }
-
-    nelem = 100;
-    pIfinfoList = (INTERFACE_INFO *) calloc ( nelem, sizeof (INTERFACE_INFO) );
-    if (!pIfinfoList) {
-        errlogPrintf ("calloc failed\n");
-        goto fail;
-    }
-
-    status = WSAIoctl (*psocket, SIO_GET_INTERFACE_LIST, NULL, 0,
-                       (LPVOID)pIfinfoList, nelem*sizeof(INTERFACE_INFO),
-                       &cbBytesReturned, NULL, NULL);
-
-    if (status != 0 || cbBytesReturned == 0) {
-        errlogPrintf ("WSAIoctl SIO_GET_INTERFACE_LIST failed %d\n",WSAGetLastError());
-        goto fail;
-    }
-
-    numifs = cbBytesReturned / sizeof(INTERFACE_INFO);
-    for (pIfinfo = pIfinfoList; pIfinfo < (pIfinfoList+numifs); pIfinfo++){
-
-        /*
-         * dont use interfaces that have been disabled
-         */
-        if (!(pIfinfo->iiFlags & IFF_UP)) {
-            continue;
-        }
-
-        /*
-         * dont use the loop back interface
-         */
-        if (pIfinfo->iiFlags & IFF_LOOPBACK) {
-            continue;
-        }
-
-        addr.sa = pIfinfo->iiAddress.Address;
-
-        /* Work around MS Winsock2 bugs */
-        if (addr.sa.sa_family == 0) {
-            addr.sa.sa_family = AF_INET;
-        }
-
-        osiLocalAddrResult = addr;
-        free ( pIfinfoList );
-        return;
-    }
-
-    errlogPrintf (
-                "osiLocalAddr(): only loopback found\n");
-fail:
-    /* fallback to loopback */
-    memset ( (void *) &addr, '\0', sizeof ( addr ) );
-    addr.ia.sin_family = AF_INET;
-    addr.ia.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-    osiLocalAddrResult = addr;
-
-    free ( pIfinfoList );
-}
-
-epicsShareFunc osiSockAddr epicsShareAPI osiLocalAddr (SOCKET socket)
-{
-    epicsThreadOnce(&osiLocalAddrId, osiLocalAddrOnce, (void*)&socket);
-    return osiLocalAddrResult;
-}
-
-/*
- * osiSockDiscoverBroadcastAddresses ()
- */
-epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
-     (ELLLIST *pList, SOCKET socket, const osiSockAddr *pMatchAddr)
-{
-    int                 status;
-    INTERFACE_INFO      *pIfinfo;
-    INTERFACE_INFO      *pIfinfoList;
-    unsigned            nelem;
-    int                 numifs;
-    DWORD               cbBytesReturned;
-    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 ) {
-                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;
-        }
-    }
+int ret = -1, status, foundlo = 0;
+    SOCKET sock;
+    unsigned nelem = 10, i;
+    INTERFACE_INFO *info = NULL;
+    DWORD				cbBytesReturned;
 
     /* only valid for winsock 2 and above */
     if (wsaMajorVersion() < 2 ) {
-        fprintf(stderr, "Need to set EPICS_CA_AUTO_ADDR_LIST=NO for winsock 1\n");
-        return;
-    }
-
-    nelem = 100;
-    pIfinfoList = (INTERFACE_INFO *) calloc(nelem, sizeof(INTERFACE_INFO));
-    if(!pIfinfoList){
-        return;
-    }
-
-    status = WSAIoctl (socket, SIO_GET_INTERFACE_LIST,
-                       NULL, 0,
-                       (LPVOID)pIfinfoList, nelem*sizeof(INTERFACE_INFO),
-                       &cbBytesReturned, NULL, NULL);
+        fprintf(stderr, "Interface discovery not supported for winsock 1\n"
+                        "Need to set EPICS_CA_AUTO_ADDR_LIST=NO\n");
+        return ret;
+    }
+
+    sock = epicsSocketCreate(AF_INET, SOCK_DGRAM, 0);
+    if(sock==INVALID_SOCKET)
+        return ret;
+
+    info = calloc(nelem, sizeof(*info));
+    if(!info)
+        goto cleanup;
+
+    /* In future use SIO_GET_INTERFACE_LIST_EX to include IPv6 */
+
+    status = WSAIoctl (sock, SIO_GET_INTERFACE_LIST,
+                        NULL, 0,
+                        (LPVOID)info, nelem*sizeof(*info),
+                        &cbBytesReturned, NULL, NULL);
 
     if (status != 0 || cbBytesReturned == 0) {
         fprintf(stderr, "WSAIoctl SIO_GET_INTERFACE_LIST failed %d\n",WSAGetLastError());
-        free(pIfinfoList);
-        return;
-    }
-
-    numifs = cbBytesReturned/sizeof(INTERFACE_INFO);
-    for (pIfinfo = pIfinfoList; pIfinfo < (pIfinfoList+numifs); pIfinfo++){
-
-        /*
-         * dont bother with interfaces that have been disabled
-         */
-        if (!(pIfinfo->iiFlags & IFF_UP)) {
-            continue;
-        }
-
-        if (pIfinfo->iiFlags & IFF_LOOPBACK) {
-            continue;
-        }
-
-        /*
-         * work around WS2 bug
-         */
-        if (pIfinfo->iiAddress.Address.sa_family != AF_INET) {
-            if (pIfinfo->iiAddress.Address.sa_family == 0) {
-                pIfinfo->iiAddress.Address.sa_family = AF_INET;
-            }
-        }
-
-        /*
-         * if it isnt a wildcarded interface then look for
-         * an exact match
-         */
-        if (pMatchAddr->sa.sa_family != AF_UNSPEC) {
-            if (pIfinfo->iiAddress.Address.sa_family != pMatchAddr->sa.sa_family) {
-                continue;
-            }
-            if (pIfinfo->iiAddress.Address.sa_family != AF_INET) {
-                continue;
-            }
-            if (pMatchAddr->sa.sa_family != AF_INET) {
-                continue;
-            }
-            if (pMatchAddr->ia.sin_addr.s_addr != htonl(INADDR_ANY)) {
-                if (pIfinfo->iiAddress.AddressIn.sin_addr.s_addr != pMatchAddr->ia.sin_addr.s_addr) {
-                    continue;
-                }
-            }
-        }
-
-        pNewNode = (osiSockAddrNode *) calloc (1, sizeof(*pNewNode));
-        if (pNewNode==NULL) {
-            errlogPrintf ("osiSockDiscoverBroadcastAddresses(): no memory available for configuration\n");
-            return;
-        }
-
-        if (pIfinfo->iiAddress.Address.sa_family == AF_INET &&
-                pIfinfo->iiFlags & IFF_BROADCAST) {
-            const unsigned mask = pIfinfo->iiNetmask.AddressIn.sin_addr.s_addr;
-            const unsigned bcast = pIfinfo->iiBroadcastAddress.AddressIn.sin_addr.s_addr;
-            const unsigned addr = pIfinfo->iiAddress.AddressIn.sin_addr.s_addr;
-            unsigned result = (addr & mask) | (bcast &~mask);
-            pNewNode->addr.ia.sin_family = AF_INET;
-            pNewNode->addr.ia.sin_addr.s_addr = result;
-            pNewNode->addr.ia.sin_port = htons ( 0 );
-        }
-        else {
-            pNewNode->addr.sa = pIfinfo->iiBroadcastAddress.Address;
-        }
-
-        /*
-         * LOCK applied externally
-         */
-        ellAdd (pList, &pNewNode->node);
-    }
-
-    free (pIfinfoList);
+        goto cleanup;
+    }
+
+    nelem = cbBytesReturned/sizeof(*info);
+
+    for(i=0; i<nelem; i++)
+    {
+        unsigned int flags;
+        osiInterfaceInfo *node = calloc(1, sizeof(*node));
+        if(!node)
+            goto cleanup;
+
+        /* work around WS2 bug */
+        if(info[i].iiAddress.AddressIn.sin_family==0)
+           info[i].iiAddress.AddressIn.sin_family = AF_INET;
+
+        if(info[i].iiAddress.AddressIn.sin_family!=AF_INET) {
+            free(node);
+            continue;
+        }
+
+        node->address.ia = info[i].iiAddress.AddressIn;
+        node->netmask.ia = info[i].iiNetmask.AddressIn;
+        node->endpoint.ia = info[i].iiBroadcastAddress.AddressIn;
+
+        flags = info[i].iiFlags;
+
+        if(flags&IFF_UP) node->up = 1;
+        if(flags&IFF_BROADCAST) node->broadcast = 1;
+        if(flags&IFF_MULTICAST) node->multicast = 1;
+        if(flags&IFF_LOOPBACK) node->loopback = 1;
+        /* BSD sockets have IFF_POINTOPOINT while winsock has IFF_POINTTOPOINT
+         * Note the extra 'T'
+         */
+        if(flags&IFF_POINTTOPOINT) node->point2point = 1;
+
+        if(node->broadcast && node->point2point) {
+            errlogPrintf("Interface %u claims both broadcast and point to point,"
+                         " which should not be possible.  Assuming broadcast only.",
+                         i);
+            node->point2point = 0;
+        }
+
+        if(node->loopback) foundlo = 1;
+        ellAdd(pList, &node->node);
+    }
+
+    if(!foundlo) {
+        /* sometimes the loopback isn't included (WINE+mingw) */
+        osiInterfaceInfo *node = calloc(1, sizeof(*node));
+        if(!node)
+            goto cleanup;
+
+        node->up = 1;
+        node->loopback = 1;
+
+        node->address.ia.sin_family = AF_INET;
+        node->address.ia.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+        node->address.ia.sin_port = 0;
+
+        node->netmask.ia.sin_family = AF_INET;
+        node->netmask.ia.sin_addr.s_addr = htonl(0xff000000);
+        node->netmask.ia.sin_port = 0;
+
+        ellInsert(pList, NULL, &node->node);
+    }
+
+    ret = 0;
+cleanup:
+    if(ret)
+        ellFree(pList);
+    free(info);
+    epicsSocketDestroy(sock);
+    return ret;
 }

=== modified file 'src/libCom/osi/os/default/osdNetIntf.c'
--- src/libCom/osi/os/default/osdNetIntf.c	2017-02-01 17:57:04 +0000
+++ src/libCom/osi/os/default/osdNetIntf.c	2017-05-01 18:36:52 +0000
@@ -3,6 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
+* Copyright (c) 2015 Brookhaven Science Associates as Operator of
+*     Brookhaven National Lab.
 * 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. 
@@ -19,6 +21,7 @@
 #include <stdlib.h>
 
 #define epicsExportSharedSymbols
+#include "dbDefs.h"
 #include "osiSock.h"
 #include "epicsAssert.h"
 #include "errlog.h"
@@ -30,323 +33,155 @@
 #   define ifDepenDebugPrintf(argsInParen)
 #endif
 
-static osiSockAddr      osiLocalAddrResult;
-static epicsThreadOnceId osiLocalAddrId = EPICS_THREAD_ONCE_INIT;
-
-/*
- * Determine the size of an ifreq structure
- * Made difficult by the fact that addresses larger than the structure
- * size may be returned from the kernel.
- */
-static size_t ifreqSize ( struct ifreq *pifreq )
-{
-    size_t        size;
-
-    size = ifreq_size ( pifreq );
-    if ( size < sizeof ( *pifreq ) ) {
-	    size = sizeof ( *pifreq );
-    }
-    return size;
-}
-
-/*
- * Move to the next ifreq structure
- */
-static struct ifreq * ifreqNext ( struct ifreq *pifreq )
-{
-    struct ifreq *ifr;
-
-    ifr = ( struct ifreq * )( ifreqSize (pifreq) + ( char * ) pifreq );
-    ifDepenDebugPrintf( ("ifreqNext() pifreq %p, size 0x%x, ifr 0x%p\n", pifreq, (unsigned)ifreqSize (pifreq), ifr) );
-    return ifr;
-}
-
-
-/*
- * osiSockDiscoverBroadcastAddresses ()
- */
-epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
-     (ELLLIST *pList, SOCKET socket, const osiSockAddr *pMatchAddr)
-{
-    static const unsigned           nelem = 100;
-    int                             status;
-    struct ifconf                   ifconf;
-    struct ifreq                    *pIfreqList;
-    struct ifreq                    *pIfreqListEnd;
-    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
-     *
-     * nelem is set to the maximum interfaces 
-     * on one machine here
-     */
-    pIfreqList = (struct ifreq *) calloc ( nelem, sizeof(*pifreq) );
-    if (!pIfreqList) {
-        errlogPrintf ("osiSockDiscoverBroadcastAddresses(): no memory to complete request\n");
-        return;
-    }
-    
-    ifconf.ifc_len = nelem * sizeof(*pifreq);
-    ifconf.ifc_req = pIfreqList;
-    status = socket_ioctl (socket, SIOCGIFCONF, &ifconf);
-    if (status < 0 || ifconf.ifc_len == 0) {
-        errlogPrintf ("osiSockDiscoverBroadcastAddresses(): unable to fetch network interface configuration (%d)\n", status);
-        free (pIfreqList);
-        return;
-    }
-    
-    pIfreqListEnd = (struct ifreq *) (ifconf.ifc_len + (char *) pIfreqList);
-    pIfreqListEnd--;
-
-    for ( pifreq = pIfreqList; pifreq <= pIfreqListEnd; pifreq = pnextifreq ) {
-        uint32_t  current_ifreqsize;
-
-        /*
-         * find the next ifreq
-         */
-        pnextifreq = ifreqNext (pifreq);
-        
-        /* determine ifreq size */
-        current_ifreqsize = ifreqSize ( pifreq );
-        /* copy current ifreq to aligned bufferspace (to start of pIfreqList buffer) */
-        memmove(pIfreqList, pifreq, current_ifreqsize);
-
-        ifDepenDebugPrintf (("osiSockDiscoverBroadcastAddresses(): found IFACE: %s len: 0x%x current_ifreqsize: 0x%x \n",
-            pIfreqList->ifr_name,
-            (unsigned)ifreq_size(pifreq),
-            (unsigned)current_ifreqsize));
-
-        /*
-         * If its not an internet interface then dont use it 
-         */
-        if ( pIfreqList->ifr_addr.sa_family != AF_INET ) {
-             ifDepenDebugPrintf ( ("osiSockDiscoverBroadcastAddresses(): interface \"%s\" was not AF_INET\n", pIfreqList->ifr_name) );
-             continue;
-        }
-
-        /*
-         * if it isnt a wildcarded interface then look for
-         * an exact match
-         */
-        if ( pMatchAddr->sa.sa_family != AF_UNSPEC ) {
-            if ( pMatchAddr->sa.sa_family != AF_INET ) {
-                continue;
-            }
-            if ( pMatchAddr->ia.sin_addr.s_addr != htonl (INADDR_ANY) ) {
-                 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;
-                 }
-            }
-        }
-
-        status = socket_ioctl ( socket, SIOCGIFFLAGS, pIfreqList );
-        if ( status ) {
-            errlogPrintf ("osiSockDiscoverBroadcastAddresses(): net intf flags fetch for \"%s\" failed\n", pIfreqList->ifr_name);
-            continue;
-        }
-        ifDepenDebugPrintf ( ("osiSockDiscoverBroadcastAddresses(): net intf \"%s\" flags: %x\n", pIfreqList->ifr_name, pIfreqList->ifr_flags) );
-
-        /*
-         * dont bother with interfaces that have been disabled
-         */
-        if ( ! ( pIfreqList->ifr_flags & IFF_UP ) ) {
-             ifDepenDebugPrintf ( ("osiSockDiscoverBroadcastAddresses(): net intf \"%s\" was down\n", pIfreqList->ifr_name) );
-             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" );
-            free ( pIfreqList );
-            return;
-        }
-
-        /*
-         * If this is an interface that supports
-         * broadcast fetch the broadcast address.
-         *
-         * Otherwise if this is a point to point 
-         * interface then use the destination address.
-         *
-         * Otherwise CA will not query through the 
-         * 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;
-            }
-            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 ) {
-            status = socket_ioctl ( socket, SIOCGIFDSTADDR, pIfreqList);
-            if ( status ) {
-                ifDepenDebugPrintf ( ("osiSockDiscoverBroadcastAddresses(): net intf \"%s\": pt to pt addr fetch fail\n", pIfreqList->ifr_name) );
-                free ( pNewNode );
-                continue;
-            }
-            pNewNode->addr.sa = pIfreqList->ifr_dstaddr;
-        }
-#endif
-        else {
-            ifDepenDebugPrintf ( ( "osiSockDiscoverBroadcastAddresses(): net intf \"%s\": not point to point or bcast?\n", pIfreqList->ifr_name ) );
-            free ( pNewNode );
-            continue;
-        }
-
-        ifDepenDebugPrintf ( ("osiSockDiscoverBroadcastAddresses(): net intf \"%s\" found\n", pIfreqList->ifr_name) );
-
-        /*
-         * LOCK applied externally
-         */
-        ellAdd ( pList, &pNewNode->node );
-    }
-
-    free ( pIfreqList );
-}
-     
-/*
- * osiLocalAddr ()
- */
-static void osiLocalAddrOnce (void *raw)
-{
-    SOCKET *psocket = raw;
-    const unsigned          nelem = 100;
-    osiSockAddr             addr;
-    int                     status;
-    struct ifconf           ifconf;
-    struct ifreq            *pIfreqList;
-    struct ifreq            *pifreq;
-    struct ifreq            *pIfreqListEnd;
-    struct ifreq            *pnextifreq;
-
-    memset ( (void *) &addr, '\0', sizeof ( addr ) );
-    addr.sa.sa_family = AF_UNSPEC;
-    
-    pIfreqList = (struct ifreq *) calloc ( nelem, sizeof(*pIfreqList) );
-    if ( ! pIfreqList ) {
-        errlogPrintf ( "osiLocalAddr(): no memory to complete request\n" );
-        goto fail;
-    }
- 
-    ifconf.ifc_len = nelem * sizeof ( *pIfreqList );
-    ifconf.ifc_req = pIfreqList;
-    status = socket_ioctl ( *psocket, SIOCGIFCONF, &ifconf );
-    if ( status < 0 || ifconf.ifc_len == 0 ) {
-        char sockErrBuf[64];
-        epicsSocketConvertErrnoToString ( 
-            sockErrBuf, sizeof ( sockErrBuf ) );
-        errlogPrintf (
-            "osiLocalAddr(): SIOCGIFCONF ioctl failed because \"%s\"\n",
-            sockErrBuf );
-        goto fail;
-    }
-    
-    pIfreqListEnd = (struct ifreq *) ( ifconf.ifc_len + (char *) ifconf.ifc_req );
-    pIfreqListEnd--;
-
-    for ( pifreq = ifconf.ifc_req; pifreq <= pIfreqListEnd; pifreq = pnextifreq ) {
-        osiSockAddr addrCpy;
-        uint32_t  current_ifreqsize;
-
-        /*
-         * find the next if req
-         */
-        pnextifreq = ifreqNext ( pifreq );
-
-        /* determine ifreq size */
-        current_ifreqsize = ifreqSize ( pifreq );
-        /* copy current ifreq to aligned bufferspace (to start of pIfreqList buffer) */
-        memmove(pIfreqList, pifreq, current_ifreqsize);
-
-        if ( pIfreqList->ifr_addr.sa_family != AF_INET ) {
-            ifDepenDebugPrintf ( ("osiLocalAddr(): interface %s was not AF_INET\n", pIfreqList->ifr_name) );
-            continue;
-        }
-
-        addrCpy.sa = pIfreqList->ifr_addr;
-
-        status = socket_ioctl ( *psocket, SIOCGIFFLAGS, pIfreqList );
-        if ( status < 0 ) {
-            errlogPrintf ( "osiLocalAddr(): net intf flags fetch for %s failed\n", pIfreqList->ifr_name );
-            continue;
-        }
-
-        if ( ! ( pIfreqList->ifr_flags & IFF_UP ) ) {
-            ifDepenDebugPrintf ( ("osiLocalAddr(): net intf %s was down\n", pIfreqList->ifr_name) );
-            continue;
-        }
-
-        /*
-         * dont use the loop back interface
-         */
-        if ( pIfreqList->ifr_flags & IFF_LOOPBACK ) {
-            ifDepenDebugPrintf ( ("osiLocalAddr(): ignoring loopback interface: %s\n", pIfreqList->ifr_name) );
-            continue;
-        }
-
-        ifDepenDebugPrintf ( ("osiLocalAddr(): net intf %s found\n", pIfreqList->ifr_name) );
-
-        osiLocalAddrResult = addrCpy;
-        free ( pIfreqList );
-        return;
-    }
-
-    errlogPrintf (
-        "osiLocalAddr(): only loopback found\n");
-fail:
-    /* fallback to loopback */
-    memset ( (void *) &addr, '\0', sizeof ( addr ) );
-    addr.ia.sin_family = AF_INET;
-    addr.ia.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-    osiLocalAddrResult = addr;
-
-    free ( pIfreqList );
-}
-
-
-epicsShareFunc osiSockAddr epicsShareAPI osiLocalAddr (SOCKET socket)
-{
-    epicsThreadOnce(&osiLocalAddrId, osiLocalAddrOnce, &socket);
-    return osiLocalAddrResult;
-}
+#ifdef USE_IFADDRS
+
+epicsShareFunc int osiGetInterfaceInfo(ELLLIST *pList, unsigned flags)
+{
+    int ret = -1;
+    struct ifaddrs *addrs = NULL, *cur;
+
+    ellFree(pList);
+
+    if(getifaddrs(&addrs))
+        goto cleanup;
+
+    for(cur=addrs; cur; cur=cur?cur->ifa_next:NULL)
+//    for(cur=addrs; cur; cur=cur->ifa_next)
+    {
+        unsigned int flags;
+        osiInterfaceInfo *node = calloc(1, sizeof(*node));
+        if(!node)
+            goto cleanup;
+
+        switch(cur->ifa_addr->sa_family)
+        {
+        case AF_INET:
+        /*case AF_INET6:*/
+            break;
+        default:
+            free(node);
+            continue; /* ignore unknown address types */
+        }
+
+        //assert(cur->ifa_addr->sa_family==cur->ifa_netmask->sa_family);
+        memcpy(&node->address.ia, cur->ifa_addr, sizeof(node->address.ia));
+        memcpy(&node->netmask.ia, cur->ifa_netmask, sizeof(node->address.ia));
+
+        flags = cur->ifa_flags;
+
+        if(flags&IFF_UP) node->up = 1;
+        if(flags&IFF_BROADCAST) node->broadcast = 1;
+        if(flags&IFF_MULTICAST) node->multicast = 1;
+        if(flags&IFF_LOOPBACK) node->loopback = 1;
+        if(flags&IFF_POINTOPOINT) node->point2point = 1;
+
+        if(node->broadcast && node->point2point) {
+            errlogPrintf("Interface %s claims both broadcast and point to point,"
+                         " which should not be possible.  Assuming broadcast only.",
+                         cur->ifa_name);
+            node->point2point = 0;
+        }
+
+        if(node->broadcast)
+            memcpy(&node->endpoint.ia, cur->ifa_broadaddr, sizeof(node->address.ia));
+        else if(node->point2point)
+            memcpy(&node->endpoint.ia, cur->ifa_dstaddr, sizeof(node->address.ia));
+
+        ellAdd(pList, &node->node);
+    }
+
+    ret = 0;
+cleanup:
+    if(ret)
+        ellFree(pList);
+    if(addrs) freeifaddrs(addrs);
+    return ret;
+}
+#else /* USE_IFADDRS */
+
+epicsShareFunc int osiGetInterfaceInfo(ELLLIST *pList, unsigned flags)
+{
+    SOCKET sock;
+    int ret = -1;
+    struct if_nameindex* pIndex = 0;
+    struct if_nameindex* pIndex2 = 0;
+
+    ellFree(pList);
+
+    sock = epicsSocketCreate(AF_INET, SOCK_DGRAM, 0);
+    if(sock==INVALID_SOCKET)
+        return ret;
+
+    pIndex = pIndex2 = if_nameindex();
+    while ((pIndex != NULL) && (pIndex->if_name != NULL))
+    {
+	struct ifreq req;
+        unsigned int flags;
+        osiInterfaceInfo *node = calloc(1, sizeof(*node));
+        if(!node)
+            goto cleanup;
+	strncpy(req.ifr_name, pIndex->if_name, IFNAMSIZ);
+        if(socket_ioctl(sock, SIOCGIFADDR, &req)<0) {
+	  if (errno == EADDRNOTAVAIL) {
+	    free(node);
+            ++pIndex;
+            continue;
+          }
+          free(node);
+          goto cleanup;
+        }
+	memcpy(&node->address.ia, &req.ifr_addr, sizeof(node->address.ia));
+
+        if(socket_ioctl(sock, SIOCGIFNETMASK, &req)<0) {
+            free(node);
+            goto cleanup;
+        }
+        memcpy(&node->netmask.ia, &req.ifr_addr, sizeof(node->netmask.ia));
+
+        if(socket_ioctl(sock, SIOCGIFFLAGS, &req)<0) {
+            free(node);
+            goto cleanup;
+        }
+        flags = req.ifr_flags;
+        if(flags&IFF_UP) node->up = 1;
+        if(flags&IFF_BROADCAST) node->broadcast = 1;
+        if(flags&IFF_MULTICAST) node->multicast = 1;
+        if(flags&IFF_LOOPBACK) node->loopback = 1;
+        if(flags&IFF_POINTOPOINT) node->point2point = 1;
+
+        if(node->broadcast && node->point2point) {
+            errlogPrintf("Interface %s claims both broadcast and point to point,"
+                         " which should not be possible.  Assuming broadcast only.",
+                         req.ifr_name);
+            node->point2point = 0;
+        }
+        if(node->broadcast) {
+            if(socket_ioctl(sock, SIOCGIFBRDADDR, &req)<0) {
+                free(node);
+                goto cleanup;
+            }
+        } else if(node->point2point) {
+            if(socket_ioctl(sock, SIOCGIFDSTADDR, &req)<0) {
+                free(node);
+                goto cleanup;
+            }
+        }
+
+        if(node->broadcast || node->point2point) {
+            assert(req.ifr_addr.sa_family==node->address.sa.sa_family);
+
+            memcpy(&node->endpoint.ia, &req.ifr_addr, sizeof(node->endpoint.ia));
+        }
+
+        ellAdd(pList, &node->node);
+        ++pIndex;
+    }
+
+    ret = 0;
+cleanup:
+    if(ret)
+        ellFree(pList);
+    epicsSocketDestroy(sock);
+    return ret;
+}
+#endif /* USE_IFADRS */

=== modified file 'src/libCom/osi/os/posix/osdSockAddrReuse.cpp'
--- src/libCom/osi/os/posix/osdSockAddrReuse.cpp	2016-05-22 12:38:18 +0000
+++ src/libCom/osi/os/posix/osdSockAddrReuse.cpp	2017-05-01 18:36:52 +0000
@@ -17,6 +17,12 @@
 #include "osiSock.h"
 #include "errlog.h"
 
+#ifdef SO_REUSEPORT
+#define OPTION SO_REUSEPORT
+#else
+#define OPTION SO_REUSEADDR
+#endif
+
 epicsShareFunc void epicsShareAPI 
     epicsSocketEnableAddressReuseDuringTimeWaitState ( SOCKET s )
 {
@@ -33,13 +39,14 @@
 
 /*
  * SO_REUSEPORT is not in POSIX
+ * but in RTEMS
  */
 epicsShareFunc void epicsShareAPI 
     epicsSocketEnableAddressUseForDatagramFanout ( SOCKET s )
 {
     int yes = true;
     int status;
-    status = setsockopt ( s, SOL_SOCKET, SO_REUSEADDR,
+    status = setsockopt ( s, SOL_SOCKET, OPTION,
         (char *) & yes, sizeof ( yes ) );
     if ( status < 0 ) {
         errlogPrintf (

=== modified file 'src/libCom/osi/os/posix/osdThread.c'
--- src/libCom/osi/os/posix/osdThread.c	2016-02-23 21:43:26 +0000
+++ src/libCom/osi/os/posix/osdThread.c	2017-05-01 18:36:52 +0000
@@ -4,11 +4,19 @@
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
 * Copyright (c) 2013 ITER Organization.
+* Copyright (c) 2017 Fritz-Haber-Institut der Max-Planck-Gesellschaft
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-/* Author:  Marty Kraimer Date:    18JAN2000 */
+/* Author:  Marty Kraimer Date:    18JAN2000 
+   	    Heinz Junkes  Date:    06APR2017
+
+   once() and all called functions by once must use
+   checkStatusOnce and checkStatusQuitOnce only
+   including epicsEventCreate called by create_threadInfo 
+   add epicsEventCreateOnce which can be called here 
+*/
 
 /* This is a posix implementation of epicsThread */
 #include <stddef.h>
@@ -38,6 +46,16 @@
 #include "errlog.h"
 #include "epicsAssert.h"
 #include "epicsExit.h"
+#if defined(__rtems__)
+#include <rtems/bspIo.h>
+#include <rtems.h>
+#endif
+
+struct epicsEventOSD {
+    pthread_mutex_t mutex;
+    pthread_cond_t  cond;
+    int             isFull;
+};
 
 epicsShareFunc void epicsThreadShowInfo(epicsThreadOSD *pthreadInfo, unsigned int level);
 epicsShareFunc void osdThreadHooksRun(epicsThreadId id);
@@ -75,14 +93,15 @@
 } priAvailable;
 #endif
 
-static pthread_key_t getpthreadInfo;
+__thread epicsThreadOSD *tls_pthreadInfo;
+
 static pthread_mutex_t onceLock;
 static pthread_mutex_t listLock;
 static ELLLIST pthreadList = ELLLIST_INIT;
 static commonAttr *pcommonAttr = 0;
-static int epicsThreadOnceCalled = 0;
+static int epicsThreadInitOnceCalled = 0;
 

-static epicsThreadOSD *createImplicit(void);
+static void createImplicit(void);
 
 #define checkStatus(status,message) \
 if((status))  {\
@@ -90,7 +109,7 @@
 }
 
 #define checkStatusQuit(status,message,method) \
-if(status) { \
+if((status)) { \
     errlogPrintf("%s  error %s\n",(message),strerror((status))); \
     cantProceed((method)); \
 }
@@ -99,17 +118,33 @@
 /* Until epicsThreadInit completes errlogInit will not work                     */
 /* It must also be used by init_threadInfo otherwise errlogInit could get  */
 /* called recursively                                                      */
+#if defined (__rtems__)
+#define checkStatusOnce(status,message) \
+if((status))  {\
+    printk("%s error %s\n",(message),strerror((status))); }
+#else
 #define checkStatusOnce(status,message) \
 if((status))  {\
     fprintf(stderr,"%s error %s\n",(message),strerror((status))); }
+#endif
 
-#define checkStatusOnceQuit(status,message,method) \
-if(status) { \
+#if defined (__rtems__)
+#define checkStatusOnceQuit(status,message,method) \
+if((status)) { \
+    printk("%s  error %s",(message),strerror((status))); \
+    printk(" %s\n",method); \
+    printk("epicsThreadInit cant proceed. Program exiting\n"); \
+    exit(-1);\
+}
+#else
+#define checkStatusOnceQuit(status,message,method) \
+if((status)) { \
     fprintf(stderr,"%s  error %s",(message),strerror((status))); \
     fprintf(stderr," %s\n",method); \
     fprintf(stderr,"epicsThreadInit cant proceed. Program exiting\n"); \
     exit(-1);\
 }
+#endif
 
 

 epicsShareFunc int epicsThreadGetPosixPriority(epicsThreadId pthreadInfo)
@@ -153,6 +188,29 @@
 #endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
 }
 

+
+epicsShareFunc epicsEventId epicsEventCreateOnce(epicsEventInitialState init)
+{
+    epicsEventId pevent = malloc(sizeof(*pevent));
+    if (pevent) {
+        int status = pthread_mutex_init(&pevent->mutex, 0);
+
+        pevent->isFull = (init == epicsEventFull);
+        if (status) {
+            checkStatus(status, "pthread_mutex_init");
+        } else {
+            status = pthread_cond_init(&pevent->cond, 0);
+            if (!status)
+                return pevent;
+            checkStatus(status, "pthread_cond_init");
+            status = pthread_mutex_destroy(&pevent->mutex);
+            checkStatus(status, "pthread_mutex_destroy");
+        }
+        free(pevent);
+    }
+    return NULL;
+}
+
 static epicsThreadOSD * create_threadInfo(const char *name)
 {
     epicsThreadOSD *pthreadInfo;
@@ -161,7 +219,7 @@
     pthreadInfo = calloc(1,sizeof(*pthreadInfo) + strlen(name));
     if(!pthreadInfo)
         return NULL;
-    pthreadInfo->suspendEvent = epicsEventCreate(epicsEventEmpty);
+    pthreadInfo->suspendEvent = epicsEventCreateOnce(epicsEventEmpty);
     if(!pthreadInfo->suspendEvent){
         free(pthreadInfo);
         return NULL;
@@ -204,11 +262,13 @@
 {
     int status;
 
-    status = mutexLock(&listLock);
-    checkStatusQuit(status,"pthread_mutex_lock","free_threadInfo");
-    if(pthreadInfo->isOnThreadList) ellDelete(&pthreadList,&pthreadInfo->node);
-    status = pthread_mutex_unlock(&listLock);
-    checkStatusQuit(status,"pthread_mutex_unlock","free_threadInfo");
+    if(pthreadInfo->isOnThreadList) {
+      status = mutexLock(&listLock);
+      checkStatusQuit(status,"pthread_mutex_lock","free_threadInfo");
+      ellDelete(&pthreadList,&pthreadInfo->node);
+      status = pthread_mutex_unlock(&listLock);
+      checkStatusQuit(status,"pthread_mutex_unlock","free_threadInfo");
+    }
     epicsEventDestroy(pthreadInfo->suspendEvent);
     status = pthread_attr_destroy(&pthreadInfo->attr);
     checkStatusQuit(status,"pthread_attr_destroy","free_threadInfo");
@@ -301,13 +361,19 @@
     arg.ok = 0;
 
     status = pthread_create(&id, 0, find_pri_range, &arg);
-    checkStatusQuit(status, "pthread_create","epicsThreadInit");
+    checkStatusOnceQuit(status, "pthread_create","findPriorityRange");
 
     status = pthread_join(id, &dummy);
-    checkStatusQuit(status, "pthread_join","epicsThreadInit");
-
+    checkStatusOnceQuit(status, "pthread_join","findPriorityRange");
+#if defined (__rtems__)
+// We are using posix map osi 0-100 to posix 100-200
+// see epicsThreadGetOsiPriorityValue(int ossPriority)
+    a_p->minPriority = 100;
+    a_p->maxPriority = 200;
+#else
     a_p->minPriority = arg.min_pri;
     a_p->maxPriority = arg.max_pri;
+#endif
     a_p->usePolicy = arg.ok;
 }
 #endif
@@ -315,18 +381,15 @@
 
 static void once(void)
 {
-    epicsThreadOSD *pthreadInfo;
     int status;
-
-    pthread_key_create(&getpthreadInfo,0);
     status = pthread_mutex_init(&onceLock,0);
-    checkStatusQuit(status,"pthread_mutex_init","epicsThreadInit");
+    checkStatusOnceQuit(status,"pthread_mutex_init","once");
     status = pthread_mutex_init(&listLock,0);
-    checkStatusQuit(status,"pthread_mutex_init","epicsThreadInit");
+    checkStatusOnceQuit(status,"pthread_mutex_init","once");
     pcommonAttr = calloc(1,sizeof(commonAttr));
-    if(!pcommonAttr) checkStatusOnceQuit(errno,"calloc","epicsThreadInit");
+    if(!pcommonAttr) checkStatusOnceQuit(errno,"calloc","once");
     status = pthread_attr_init(&pcommonAttr->attr);
-    checkStatusOnceQuit(status,"pthread_attr_init","epicsThreadInit");
+    checkStatusOnceQuit(status,"pthread_attr_init","once");
     status = pthread_attr_setdetachstate(
         &pcommonAttr->attr, PTHREAD_CREATE_DETACHED);
     checkStatusOnce(status,"pthread_attr_setdetachstate");
@@ -358,52 +421,77 @@
     }
 
     if (errVerbose) {
+#if defined(__rtems__)
+        printk("LRT: min priority: %d max priority %d\n",
+            pcommonAttr->minPriority, pcommonAttr->maxPriority);
+#else
         fprintf(stderr, "LRT: min priority: %d max priority %d\n",
             pcommonAttr->minPriority, pcommonAttr->maxPriority);
+#endif
     }
 
 #else
-    if(errVerbose) fprintf(stderr,"task priorities are not implemented\n");
+    if(errVerbose) {
+#if defined(__rtems__)
+ printk("task priorities are not implemented\n");
+#else
+ fprintf(stderr,"task priorities are not implemented\n");
+#endif
+}
 #endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
+    int policy;
+    struct sched_param param;
+    status = pthread_getschedparam(pthread_self(), &policy, &param);
+    checkStatusOnce(status, "pthread_getschedparam failed");
+// param.sched_priority is still 2  bug or feature?
+#if defined (__rtems__)
+    param.sched_priority = 191; // iocsh prio 
+#endif
+    status = pthread_setschedparam(pthread_self(), policy, &param);
+    checkStatusOnce(status, "pthread_setschedparam failed");
+    status = pthread_getschedparam(pthread_self(), &policy, &param);
+    checkStatusOnce(status, "pthread_getschedparam failed");
 
-    pthreadInfo = init_threadInfo("_main_",0,epicsThreadGetStackSize(epicsThreadStackSmall),0,0);
-    assert(pthreadInfo!=NULL);
-    status = pthread_setspecific(getpthreadInfo,(void *)pthreadInfo);
-    checkStatusOnceQuit(status,"pthread_setspecific","epicsThreadInit");
+#if defined (__rtems__)
+    tls_pthreadInfo = init_threadInfo("_main_",param.sched_priority-100,epicsThreadGetStackSize(epicsThreadStackSmall),0,0);
+#else
+    tls_pthreadInfo = init_threadInfo("_main_",0,epicsThreadGetStackSize(epicsThreadStackSmall),0,0);
+#endif
+    assert(tls_pthreadInfo!=NULL);
+    tls_pthreadInfo->tid = pthread_self();
     status = mutexLock(&listLock);
-    checkStatusQuit(status,"pthread_mutex_lock","epicsThreadInit");
-    ellAdd(&pthreadList,&pthreadInfo->node);
-    pthreadInfo->isOnThreadList = 1;
+    checkStatusOnceQuit(status,"pthread_mutex_lock","once");
+    ellAdd(&pthreadList,&tls_pthreadInfo->node);
+    tls_pthreadInfo->isOnThreadList = 1;
     status = pthread_mutex_unlock(&listLock);
-    checkStatusQuit(status,"pthread_mutex_unlock","epicsThreadInit");
+    checkStatusOnceQuit(status,"pthread_mutex_unlock","once");
     status = atexit(epicsExitCallAtExits);
     checkStatusOnce(status,"atexit");
-    osdThreadHooksRunMain(pthreadInfo);
-    epicsThreadOnceCalled = 1;
+    osdThreadHooksRunMain(tls_pthreadInfo);
+    epicsThreadInitOnceCalled = 1;
 }
 
 static void * start_routine(void *arg)
 {
-    epicsThreadOSD *pthreadInfo = (epicsThreadOSD *)arg;
     int status;
     sigset_t blockAllSig;
 
+    tls_pthreadInfo = (epicsThreadOSD *)arg;
+
     sigfillset(&blockAllSig);
     pthread_sigmask(SIG_SETMASK,&blockAllSig,NULL);
-    status = pthread_setspecific(getpthreadInfo,arg);
-    checkStatusQuit(status,"pthread_setspecific","start_routine");
     status = mutexLock(&listLock);
     checkStatusQuit(status,"pthread_mutex_lock","start_routine");
-    ellAdd(&pthreadList,&pthreadInfo->node);
-    pthreadInfo->isOnThreadList = 1;
+    ellAdd(&pthreadList,&tls_pthreadInfo->node);
+    tls_pthreadInfo->isOnThreadList = 1;
     status = pthread_mutex_unlock(&listLock);
     checkStatusQuit(status,"pthread_mutex_unlock","start_routine");
-    osdThreadHooksRun(pthreadInfo);
+    osdThreadHooksRun(tls_pthreadInfo);
 
-    (*pthreadInfo->createFunc)(pthreadInfo->createArg);
+    (*tls_pthreadInfo->createFunc)(tls_pthreadInfo->createArg);
 
     epicsExitCallAtThreadExits ();
-    free_threadInfo(pthreadInfo);
+    free_threadInfo(tls_pthreadInfo);
     return(0);
 }
 
@@ -417,6 +505,9 @@
 epicsShareFunc
 void epicsThreadRealtimeLock(void)
 {
+#if !defined(__rtems__)
+/* RTEMS defines _POSIX_MEMLOCK to 1 in features.h even if it is a non swaping OS and
+   mlockall senseless*/
 #if defined(_POSIX_MEMLOCK) && _POSIX_MEMLOCK > 0
     if (pcommonAttr->maxPriority > pcommonAttr->minPriority) {
         int status = mlockall(MCL_CURRENT | MCL_FUTURE);
@@ -424,10 +515,11 @@
         if (status) {
             fprintf(stderr, "epicsThreadRealtimeLock "
                 "Warning: Unable to lock the virtual address space.\n"
-                "VM page faults may harm real-time performance.\n");
+                "VM page fautls may harm real-time performance.\n");
         }
     }
 #endif
+#endif /* not defined __rtems__ */
 }
 
 epicsShareFunc unsigned int epicsShareAPI epicsThreadGetStackSize (epicsThreadStackSizeClass stackSizeClass)
@@ -435,7 +527,11 @@
 #if defined (OSITHREAD_USE_DEFAULT_STACK)
     return 0;
 #elif defined(_POSIX_THREAD_ATTR_STACKSIZE) && _POSIX_THREAD_ATTR_STACKSIZE > 0
+#if defined (__rtems)
+    #define STACK_SIZE(f) (f * 0x1000 * sizeof(void *))
+#else
     #define STACK_SIZE(f) (f * 0x10000 * sizeof(void *))
+#endif
     static const unsigned stackSizeTable[epicsThreadStackBig+1] = {
         STACK_SIZE(1), STACK_SIZE(2), STACK_SIZE(4)
     };
@@ -463,37 +559,33 @@
 
     epicsThreadInit();
     status = mutexLock(&onceLock);
-    if(status) {
-        fprintf(stderr,"epicsThreadOnce: pthread_mutex_lock returned %s.\n",
-            strerror(status));
-        exit(-1);
-    }
+    checkStatusOnceQuit(status,"pthread_mutex_lock", "epicsThreadOnce");
 
     if (*id != EPICS_THREAD_ONCE_DONE) {
         if (*id == EPICS_THREAD_ONCE_INIT) { /* first call */
             *id = epicsThreadGetIdSelf();    /* mark active */
             status = pthread_mutex_unlock(&onceLock);
-            checkStatusQuit(status,"pthread_mutex_unlock", "epicsThreadOnce");
+            checkStatusOnceQuit(status,"pthread_mutex_unlock", "epicsThreadOnce");
             func(arg);
             status = mutexLock(&onceLock);
-            checkStatusQuit(status,"pthread_mutex_lock", "epicsThreadOnce");
+            checkStatusOnceQuit(status,"pthread_mutex_lock", "epicsThreadOnce");
             *id = EPICS_THREAD_ONCE_DONE;    /* mark done */
         } else if (*id == epicsThreadGetIdSelf()) {
             status = pthread_mutex_unlock(&onceLock);
-            checkStatusQuit(status,"pthread_mutex_unlock", "epicsThreadOnce");
+            checkStatusOnceQuit(status,"pthread_mutex_unlock", "epicsThreadOnce");
             cantProceed("Recursive epicsThreadOnce() initialization\n");
         } else
             while (*id != EPICS_THREAD_ONCE_DONE) {
                 /* Another thread is in the above func(arg) call. */
                 status = pthread_mutex_unlock(&onceLock);
-                checkStatusQuit(status,"pthread_mutex_unlock", "epicsThreadOnce");
+                checkStatusOnceQuit(status,"pthread_mutex_unlock", "epicsThreadOnce");
                 epicsThreadSleep(epicsThreadSleepQuantum());
                 status = mutexLock(&onceLock);
-                checkStatusQuit(status,"pthread_mutex_lock", "epicsThreadOnce");
+                checkStatusOnceQuit(status,"pthread_mutex_lock", "epicsThreadOnce");
             }
     }
     status = pthread_mutex_unlock(&onceLock);
-    checkStatusQuit(status,"pthread_mutex_unlock","epicsThreadOnce");
+    checkStatusOnceQuit(status,"pthread_mutex_unlock","epicsThreadOnce");
 }
 
 epicsShareFunc epicsThreadId epicsShareAPI epicsThreadCreate(const char *name,
@@ -530,6 +622,7 @@
         return 0;
     }
     status = pthread_sigmask(SIG_SETMASK,&oldSig,NULL);
+//? StatusOnce? because of errlog daemon ???
     checkStatusOnce(status,"pthread_sigmask");
     return(pthreadInfo);
 }
@@ -537,80 +630,64 @@
 /*
  * Create dummy context for threads not created by epicsThreadCreate().
  */
-static epicsThreadOSD *createImplicit(void)
+static void createImplicit(void)
 {
-    epicsThreadOSD *pthreadInfo;
     char name[64];
     pthread_t tid;
-    int status;
 
     tid = pthread_self();
     sprintf(name, "non-EPICS_%ld", (long)tid);
-    pthreadInfo = create_threadInfo(name);
-    assert(pthreadInfo);
-    pthreadInfo->tid = tid;
-    pthreadInfo->osiPriority = 0;
+    tls_pthreadInfo = create_threadInfo(name);
+    assert(tls_pthreadInfo);
+    tls_pthreadInfo->tid = tid;
+    tls_pthreadInfo->osiPriority = 0;
 
 #if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && _POSIX_THREAD_PRIORITY_SCHEDULING > 0
     {
     struct sched_param param;
     int policy;
     if(pthread_getschedparam(tid,&policy,&param) == 0)
-        pthreadInfo->osiPriority =
+        tls_pthreadInfo->osiPriority =
                  (param.sched_priority - pcommonAttr->minPriority) * 100.0 /
-                    (pcommonAttr->maxPriority - pcommonAttr->minPriority + 1);
+                    (pcommonAttr->maxPriority - pcommonAttr->minPriority);
     }
 #endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
-
-    status = pthread_setspecific(getpthreadInfo,(void *)pthreadInfo);
-    checkStatus(status,"pthread_setspecific createImplicit");
-    if(status){
-        free_threadInfo(pthreadInfo);
-        return NULL;
-    }
-    return pthreadInfo;
 }
 

 epicsShareFunc void epicsShareAPI epicsThreadSuspendSelf(void)
 {
-    epicsThreadOSD *pthreadInfo;
-
     epicsThreadInit();
-    pthreadInfo = (epicsThreadOSD *)pthread_getspecific(getpthreadInfo);
-    if(pthreadInfo==NULL)
-        pthreadInfo = createImplicit();
-    pthreadInfo->isSuspended = 1;
-    epicsEventWait(pthreadInfo->suspendEvent);
+    assert(tls_pthreadInfo);
+    tls_pthreadInfo->isSuspended = 1;
+    epicsEventWait(tls_pthreadInfo->suspendEvent);
 }
 
 epicsShareFunc void epicsShareAPI epicsThreadResume(epicsThreadOSD *pthreadInfo)
 {
-    assert(epicsThreadOnceCalled);
+    assert(epicsThreadInitOnceCalled);
     pthreadInfo->isSuspended = 0;
     epicsEventSignal(pthreadInfo->suspendEvent);
 }
 
 epicsShareFunc void epicsShareAPI epicsThreadExitMain(void)
 {
-    epicsThreadOSD *pthreadInfo;
 
     epicsThreadInit();
-    pthreadInfo = (epicsThreadOSD *)pthread_getspecific(getpthreadInfo);
-    if(pthreadInfo==NULL)
-        pthreadInfo = createImplicit();
-    if(pthreadInfo->createFunc) {
+    if(tls_pthreadInfo==NULL)
+        createImplicit();
+    if(tls_pthreadInfo->createFunc) {
         errlogPrintf("called from non-main thread\n");
         cantProceed("epicsThreadExitMain");
     }
     else {
-    free_threadInfo(pthreadInfo);
+    free_threadInfo(tls_pthreadInfo);
     pthread_exit(0);
     }
 }
 

 epicsShareFunc unsigned int epicsShareAPI epicsThreadGetPriority(epicsThreadId pthreadInfo)
 {
-    assert(epicsThreadOnceCalled);
+    assert(epicsThreadInitOnceCalled);
     return(pthreadInfo->osiPriority);
 }
 
@@ -626,7 +703,7 @@
     int status;
 #endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
 
-    assert(epicsThreadOnceCalled);
+    assert(epicsThreadInitOnceCalled);
     assert(pthreadInfo);
     if(!pthreadInfo->isEpicsThread) {
         fprintf(stderr,"epicsThreadSetPriority called by non epics thread\n");
@@ -637,7 +714,7 @@
 
 #if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) && _POSIX_THREAD_PRIORITY_SCHEDULING > 0
     if(!pcommonAttr->usePolicy) return;
-    pthreadInfo->schedParam.sched_priority = epicsThreadGetPosixPriority(pthreadInfo);
+    tls_pthreadInfo->schedParam.sched_priority = epicsThreadGetPosixPriority(pthreadInfo);
     status = pthread_attr_setschedparam(
         &pthreadInfo->attr,&pthreadInfo->schedParam);
     if(errVerbose) checkStatus(status,"pthread_attr_setschedparam");
@@ -685,14 +762,14 @@
 

 epicsShareFunc int epicsShareAPI epicsThreadIsEqual(epicsThreadId p1, epicsThreadId p2)
 {
-    assert(epicsThreadOnceCalled);
+    assert(epicsThreadInitOnceCalled);
     assert(p1);
     assert(p2);
     return(pthread_equal(p1->tid,p2->tid));
 }
 
 epicsShareFunc int epicsShareAPI epicsThreadIsSuspended(epicsThreadId pthreadInfo) {
-    assert(epicsThreadOnceCalled);
+    assert(epicsThreadInitOnceCalled);
     assert(pthreadInfo);
     return(pthreadInfo->isSuspended ? 1 : 0);
 }
@@ -718,14 +795,11 @@
 }
 
 epicsShareFunc epicsThreadId epicsShareAPI epicsThreadGetIdSelf(void) {
-    epicsThreadOSD *pthreadInfo;
 
     epicsThreadInit();
-    pthreadInfo = (epicsThreadOSD *)pthread_getspecific(getpthreadInfo);
-    if(pthreadInfo==NULL)
-        pthreadInfo = createImplicit();
-    assert ( pthreadInfo );
-    return(pthreadInfo);
+    if(tls_pthreadInfo==NULL)
+       createImplicit();
+    return(tls_pthreadInfo);
 }
 
 epicsShareFunc pthread_t epicsThreadGetPosixThreadId ( epicsThreadId threadId )
@@ -737,7 +811,7 @@
     epicsThreadOSD *pthreadInfo;
     int status;
 
-    assert(epicsThreadOnceCalled);
+    assert(epicsThreadInitOnceCalled);
     status = mutexLock(&listLock);
     checkStatus(status,"pthread_mutex_lock epicsThreadGetId");
     if(status)
@@ -755,18 +829,16 @@
 
 epicsShareFunc const char epicsShareAPI *epicsThreadGetNameSelf()
 {
-    epicsThreadOSD *pthreadInfo;
 
     epicsThreadInit();
-    pthreadInfo = (epicsThreadOSD *)pthread_getspecific(getpthreadInfo);
-    if(pthreadInfo==NULL)
-        pthreadInfo = createImplicit();
-    return(pthreadInfo->name);
+    if(tls_pthreadInfo==NULL)
+        createImplicit();
+    return(tls_pthreadInfo->name);
 }
 
 epicsShareFunc void epicsShareAPI epicsThreadGetName(epicsThreadId pthreadInfo, char *name, size_t size)
 {
-    assert(epicsThreadOnceCalled);
+    assert(epicsThreadInitOnceCalled);
     strncpy(name, pthreadInfo->name, size-1);
     name[size-1] = '\0';
 }
@@ -822,7 +894,7 @@
         return;
     }
     status = mutexLock(&listLock);
-    checkStatus(status,"pthread_mutex_lock epicsThreadShowAll");
+    checkStatus(status,"pthread_mutex_lock epicsThreadShow");
     if(status)
         return;
     pthreadInfo=(epicsThreadOSD *)ellFirst(&pthreadList);
@@ -835,7 +907,7 @@
         pthreadInfo=(epicsThreadOSD *)ellNext(&pthreadInfo->node);
     }
     status = pthread_mutex_unlock(&listLock);
-    checkStatus(status,"pthread_mutex_unlock epicsThreadShowAll");
+    checkStatus(status,"pthread_mutex_unlock epicsThreadShow");
     if(status) return;
     if (!found)
         printf("Thread %#lx (%lu) not found.\n", (unsigned long)showThread, (unsigned long)showThread);
@@ -851,7 +923,8 @@
     if(!key)
         return NULL;
     status = pthread_key_create(key,0);
-    checkStatus(status,"pthread_key_create epicsThreadPrivateCreate");
+//used from errlogInit
+    checkStatusOnce(status,"pthread_key_create epicsThreadPrivateCreate");
     if(status)
         return NULL;
     return((epicsThreadPrivateId)key);
@@ -862,7 +935,7 @@
     pthread_key_t *key = (pthread_key_t *)id;
     int status;
 
-    assert(epicsThreadOnceCalled);
+    assert(epicsThreadInitOnceCalled);
     status = pthread_key_delete(*key);
     checkStatusQuit(status,"pthread_key_delete","epicsThreadPrivateDelete");
     free((void *)key);
@@ -873,7 +946,7 @@
     pthread_key_t *key = (pthread_key_t *)id;
     int status;
 
-    assert(epicsThreadOnceCalled);
+    assert(epicsThreadInitOnceCalled);
     if(errVerbose && !value)
         errlogPrintf("epicsThreadPrivateSet: setting value of 0\n");
     status = pthread_setspecific(*key,value);
@@ -884,7 +957,7 @@
 {
     pthread_key_t *key = (pthread_key_t *)id;
 
-    assert(epicsThreadOnceCalled);
+    assert(epicsThreadInitOnceCalled);
     return pthread_getspecific(*key);
 }
 

=== modified file 'src/libCom/osi/os/posix/osdThreadExtra.c'
--- src/libCom/osi/os/posix/osdThreadExtra.c	2013-03-27 09:56:34 +0000
+++ src/libCom/osi/os/posix/osdThreadExtra.c	2017-05-01 18:36:52 +0000
@@ -24,22 +24,26 @@
 {
     if(!pthreadInfo) {
         fprintf(epicsGetStdout(),"            NAME       EPICS ID   "
-            "PTHREAD ID   OSIPRI  OSSPRI  STATE\n");
+            "PTHREAD ID   OSIPRI  OSSPRI  STATE  STACKSIZE\n");
     } else {
         struct sched_param param;
         int policy;
         int priority = 0;
+        size_t stackSize = 0;
 
         if(pthreadInfo->tid) {
             int status;
             status = pthread_getschedparam(pthreadInfo->tid,&policy,&param);
             if(!status) priority = param.sched_priority;
+            status = pthread_attr_getstacksize( &pthreadInfo->attr,&stackSize);
+            if(status) stackSize = 0;
         }
-        fprintf(epicsGetStdout(),"%16.16s %14p %12lu    %3d%8d %8.8s\n",
+        fprintf(epicsGetStdout(),"%16.16s %14p   0x%08X    %3d%8d %8.8s  %9d\n",
              pthreadInfo->name,(void *)
              pthreadInfo,(unsigned long)pthreadInfo->tid,
              pthreadInfo->osiPriority,priority,
-             pthreadInfo->isSuspended?"SUSPEND":"OK");
+             pthreadInfo->isSuspended?"SUSPEND":"OK",
+             stackSize);
     }
 }
 

=== modified file 'src/libCom/osi/osiSock.c'
--- src/libCom/osi/osiSock.c	2016-05-22 03:43:09 +0000
+++ src/libCom/osi/osiSock.c	2017-05-01 18:36:52 +0000
@@ -3,6 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
+* Copyright (c) 2015 Brookhaven Science Associates as Operator of
+*     Brookhaven National Lab.
 * 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. 
@@ -15,12 +17,15 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #define epicsExportSharedSymbols
 #include "epicsAssert.h"
 #include "epicsSignal.h"
 #include "epicsStdio.h"
+#include "dbDefs.h"
+#include "errlog.h"
 #include "osiSock.h"
 
 #define nDigitsDottedIP 4u
@@ -187,3 +192,155 @@
     }
 }
 
+epicsShareFunc void osiFreeInterfaceInfo(osiInterfaceInfo *pinfo)
+{
+    free(pinfo);
+}
+
+/*
+ * osiSockDiscoverBroadcastAddresses ()
+ */
+epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
+     (ELLLIST *pList, SOCKET socket, const osiSockAddr *pMatchAddr)
+{
+    ELLLIST infolist = ELLLIST_INIT;
+    ELLNODE *cur;
+
+    if ( pMatchAddr->sa.sa_family == AF_INET  ) {
+        if ( pMatchAddr->ia.sin_addr.s_addr == htonl (INADDR_LOOPBACK) ) {
+            osiSockAddrNode *pNewNode = 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;
+        }
+    } else if ( pMatchAddr->sa.sa_family != AF_UNSPEC ) {
+        errlogPrintf("osiSockDiscoverBroadcastAddresses(): match address must be AF_INET or AF_UNSPEC.");
+        return;
+    }
+
+    if(osiGetInterfaceInfo(&infolist, 0)) {
+        errlogPrintf ("osiSockDiscoverBroadcastAddresses(): unable to fetch network interface configuration\n");
+        return;
+    }
+
+    if(ellCount(&infolist)==0) {
+        errlogPrintf ("osiSockDiscoverBroadcastAddresses(): no network interfaces found\n");
+    }
+
+    for(cur=ellFirst(&infolist); cur; cur=ellNext(cur))
+    {
+        osiSockAddrNode *pNewNode;
+        osiInterfaceInfo *info = CONTAINER(cur, osiInterfaceInfo, node);
+
+        if(info->address.sa.sa_family!=AF_INET || !info->broadcast)
+            continue;
+
+        pNewNode = calloc(1, sizeof(*pNewNode));
+        if(!pNewNode)
+            break;
+
+        if(pMatchAddr->ia.sin_family==AF_INET &&
+           pMatchAddr->ia.sin_addr.s_addr != htonl(INADDR_ANY) &&
+           pMatchAddr->ia.sin_addr.s_addr != info->address.ia.sin_addr.s_addr)
+        {
+            free(pNewNode);
+            continue;
+        }
+
+        pNewNode->addr.ia = info->endpoint.ia;
+
+        ellAdd(pList, &pNewNode->node);
+    }
+
+    ellFree2(&infolist, (FREEFUNC)osiFreeInterfaceInfo);
+}
+
+/*
+ * osiLocalAddr ()
+ */
+epicsShareFunc osiSockAddr epicsShareAPI osiLocalAddr (SOCKET socket)
+{
+    static osiSockAddr result;
+    static int init;
+
+    if(!init) {
+        ELLLIST infolist = ELLLIST_INIT;
+        ELLNODE *cur;
+        osiSockAddr      addr;
+        int found = 0;
+
+        memset ( (void *) &addr, '\0', sizeof ( addr ) );
+        addr.sa.sa_family = AF_UNSPEC;
+
+        if(osiGetInterfaceInfo(&infolist, 0)) {
+            errlogPrintf ("osiLocalAddr(): unable to fetch network interface configuration\n");
+
+        } else {
+
+            for(cur=ellFirst(&infolist); cur; cur=ellNext(cur))
+            {
+                osiInterfaceInfo *info = CONTAINER(cur, osiInterfaceInfo, node);
+
+                if(info->address.sa.sa_family!=AF_INET || !info->up || info->loopback)
+                    continue;
+
+                addr.ia = info->address.ia;
+                found = 1;
+            }
+
+            ellFree(&infolist);
+        }
+
+        if(!found) {
+            addr.ia.sin_family = AF_INET;
+            addr.ia.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+            addr.ia.sin_port = 0;
+        }
+
+        result = addr;
+        init = 1;
+    }
+
+    return result;
+}
+
+epicsShareFunc
+int osiGetInterfaceInfoSingle(const osiSockAddr *paddr, osiInterfaceInfo **presult, unsigned flags)
+{
+    ELLLIST infolist = ELLLIST_INIT;
+    ELLNODE *cur;
+    int found = 0;
+
+    if(paddr->sa.sa_family!=AF_INET)
+        return -1;
+
+    if(osiGetInterfaceInfo(&infolist, flags)) {
+        errlogPrintf ("osiGetInterfaceInfoSingle(): unable to fetch network interface configuration\n");
+        return -1;
+    }
+
+    for(cur=ellFirst(&infolist); cur; cur=ellNext(cur))
+    {
+        osiInterfaceInfo *info = CONTAINER(cur, osiInterfaceInfo, node);
+
+        if(info->address.ia.sin_addr.s_addr==paddr->ia.sin_addr.s_addr) {
+            if(presult) {
+                *presult = info;
+                ellDelete(&infolist, cur);
+                // caller now responsible to free
+            }
+            found = 1;
+            break;
+        }
+    }
+
+    ellFree2(&infolist, (FREEFUNC)osiFreeInterfaceInfo);
+    return found ? 0 : -1;
+}
+

=== modified file 'src/libCom/osi/osiSock.h'
--- src/libCom/osi/osiSock.h	2016-05-22 03:43:09 +0000
+++ src/libCom/osi/osiSock.h	2017-05-01 18:36:52 +0000
@@ -155,6 +155,17 @@
     osiSockAddr addr;
 } osiSockAddrNode;
 
+typedef struct {
+    ELLNODE node;
+    unsigned int up:1;
+    unsigned int loopback:1;
+    unsigned int broadcast:1;
+    unsigned int multicast:1;
+    unsigned int point2point:1;
+    osiSockAddr address, netmask;
+    osiSockAddr endpoint; //!< broadcast or p2p destination address
+} osiInterfaceInfo;
+
 /*
  * sockAddrAreIdentical() 
  * (returns true if addresses are identical)
@@ -162,6 +173,32 @@
 epicsShareFunc int epicsShareAPI sockAddrAreIdentical 
 			( const osiSockAddr * plhs, const osiSockAddr * prhs );
 
+/* Fills the provided list with osiInterfaceInfo nodes
+ * describing the network interfaces of the host machine
+ * at the time it is called (may change later).
+ *
+ * Caller is responsible for freeing elements in the provided list with
+ * osiFreeInterfaceInfo().  This may be used individually, or in conjuction
+ * with ellFree2().
+ *
+ * flags provides for forward compatibility (eg. ipv6) and should be zero.
+ */
+epicsShareFunc int osiGetInterfaceInfo(ELLLIST *pList, unsigned flags);
+
+/* Find the interface information to the interface having address 'paddr'.
+ * Fills in the provided 'presults' if non-NULL, in which case the caller
+ * must free with osiFreeInterfaceInfo().
+ *
+ * Returns zero on success.
+ *
+ * flags provides for forward compatibility (eg. ipv6) and should be zero.
+ */
+epicsShareFunc
+int osiGetInterfaceInfoSingle(const osiSockAddr *paddr, osiInterfaceInfo **presult, unsigned flags);
+
+
+epicsShareFunc void osiFreeInterfaceInfo(osiInterfaceInfo *pinfo);
+
 /*
  *  osiSockDiscoverBroadcastAddresses ()
  *  Returns the broadcast addresses of each network interface found.

=== modified file 'src/libCom/test/Makefile'
--- src/libCom/test/Makefile	2016-07-22 04:37:54 +0000
+++ src/libCom/test/Makefile	2017-05-01 18:36:52 +0000
@@ -86,6 +86,13 @@
 testHarness_SRCS += epicsSockResolveTest.c
 TESTS += epicsSockResolveTest
 
+TESTPROD_HOST += epicsNetIntfTest
+epicsNetIntfTest_SRCS += epicsNetIntfTest.c
+epicsNetIntfTest_SYS_LIBS_solaris = socket
+epicsNetIntfTest_SYS_LIBS_WIN32 = ws2_32 user32
+testHarness_SRCS += epicsNetIntfTest.c
+TESTS += epicsNetIntfTest
+
 TESTPROD_HOST += epicsStringTest
 epicsStringTest_SRCS += epicsStringTest.c
 testHarness_SRCS += epicsStringTest.c

=== modified file 'src/libCom/test/epicsMessageQueueTest.cpp'
--- src/libCom/test/epicsMessageQueueTest.cpp	2016-05-22 12:38:18 +0000
+++ src/libCom/test/epicsMessageQueueTest.cpp	2017-05-01 18:36:52 +0000
@@ -151,7 +151,7 @@
         testOk(q1->pending() == i, "q1->pending() == %d", i);
     }
     testOk1(q1->pending() == 4);
-
+             
     want = 0;
     len = q1->receive(cbuf, sizeof cbuf);
     testOk1(q1->pending() == 3);

=== added file 'src/libCom/test/epicsNetIntfTest.c'
--- src/libCom/test/epicsNetIntfTest.c	1970-01-01 00:00:00 +0000
+++ src/libCom/test/epicsNetIntfTest.c	2017-05-01 18:36:52 +0000
@@ -0,0 +1,220 @@
+/*************************************************************************\
+* Copyright (c) 2015 Brookhaven Science Associates as Operator of
+*     Brookhaven National Lab.
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
+\*************************************************************************/
+
+#include <stdlib.h>
+
+#include "dbDefs.h"
+#include "osiSock.h"
+#include "epicsTypes.h"
+
+#include "epicsUnitTest.h"
+#include "testMain.h"
+
+static
+void testIfInfo(void)
+{
+    int foundlo = 0, bcastok = 1;
+    ELLLIST iflist = ELLLIST_INIT;
+    ELLNODE *cur;
+    testDiag("Check interface introspection info");
+
+#ifdef USE_IFADDRS
+    testDiag("Using getifaddrs() method");
+#else
+    testDiag("Using OS default method");
+#endif
+
+    testOk1(osiGetInterfaceInfo(&iflist, 0)==0);
+
+    testOk(ellCount(&iflist)>0, "interface count %d", ellCount(&iflist));
+
+    for(cur=ellFirst(&iflist); cur; cur=ellNext(cur))
+    {
+        osiInterfaceInfo *info = CONTAINER(cur, osiInterfaceInfo, node);
+        char buf[30];
+
+        if(info->loopback) {
+            testOk(info->up, "loopback interface is up");
+            foundlo = 1;
+        }
+
+        if(info->address.sa.sa_family!=AF_INET)
+            continue;
+
+        ipAddrToDottedIP(&info->address.ia, buf, sizeof(buf));
+        testDiag("Address: %s", buf);
+        ipAddrToDottedIP(&info->netmask.ia, buf, sizeof(buf));
+        testDiag("Netmask: %s", buf);
+        if(info->broadcast) {
+            ipAddrToDottedIP(&info->endpoint.ia, buf, sizeof(buf));
+            testDiag("Broadcast: %s", buf);
+        } else if(info->point2point) {
+            ipAddrToDottedIP(&info->endpoint.ia, buf, sizeof(buf));
+            testDiag("Destination: %s", buf);
+        }
+
+        testDiag(" Up: %s", info->up?"Up":"Down");
+        testDiag(" Loopback: %s", info->loopback?"Yes":"No");
+        testDiag(" Broadcast: %s", info->broadcast?"Yes":"No");
+        testDiag(" Multicast: %s", info->multicast?"Yes":"No");
+        testDiag(" Point2Point: %s", info->point2point?"Yes":"No");
+
+        /* check consistency of address, netmask, and broadcast address */
+        if(info->broadcast) {
+            epicsUInt32 addr  = ntohl(info->address.ia.sin_addr.s_addr),
+                        mask  = ntohl(info->netmask.ia.sin_addr.s_addr),
+                        bcast = ntohl(info->endpoint.ia.sin_addr.s_addr),
+                        bcast2= (addr&mask) | ~mask;
+
+            if(bcast!=bcast2) {
+                struct sockaddr_in addr;
+                addr.sin_family = AF_INET;
+                addr.sin_addr.s_addr = htonl(bcast2);
+                addr.sin_port = 0;
+                ipAddrToDottedIP(&addr, buf, sizeof(buf));
+                testDiag("Warning: expected broadcast address %s", buf);
+                bcastok = 0;
+            }
+        }
+    }
+
+    ellFree2(&iflist, (FREEFUNC)osiFreeInterfaceInfo);
+
+    testOk(foundlo, "Found loopback interface");
+    testOk(bcastok, "Broadcast addresses consistent");
+}
+
+static
+void testBroadcast(void)
+{
+    ELLLIST iflist = ELLLIST_INIT;
+    ELLNODE *cur;
+    SOCKET sock;
+    osiSockAddr match;
+
+    testDiag("Discover broadcast addresses");
+
+    sock = epicsSocketCreate(AF_INET, SOCK_DGRAM, 0);
+    if(sock==INVALID_SOCKET)
+        testAbort("Failed to allocate socket");
+
+    match.ia.sin_family = AF_INET;
+    match.ia.sin_addr.s_addr = htonl(INADDR_ANY);
+    match.ia.sin_port = 0;
+
+    osiSockDiscoverBroadcastAddresses(&iflist, sock, &match);
+
+    testOk(ellCount(&iflist)>0, "broadcast count %d", ellCount(&iflist));
+
+    for(cur=ellFirst(&iflist); cur; cur=ellNext(cur))
+    {
+        osiSockAddrNode *info = CONTAINER(cur, osiSockAddrNode, node);
+        char buf[30];
+
+        ipAddrToDottedIP(&info->addr.ia, buf, sizeof(buf));
+        testDiag("Broadcast: %s", buf);
+    }
+
+    ellFree(&iflist);
+
+    testDiag("\"Discover\" loopback address");
+
+    match.ia.sin_family = AF_INET;
+    match.ia.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+    match.ia.sin_port = 0;
+
+    osiSockDiscoverBroadcastAddresses(&iflist, sock, &match);
+
+    testOk(ellCount(&iflist)>0, "broadcast count %d", ellCount(&iflist));
+
+    for(cur=ellFirst(&iflist); cur; cur=ellNext(cur))
+    {
+        osiSockAddrNode *info = CONTAINER(cur, osiSockAddrNode, node);
+        char buf[30];
+
+        ipAddrToDottedIP(&info->addr.ia, buf, sizeof(buf));
+        testDiag("Broadcast: %s", buf);
+    }
+
+    ellFree(&iflist);
+
+    epicsSocketDestroy(sock);
+}
+
+static
+void testLocal(void)
+{
+    SOCKET sock;
+    osiSockAddr addr;
+    char buf[30];
+
+    testDiag("Discover first local address");
+
+    sock = epicsSocketCreate(AF_INET, SOCK_DGRAM, 0);
+    if(sock==INVALID_SOCKET)
+        testAbort("Failed to allocate socket");
+
+    addr = osiLocalAddr(sock);
+
+    testOk1(addr.sa.sa_family==AF_INET);
+
+    ipAddrToDottedIP(&addr.ia, buf, sizeof(buf));
+    testDiag("Address: %s", buf);
+
+    epicsSocketDestroy(sock);
+}
+
+static
+void testBroadcastMatch(void)
+{
+    SOCKET sock;
+    osiSockAddr match;
+    ELLNODE *cur;
+    ELLLIST iflist = ELLLIST_INIT;
+    char buf[30];
+
+    testDiag("Check osiSockDiscoverBroadcastAddresses() w/ matching");
+
+    sock = epicsSocketCreate(AF_INET, SOCK_DGRAM, 0);
+    if(sock==INVALID_SOCKET)
+        testAbort("Failed to allocate socket");
+
+    match = osiLocalAddr(sock);
+
+    testOk1(match.sa.sa_family==AF_INET);
+    ipAddrToDottedIP(&match.ia, buf, sizeof(buf));
+    testDiag("Address: %s", buf);
+
+    osiSockDiscoverBroadcastAddresses(&iflist, sock, &match);
+
+    testOk(ellCount(&iflist)>0, "broadcast count %d", ellCount(&iflist));
+
+    for(cur=ellFirst(&iflist); cur; cur=ellNext(cur))
+    {
+        osiSockAddrNode *info = CONTAINER(cur, osiSockAddrNode, node);
+        char buf[30];
+
+        ipAddrToDottedIP(&info->addr.ia, buf, sizeof(buf));
+        testDiag("Broadcast: %s", buf);
+    }
+
+    ellFree(&iflist);
+
+    epicsSocketDestroy(sock);
+}
+
+MAIN(epicsNetIntfTest)
+{
+    testPlan(10);
+    osiSockAttach();
+    testIfInfo();
+    testBroadcast();
+    testLocal();
+    testBroadcastMatch();
+    osiSockRelease();
+    return testDone();
+}

=== modified file 'src/libCom/test/epicsRunLibComTests.c'
--- src/libCom/test/epicsRunLibComTests.c	2016-07-22 04:37:54 +0000
+++ src/libCom/test/epicsRunLibComTests.c	2017-05-01 18:36:52 +0000
@@ -30,6 +30,7 @@
 int epicsMMIOTest(void);
 int epicsMutexTest(void);
 int epicsSockResolveTest(void);
+int epicsNetIntfTest(void);
 int epicsSpinTest(void);
 int epicsStackTraceTest(void);
 int epicsStdioTest(void);
@@ -84,6 +85,7 @@
     runTest(epicsMMIOTest);
     runTest(epicsMutexTest);
     runTest(epicsSockResolveTest);
+    runTest(epicsNetIntfTest);
     runTest(epicsSpinTest);
     runTest(epicsStackTraceTest);
     runTest(epicsStdioTest);

=== modified file 'src/libCom/test/ringPointerTest.c'
--- src/libCom/test/ringPointerTest.c	2014-11-18 23:30:43 +0000
+++ src/libCom/test/ringPointerTest.c	2017-05-01 18:36:52 +0000
@@ -235,7 +235,6 @@
 MAIN(ringPointerTest)
 {
     int prio = epicsThreadGetPrioritySelf();
-
     testPlan(37);
     testSingle();
     epicsThreadSetPriority(epicsThreadGetIdSelf(), epicsThreadPriorityScanLow);