diff --git a/Makefile b/Makefile index 0f2d7957..c4d08e95 100644 --- a/Makefile +++ b/Makefile @@ -10,15 +10,4 @@ motorApp_DEPEND_DIRS = configure DIRS += modules modules_DEPEND_DIRS = motorApp -# To build motor examples; -# 1st - uncomment lines below. -# 2nd - uncomment required support module lines at the bottom of -# /configure/RELEASE. -# 3rd - make clean uninstall -# 4th - make - -#!DIRS += motorExApp iocBoot -#!motorExApp_DEPEND_DIRS = motorApp -#!iocBoot_DEPEND_DIRS = motorExApp - include $(TOP)/configure/RULES_TOP diff --git a/iocBoot/Makefile b/iocBoot/Makefile deleted file mode 100644 index 91e47d0b..00000000 --- a/iocBoot/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -TOP = .. -include $(TOP)/configure/CONFIG -DIRS += $(wildcard *ioc*) -DIRS += $(wildcard as*) -include $(CONFIG)/RULES_DIRS - diff --git a/iocBoot/iocWithAsyn/Makefile b/iocBoot/iocWithAsyn/Makefile deleted file mode 100644 index 97f7c425..00000000 --- a/iocBoot/iocWithAsyn/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -TOP = ../.. -include $(TOP)/configure/CONFIG -ARCH = linux-x86 -#ARCH = win32-x86 -#ARCH = vxWorks-ppc604 -#ARCH = windows-x64 -TARGETS = cdCommands -TARGETS += envPaths -TARGETS += dllPath.bat -include $(TOP)/configure/RULES.ioc - diff --git a/iocBoot/iocWithAsyn/README b/iocBoot/iocWithAsyn/README deleted file mode 100644 index 863f7e69..00000000 --- a/iocBoot/iocWithAsyn/README +++ /dev/null @@ -1,22 +0,0 @@ -To build any examples; - -- in /configure/RELEASE: EPICS_BASE and MOTOR must be defined. - -- in /Makefile: the following two lines must be uncommented; - #DIRS := $(DIRS) $(filter-out $(DIRS), motorExApp) - #DIRS := $(DIRS) $(filter-out $(DIRS), iocBoot) - -To build the iocWithAsyn example; - -- in /configure/RELEASE: IPAC and ASYN must be defined. - - -Finally, cd ; gnumake clean uninstall; gnumake - -To run this "asyn" example on a Unix OS; -- Set the EPICS_HOST_ARCH environment variable correctly. -- Edit the st.cmd.unix file for either sun or linux. -- Start the ioc from this directory by executing the following command. - -../../bin/${EPICS_HOST_ARCH}/WithAsyn st.cmd.unix - diff --git a/iocBoot/iocWithAsyn/motor.substitutions b/iocBoot/iocWithAsyn/motor.substitutions deleted file mode 100644 index 9acdfa9a..00000000 --- a/iocBoot/iocWithAsyn/motor.substitutions +++ /dev/null @@ -1,9 +0,0 @@ -file "$(MOTOR)/db/basic_motor.db" -{ -pattern -{P, N, M, DTYP, C, S, DESC, EGU, DIR, VELO, VBAS, ACCL, BDST, BVEL, BACC, MRES, PREC, DHLM, DLLM, INIT} -{IOC:, 1, "m$(N)", "MM4000", 0, 0, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{IOC:, 2, "m$(N)", "MM4000", 0, 1, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{IOC:, 3, "m$(N)", "MM4000", 0, 2, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{IOC:, 4, "m$(N)", "MM4000", 0, 3, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -} diff --git a/iocBoot/iocWithAsyn/st.cmd.Vx b/iocBoot/iocWithAsyn/st.cmd.Vx deleted file mode 100644 index 2979381a..00000000 --- a/iocBoot/iocWithAsyn/st.cmd.Vx +++ /dev/null @@ -1,35 +0,0 @@ -# The is the "ASYN" example for communication to a controller -# The examples must be configured by including or omitting -# comment characters (i.e., #'s) from this file. - -# "#!" marks lines that can be uncommented. - -# The following must be added for many board support packages -#!cd "... IOC st.cmd complete directory path ... " - -< cdCommands -#!< ../nfsCommands - -cd topbin - -# If the VxWorks kernel was built using the project facility, the following must -# be added before any C++ code is loaded (see SPR #28980). -sysCplusEnable=1 - -ld < WithAsynVx.munch - -cd startup -dbLoadDatabase("$(TOP)/dbd/WithAsynVx.dbd") -WithAsynVx_registerRecordDeviceDriver(pdbbase) - -dbLoadTemplate("motor.substitutions") -dbLoadRecords("$(MOTOR)/db/motorUtil.db", "P=IOC:") - -# Configure the ASYN server code. This MUST be configured too! -< st_asynserver.cmd.Vx - -iocInit - -# motorUtil (allstop & alldone) -motorUtilInit("IOC:") - diff --git a/iocBoot/iocWithAsyn/st.cmd.unix b/iocBoot/iocWithAsyn/st.cmd.unix deleted file mode 100644 index 6373f358..00000000 --- a/iocBoot/iocWithAsyn/st.cmd.unix +++ /dev/null @@ -1,28 +0,0 @@ -# The is the ASYN example for communication -# "#!" marks lines that can be uncommented. - -< envPaths - -dbLoadDatabase("$(TOP)/dbd/WithAsyn.dbd") -WithAsyn_registerRecordDeviceDriver(pdbbase) -dbLoadTemplate("motor.substitutions") -dbLoadRecords("$(MOTOR)/db/motorUtil.db", "P=IOC:") - - -# The following commands are for a local serial line -# Configure the asyn server code for either sun or linux. -#!Sun Solaris !drvAsynSerialPortConfigure("L0","/dev/ttya" ,0,0,0) -#!Redhat Linux!drvAsynSerialPortConfigure("L0","/dev/ttyS0",0,0,0) - -asynSetOption("L0", -1, "baud", "9600") -asynSetOption("L0", -1, "bits", "8") -asynSetOption("L0", -1, "parity", "none") -asynSetOption("L0", -1, "stop", "1") -asynSetOption("L0", -1, "clocal", "Y") -asynSetOption("L0", -1, "crtscts", "N") - -iocInit - -# motorUtil (allstop & alldone) -motorUtilInit("IOC:") - diff --git a/iocBoot/iocWithAsyn/st.cmd.win32 b/iocBoot/iocWithAsyn/st.cmd.win32 deleted file mode 100755 index 9406c087..00000000 --- a/iocBoot/iocWithAsyn/st.cmd.win32 +++ /dev/null @@ -1,17 +0,0 @@ -# The is the ASYN example for communication -# "#!" marks lines that can be uncommented. - -< envPaths - -dbLoadDatabase("$(TOP)/dbd/WithAsynWin32.dbd") -WithAsynWin32_registerRecordDeviceDriver(pdbbase) -dbLoadTemplate("motor.substitutions") -dbLoadRecords("$(MOTOR)/db/motorUtil.db", "P=IOC:") - -# This is for WIN32, local serial ports not supported. Must use IP terminal server. - -iocInit - -# motorUtil (allstop & alldone) -motorUtilInit("IOC:") - diff --git a/iocBoot/iocWithAsyn/st_asynserver.cmd.Vx b/iocBoot/iocWithAsyn/st_asynserver.cmd.Vx deleted file mode 100644 index 23024d0b..00000000 --- a/iocBoot/iocWithAsyn/st_asynserver.cmd.Vx +++ /dev/null @@ -1,136 +0,0 @@ -# This configures the ASYN server stuff. -# "#!" marks lines that can be uncommented. - -# Initialize the IP carriers; IPAC R2.8 -# ------------------------------------- -# ipacAdd{CarrierType}(char *cardParams) -# CarrierType - VIPC310, VIPC610, VIPC610_01, VIPC616, VIPC616_01, -# MVME162, or ATC40. -# cardParams - carrier-specific init parameters. -# ipacAddVIPC616_01(const char *cardParams); -# ipacAddMVME162(const char *cardParams) -# -# For SBS VIPC616-01 IP carrier board. A32 and A24 examples follow: -# - A32 addressing. -# - default I/O Base Address (0x6000). -# - IP modules occupy 32MB of memory from 0x9000 0000 to 0x91FF FFFF. -# - IP module A at 0x90000000, -# module B at 0x90800000, -# module C at 0x91000000, -# module D at 0x91800000 -#!ipacAddVIPC616_01("6000,A0000000") - -# - A24 addressing. -# - default I/O Base Address (0x6000). -# - default IP module base address at 0x00D0 0000 -# occupies 512 bytes of memory from 0x00D0 0000 to 0x00D0 01FF. -# - IP module A at 0x0x00D0 007F, -# module B at 0x0x00D0 0100, -# module C at 0x0x00D0 017F, -# module D at 0x0x00D0 01FF - -#!ipacAddVIPC616_01("6000,A0000000") - -# For MVME162 and MVME172 CPU board IP carrier. -#!ipacAddMVME162("A:l=3,3 m=0xe0000000,64;B:l=3,3 m=0xe0010000,64;C:l=3,3 m=0xe0020000,64;D:l=3,3 m=0xe0030000,64") - -# Allocate the number of tyGSOctal modules to support. -# ---------------------------------------------------- - -#!tyGSOctalDrv(1) - -# Initialize IP Octal modules. -# ---------------------------- -# tyGSOctalModuleInit(char *moduleID, char *ModuleType, int irq_num, -# char *carrier#, int slot#) -# moduleID - assign the IP module a name for future reference. -# ModuleType - "232", "422", or "485". -# irq_num - interrupt request number. -# carrier# - carrier# assigned from the ipacAddCarrierType() call. -# slot# - slot number on carrier; slot[A,B,C,D] -> slot#[0,1,2,3]. - -#!tyGSOctalModuleInit "Mod0", "232", 0x80, 0, 0 - -# Create tty devices. -# ------------------ -# tyGSOctalDevCreate(char *portname, int moduleID, int port#, int rdBufSize, -# int wrtBufSize) -# portname - assign the port a name for future reference. -# moduleID - moduleID from the tyGSOctalModuleInit() call. -# port# - port number for this module [0-7]. -# rdBufSize - read buffer size, in bytes. -# wrtBufSize - write buffer size, in bytes. - -# Create two tty ports on Mod0 with portname based on the convention; -# "/tyGScarrier#/moduleID/port#". - -#!tyGSOctalDevCreate "/tyGS0/Mod0/0", "Mod0", 0, 512, 512 -#!tyGSOctalDevCreate "/tyGS0/Mod0/1", "Mod0", 1, 512, 512 - -# Create all uninitialized tty devices. -# ------------------------------------ -# tyGSOctalDevCreateAll(char *base, char *moduleID, int rdBufSize, -# int wrtBufSize) -# base - base name for these devices. -# moduleID - module identifier from the call to tyGSOctalModuleInit(). -# rdBufSize - read buffer size, in bytes. -# wrtBufSize - write buffer size, in bytes. - -# Initialze all the remaining uninitialized Mod0 ports; i.e., /tyGS0/0/[2-7]. -#!tyGSOctalDevCreateAll "/tyGS0/Mod0/", "Mod0", 512, 512 - -# Configurd asyn serial port. -# --------------------------- -# drvAsynSerialPortConfigure("portName","ttyName",priority,noAutoConnect, -# noProcessEosIn) -# -# portName - The portName that is registered with asynGpib. -# ttyName - The name of the local serial port (e.g. "/dev/ttyS0"). -# priority - Priority at which the asyn I/O thread will run. If this is -# zero or missing,then epicsThreadPriorityMedium is used. -# noAutoConnect - Zero or missing indicates that portThread should -# automatically connect. Non-zero if explicit connect command -# must be issued. -# noProcessEos - If 0 then asynInterposeEosConfig is called specifying both -# processEosIn and processEosOut. - -#!drvAsynSerialPortConfigure("L0","/tyGS0/Mod0/0",0,0,0) -#!drvAsynSerialPortConfigure("L1","/tyGS0/Mod0/1",0,0,0) - -#!asynSetOption("L0", 0, "baud", "9600") -#!asynSetOption("L0", 0, "bits", "8") -#!asynSetOption("L0", 0, "parity", "none") -#!asynSetOption("L0", 0, "stop", "1") -#!asynSetOption("L0", 0, "clocal", "Y") -#!asynSetOption("L0", 0, "crtscts", "N") - -# ASYN trace masks -#!asynSetTraceMask( "L0", 0, 0x9 ) -#!asynSetTraceIOMask( "L0", 0, 0x1 ) - -#!asynSetOption("L1", 0, "baud", "9600") -#!asynSetOption("L1", 0, "bits", "8") -#!asynSetOption("L1", 0, "parity", "none") -#!asynSetOption("L1", 0, "stop", "1") -#!asynSetOption("L1", 0, "clocal", "Y") -#!asynSetOption("L1", 0, "crtscts", "N") - -# TCP/IP or UDP/IP ASYN port configuration. -# -# drvAsynIPPortConfigure("portName", "hostInfo", priority, noAutoConnect, -# noProcessEos) -# (1) portName - The portName that is registered with asynGpib. -# (2) hostInfo - The Internet host name, port number and optional IP protocol -# of the device (e.g. "164.54.9.90:4002", "serials8n3:4002", -# "serials8n3:4002 TCP" or "164.54.17.43:5186 udp"). If no -# protocol is specified, TCP will be used. -# (3) priority - Priority at which the asyn I/O thread will run. If zero or -# missing, then epicsThreadPriorityMedium is used. -# (4) noAutoConnect - Zero or missing indicates that portThread should -# automatically connect. Non-zero if explicit connect -# command must be issued. -# (5) noProcessEos - If 0 then asynInterposeEosConfig is called specifying -# both processEosIn and processEosOut. -#!drvAsynIPPortConfigure("tcp1","164.54.160.124:5001 tcp", 0, 0, 1) -#!drvAsynIPPortConfigure("tcp2","164.54.160.131:5001 tcp", 0, 0, 1) - diff --git a/iocBoot/nfsCommands b/iocBoot/nfsCommands deleted file mode 100644 index 21a1aa15..00000000 --- a/iocBoot/nfsCommands +++ /dev/null @@ -1,32 +0,0 @@ -#Instructions for creating and using a real nfsCommands file -# -# in order to use nfs do the following: -# 1) Create hostAdd and nfsMountAll commands for each nfs server -# 2) In each st.cmd file add the following two commands BEFORE any load commands -# ../nfs.cmd -# cd " -# -# The hostAdd and nfsMountAll commands have the form: -# hostAdd("","xxx.xxx.xxx.xxx") -# nfsMountAll("") -# -# You can also mount subdirectories as follows: -# nfsMount("", "/xxx/xxx/xxx", "/xxx") -# -# For example assume -# -# host is mercury with inet address 155.77.2.56 -# You want to mount the directory (which is a file system of mercury) -# /home/mercury5/iocinfo -# as -# /iocinfo -# -# The commands would be -# -# hostAdd("mercury","155.77.2.56") -# nfsMountAll("mercury") -# nfsMount("mercury","/home/mercury5/iocinfo","/iocinfo") -# -# The following line eliminates "cksum: out of data" messages due to DHCP -#proxyPortFwdOff(67) - diff --git a/motorExApp/Makefile b/motorExApp/Makefile deleted file mode 100644 index 0b8a6163..00000000 --- a/motorExApp/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -TOP = .. -include $(TOP)/configure/CONFIG - -DIRS += NoAsyn -ifdef ASYN -DIRS += WithAsyn -endif - -include $(TOP)/configure/RULES_DIRS diff --git a/motorExApp/NoAsyn/Makefile b/motorExApp/NoAsyn/Makefile deleted file mode 100644 index db978572..00000000 --- a/motorExApp/NoAsyn/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -#FILENAME... Makefile -#USAGE... Makefile for motor application example without Asyn - - -# "#!" marks lines that can be uncommented. - -# Makefile -TOP = ../.. -include $(TOP)/configure/CONFIG -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE -#============================= - -PROD_IOC_DEFAULT = NoAsyn -PROD_IOC_vxWorks = NoAsynVx - -COMMONDBDS = base.dbd -COMMONDBDS += motorRecord.dbd -COMMONDBDS += devSoftMotor.dbd - -DBD += NoAsyn.dbd -NoAsyn_DBD += $(COMMONDBDS) -NoAsyn_DBD += Misc.dbd - -DBD += NoAsynVx.dbd -NoAsynVx_DBD += $(COMMONDBDS) -NoAsynVx_DBD += MiscVx.dbd - -NoAsyn_SRCS += NoAsyn_registerRecordDeviceDriver.cpp -NoAsyn_SRCS_DEFAULT += NoAsynMain.cpp -NoAsynVx_SRCS += NoAsynVx_registerRecordDeviceDriver.cpp - -COMMONLIBS += softMotor -COMMONLIBS += motor - -NoAsyn_LIBS += $(COMMONLIBS) -NoAsyn_LIBS += $(EPICS_BASE_IOC_LIBS) - -NoAsynVx_LIBS += $(COMMONLIBS) -NoAsynVx_OBJS += $(EPICS_BASE_BIN)/vxComLibrary -NoAsynVx_LIBS += $(EPICS_BASE_IOC_LIBS) - -#=========================== - -include $(TOP)/configure/RULES -#---------------------------------------- -# ADD RULES AFTER THIS LINE - diff --git a/motorExApp/NoAsyn/Misc.dbd b/motorExApp/NoAsyn/Misc.dbd deleted file mode 100644 index 3bd03290..00000000 --- a/motorExApp/NoAsyn/Misc.dbd +++ /dev/null @@ -1,5 +0,0 @@ -registrar(motorUtilRegister) -variable(motorRecordDebug) -#variable(motordrvComdebug) -#variable(motorUtil_debug) - diff --git a/motorExApp/NoAsyn/MiscVx.dbd b/motorExApp/NoAsyn/MiscVx.dbd deleted file mode 100644 index 3bd03290..00000000 --- a/motorExApp/NoAsyn/MiscVx.dbd +++ /dev/null @@ -1,5 +0,0 @@ -registrar(motorUtilRegister) -variable(motorRecordDebug) -#variable(motordrvComdebug) -#variable(motorUtil_debug) - diff --git a/motorExApp/NoAsyn/NoAsynMain.c b/motorExApp/NoAsyn/NoAsynMain.c deleted file mode 100644 index 0de40d2b..00000000 --- a/motorExApp/NoAsyn/NoAsynMain.c +++ /dev/null @@ -1,21 +0,0 @@ -/* NoAsynMain.c */ -/* Author: Ron Sluiter */ - -#include -#include -#include -#include -#include - -#include "epicsThread.h" -#include "iocsh.h" - -int main(int argc,char *argv[]) -{ - if(argc>=2) { - iocsh(argv[1]); - epicsThreadSleep(.2); - } - iocsh(NULL); - return(0); -} diff --git a/motorExApp/WithAsyn/Makefile b/motorExApp/WithAsyn/Makefile deleted file mode 100644 index 61990efa..00000000 --- a/motorExApp/WithAsyn/Makefile +++ /dev/null @@ -1,87 +0,0 @@ -#FILENAME... Makefile -#USAGE... Makefile for motor application example with Asyn - - -# "#!" marks lines that can be uncommented. - -TOP = ../.. -include $(TOP)/configure/CONFIG - -PROD_IOC_DEFAULT = WithAsyn -PROD_IOC_vxWorks = WithAsynVx - -COMMONDBDS = base.dbd -COMMONDBDS += motorSupport.dbd -COMMONDBDS += devSoftMotor.dbd -COMMONDBDS += asyn.dbd -COMMONDBDS += drvAsynSerialPort.dbd -COMMONDBDS += drvAsynIPPort.dbd -ifdef BUSY - COMMONDBDS += busySupport.dbd - COMMONLIBS := busy $(COMMONLIBS) -endif - -DBD += WithAsyn.dbd -WithAsyn_DBD += $(COMMONDBDS) -ifdef SNCSEQ - # seq-2-1 and earlier has devSequencer - ifeq (seq-2-1, $(findstring seq-2-1, $(SNCSEQ))) - WithAsyn_DBD += devSequencer.dbd - else ifeq (seq-2.1, $(findstring seq-2.1, $(SNCSEQ))) - WithAsyn_DBD += devSequencer.dbd - endif - -endif - -DBD += WithAsynVx.dbd -WithAsynVx_DBD += $(COMMONDBDS) -#!WithAsynVx_DBD += drvGsIP488.dbd -ifdef IPAC -WithAsynVx_DBD += MiscVx.dbd -endif - -WithAsyn_SRCS += WithAsyn_registerRecordDeviceDriver.cpp -WithAsyn_SRCS_DEFAULT += WithAsynMain.cpp -WithAsynVx_SRCS += WithAsynVx_registerRecordDeviceDriver.cpp - -WithAsyn_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary - -COMMONLIBS += softMotor -COMMONLIBS += motor - -# Needed for SNL programs -WithAsyn_LIBS += $(COMMONLIBS) -WithAsyn_LIBS += asyn -ifdef SNCSEQ - # seq-2-1 and earlier has devSequencer - ifeq (seq-2-1, $(findstring seq-2-1, $(SNCSEQ))) - WithAsyn_LIBS += seqDev seq pv - else ifeq (seq-2.1, $(findstring seq-2.1, $(SNCSEQ))) - WithAsyn_LIBS += seqDev seq pv - else - # seq 2.2. - WithAsyn_LIBS += seq pv - endif -endif -WithAsyn_LIBS += $(EPICS_BASE_IOC_LIBS) - -WithAsynVx_LIBS += $(COMMONLIBS) -ifdef IPAC -WithAsynVx_LIBS += Ipac TyGSOctal -endif -WithAsynVx_LIBS += asyn -# Needed for SNL programs -ifdef SNCSEQ - ifeq (seq-2-1, $(findstring seq-2-1, $(SNCSEQ))) - WithAsynVx_LIBS += seqDev seq pv - else ifeq (seq-2.1, $(findstring seq-2.1, $(SNCSEQ))) - WithAsynVx_LIBS += seqDev seq pv - else - # seq 2.2. - WithAsynVx_LIBS += seq pv - endif -endif -WithAsynVx_LIBS += $(EPICS_BASE_IOC_LIBS) - -include $(TOP)/configure/RULES - diff --git a/motorExApp/WithAsyn/MiscVx.dbd b/motorExApp/WithAsyn/MiscVx.dbd deleted file mode 100644 index a08fbe6b..00000000 --- a/motorExApp/WithAsyn/MiscVx.dbd +++ /dev/null @@ -1,4 +0,0 @@ -driver(drvIpac) -registrar(tvme200Registrar) -registrar(vipc616Registrar) -registrar(tyGSOctalRegistrar) diff --git a/motorExApp/WithAsyn/WithAsynMain.c b/motorExApp/WithAsyn/WithAsynMain.c deleted file mode 100644 index 4ea1148f..00000000 --- a/motorExApp/WithAsyn/WithAsynMain.c +++ /dev/null @@ -1,24 +0,0 @@ -/* WithAsynMain.c */ -/* Author: Ron Sluiter */ - -#include -#include -#include -#include -#include - -#include "epicsExit.h" -#include "epicsThread.h" -#include "iocsh.h" - -int main(int argc,char *argv[]) -{ - if (argc >= 2) - { - iocsh(argv[1]); - epicsThreadSleep(.2); - } - iocsh(NULL); - epicsExit(0); - return(0); -}