From 6150cdff836b7e917063900c65a860f5e5f0365a Mon Sep 17 00:00:00 2001
From: MarkRivers <rivers@cars.uchicago.edu>
Date: Tue, 19 Dec 2006 17:37:13 +0000
Subject: [PATCH] Changes for XPS

---
 motorApp/NewportSrc/Makefile       | 14 ++++++++++----
 motorApp/NewportSrc/devNewport.dbd |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/motorApp/NewportSrc/Makefile b/motorApp/NewportSrc/Makefile
index ff669c93..44b9ec4b 100644
--- a/motorApp/NewportSrc/Makefile
+++ b/motorApp/NewportSrc/Makefile
@@ -22,7 +22,7 @@ SRCS += devMM3000.cc drvMM3000.cc
 SRCS += devMM4000.cc drvMM4000.cc
 SRCS += drvMM4000Asyn.c
 SRCS += MM4005_trajectoryScan.st
-SRCS_vxWorks += XPS_trajectoryScan.st
+SRCS += XPS_trajectoryScan.st
 
 # PM500 device driver.
 SRCS += devPM500.cc  drvPM500.cc
@@ -32,10 +32,11 @@ SRCS += devESP300.cc drvESP300.cc
 
 # XPS C8 device driver
 SRCS += asynOctetSocket.cpp 
-SRCS += XPS_C8_drivers.cpp drvXPSAsyn.c drvXPSAsynAux.c XPSAsynInterpose.c
+SRCS += XPS_C8_drivers.cpp drvXPSAsyn.c drvXPSAsynAux.c XPSAsynInterpose.c xps_ftp.c
 
-# XPS Gathering Test C script function -> int xpsgathering(void)
-SRCS_vxWorks += XPSGathering.cc
+# XPS Gathering test function
+SRCS += XPSGathering.c
+SRCS += XPSGatheringRegister.c
 
 # Function which will run a tcl script on an XPS
 SRCS += tclCall.cc
@@ -43,5 +44,10 @@ SRCS += tclCall.cc
 Newport_LIBS += motor asyn seq pv
 Newport_LIBS += $(EPICS_BASE_IOC_LIBS)
 
+PROD_IOC += XPSGatheringMain
+XPSGatheringMain_SRCS += XPSGatheringMain.c
+XPSGatheringMain_LIBS += Newport motor asyn seq pv
+XPSGatheringMain_LIBS += $(EPICS_BASE_IOC_LIBS)
+
 include $(TOP)/configure/RULES
 
diff --git a/motorApp/NewportSrc/devNewport.dbd b/motorApp/NewportSrc/devNewport.dbd
index 21e17f29..782f28cf 100644
--- a/motorApp/NewportSrc/devNewport.dbd
+++ b/motorApp/NewportSrc/devNewport.dbd
@@ -10,11 +10,12 @@ driver(drvESP300)
 driver(motorXPS)
 driver(motorMM4000)
 registrar(NewportRegister)
+registrar(XPSGatheringRegister)
 registrar(XPSRegister)
 registrar(XPSInterposeRegister)
 registrar(drvXPSAsynAuxRegister)
 registrar(MM4005_trajectoryScanRegistrar)
-# Only on vxWorks registrar(XPS_trajectoryScanRegistrar)
+registrar(XPS_trajectoryScanRegistrar)
 #variable(devXPSC8Debug)
 #variable(drvXPSC8Debug)
 #variable(drvESP300debug)