*** empty log message ***

iocBoot/Makefile

 TOP = ..
-include $(TOP)/config/CONFIG_APP
-DIRS += $(wildcard *ioc*)
-include $(TOP)/config/RULES.iocBoot
+include $(TOP)/configure/CONFIG
+include $(TOP)/configure/RULES.iocBoot

iocBoot/iocxxx/st.cmd

@@ -94,7 +94,7 @@ xxxVX_registerRecordDeviceDriver(pdbbase)
 #dbLoadRecords("$(STD)/stdApp/Db/interp.db", "P=xxx:")
 
 # 4-step measurement
-#dbLoadRecords("$(STD)/stdApp/Db/4step.db", "P=xxx:")
+dbLoadRecords("$(STD)/stdApp/Db/4step.db", "P=xxx:")
 
 # X-ray Instrumentation Associates Huber Slit Controller
 # supported by a customized version of the SNL program written by Pete Jemian
@@ -456,7 +456,6 @@ dbLoadRecords("$(STD)/stdApp/Db/misc.db","P=xxx:")
 ###############################################################################
 # Set shell prompt (otherwise it is left at mv167 or mv162)
 shellPromptSet "iocxxx> "
-#reboot_restoreDebug=5
 iocLogDisable=1
 iocInit
 

iocBoot/nfsCommands

@@ -13,8 +13,8 @@ routeShow
 # rather than FTP, for booting the VME crate, and generally for reading
 # and writing files on the server.
 #
-#hostAdd("beams","164.54.100.5")
-#nfsMount("beams","/export/homeb","/home/beams")
+hostAdd("beams","164.54.100.5")
+nfsMount("beams","/export/homeb","/home/beams")
 hostAdd("oxygen","164.54.52.4")
 nfsMount("oxygen","/home/oxygen","/home/oxygen")
 nfsMount("oxygen","/home/oxygen4","/home/oxygen4")

xxxApp/src/Makefile

@@ -112,7 +112,7 @@ seqDev_DIR = $(SEQ_LIB)
 xxx_LIBS += std
 std_DIR = $(STD_LIB)
 
-xxx_LIBS += mpf mpfEpics mpfSerial
+xxx_LIBS += mpfSerial mpf mpfEpics
 mpf_DIR = $(MPF_LIB)
 mpfEpics_DIR = $(MPF_LIB)
 mpfSerial_DIR = $(MPF_LIB)

xxxApp/src/xxxInclude.dbd

+# stuff for non-vxWorks ioc
 include "shareBase.dbd"
 include "stdSupport.dbd"
+include "mpf.dbd"
 include "mpfSerial.dbd"
 include "motorRecord.dbd"
 include "devSoftMotor.dbd"

xxxApp/src/xxxVXInclude.dbd

-# stuff to be added only for vxWorks ioc
-include "xxxInclude.dbd"
+# stuff for vxWorks ioc
+include "shareBase.dbd"
+include "stdSupport.dbd"
+
+include "motorRecord.dbd"
+include "devSoftMotor.dbd"
+include "devOms.dbd"
+#include "devAcsMotor.dbd"
+#include "devImsMotor.dbd"
+#include "devMclennanMotor.dbd"
+#include "devNewport.dbd"
+
 
 include "stdVXSupport.dbd"
 
@@ -15,20 +25,18 @@ include "devAoDAC128V.dbd"
 
 include "devIp330.dbd"
 
-include "devOms.dbd"
-#include "devAcsMotor.dbd"
-#include "devImsMotor.dbd"
-#include "devMXmotor.dbd"
-#include "devMclennanMotor.dbd"
-#include "devNewport.dbd"
-
 #include "camacSupport.dbd"
 #include "devCamacSupport.dbd"
 #include "dxpCamacSupport.dbd"
+
 #include "allenBradley.dbd"
 include "devLove.dbd"
 include "drvIpac.dbd"
 
+include "mpf.dbd"
+include "devStringMpf.dbd"
+include "mpfSerialVx.dbd"
+
 # Locally defined stuff that needs to be registered
 #registrar(myRegistrar)
 #variable(myDebug)