Convert NDPluginPva to use PVXS

ADApp/Makefile

@@ -12,7 +12,8 @@ pluginSrc_DEPEND_DIRS += ADSrc
 DIRS += pluginTests
 pluginTests_DEPEND_DIRS += pluginSrc
 
-ifeq ($(WITH_PVA), YES)
+# if WITH_PVA or WITH_PVA = YES
+ifeq ($(findstring YES,$(WITH_PVA) $(WITH_PVXS)), YES)
   DIRS += ntndArrayConverterSrc
   ntndArrayConverterSrc_DEPEND_DIRS += ADSrc
   pluginSrc_DEPEND_DIRS += ntndArrayConverterSrc

ADApp/commonDriverMakefile

@@ -37,6 +37,14 @@ ifeq ($(WITH_PVA),YES)
   endif
 endif
 
+ifeq ($(WITH_PVXS),YES)
+  $(DBD_NAME)_DBD += NDPluginPvxs.dbd
+  $(DBD_NAME)_DBD += pvxsIoc.dbd
+  PROD_LIBS += pvxs
+  PROD_LIBS += pvxsIoc
+  PROD_LIBS += ntndArrayConverterPvxs
+endif
+
 ifeq ($(WITH_NETCDF),YES)
   $(DBD_NAME)_DBD += NDFileNetCDF.dbd
   ifeq ($(NETCDF_EXTERNAL),NO)

ADApp/commonLibraryMakefile

@@ -11,6 +11,10 @@ ifeq ($(WITH_PVA),YES)
   LIB_LIBS += pvData
 endif
 
+ifeq ($(WITH_PVXS),YES)
+  LIB_LIBS += ntndArrayConverterPvxs
+endif
+
 ifeq ($(WITH_NETCDF),YES)
   ifeq ($(NETCDF_EXTERNAL),NO)
     LIB_LIBS += netCDF

ADApp/ntndArrayConverterSrc/Makefile

@@ -4,19 +4,29 @@ include $(TOP)/configure/CONFIG
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
 #=============================
 
-LIBRARY_IOC += ntndArrayConverter
-INC += ntndArrayConverterAPI.h
-INC += ntndArrayConverter.h
-LIB_SRCS += ntndArrayConverter.cpp
+ifeq ($(WITH_PVA), YES)
+	LIBRARY_IOC += ntndArrayConverter
+	INC += ntndArrayConverter.h
+	INC += ntndArrayConverterCommon.h
+	LIB_SRCS += ntndArrayConverter.cpp
+	LIB_LIBS += pvData
+	LIB_LIBS += nt
+endif
 
-USR_CPPFLAGS += -DBUILDING_ntndArrayConverter_API
+ifeq ($(WITH_PVXS), YES)
+	LIBRARY_IOC += ntndArrayConverterPvxs
+	INC += ntndArrayConverterPvxs.h
+	INC += ntndArrayConverterCommon.h
+	LIB_SRCS += ntndArrayConverterPvxs.cpp
+	LIB_LIBS += pvxs
+	ntndArrayConverterPvxs_CXXFLAGS += -std=c++11
+endif
 
+INC += ntndArrayConverterAPI.h
+USR_CPPFLAGS += -DBUILDING_ntndArrayConverter_API
 LIB_LIBS              += ADBase
-LIB_LIBS              += pvData
-LIB_LIBS              += nt
 LIB_LIBS              += asyn
 LIB_LIBS              += $(EPICS_BASE_IOC_LIBS)
-
 #=============================
 
 include $(TOP)/configure/RULES

ADApp/ntndArrayConverterSrc/ntndArrayConverter.h

@@ -1,25 +1,10 @@
+#ifndef INC_ntndArrayConverter_H
+#define INC_ntndArrayConverter_H
 #include <math.h>
 
 #include <ntndArrayConverterAPI.h>
-#include <NDArray.h>
 #include <pv/ntndarray.h>
-
-typedef struct NTNDArrayInfo
-{
-    int ndims;
-    size_t dims[ND_ARRAY_MAX_DIMS];
-    size_t nElements, totalBytes;
-    int bytesPerElement;
-    NDColorMode_t colorMode;
-    NDDataType_t dataType;
-    std::string codec;
-
-    struct
-    {
-        int dim;
-        size_t size, stride;
-    }x, y, color;
-}NTNDArrayInfo_t;
+#include "ntndArrayConverterCommon.h"
 
 class NTNDARRAYCONVERTER_API NTNDArrayConverter
 {
@@ -66,3 +51,5 @@ class NTNDARRAYCONVERTER_API NTNDArrayConverter
 };
 
 typedef std::tr1::shared_ptr<NTNDArrayConverter> NTNDArrayConverterPtr;
+
+#endif // INC_ntndArrayConverter_H

ADApp/ntndArrayConverterSrc/ntndArrayConverterCommon.h

@@ -0,0 +1,23 @@
+#ifndef INC_ntndArrayConverterCommon_H
+#define INC_ntndArrayConverterCommon_H
+#include <NDArray.h>
+
+
+typedef struct NTNDArrayInfo
+{
+    int ndims;
+    size_t dims[ND_ARRAY_MAX_DIMS];
+    size_t nElements, totalBytes;
+    int bytesPerElement;
+    NDColorMode_t colorMode;
+    NDDataType_t dataType;
+    std::string codec;
+
+    struct
+    {
+        int dim;
+        size_t size, stride;
+    }x, y, color;
+} NTNDArrayInfo_t;
+
+#endif // INC_ntndArrayConverterCommon_H