Substituted string "acs" with "dsm".

The following case replacements were applied (in order): AcsRegister -> dsmRegister Acs_LIBS -> dsm_LIBS ' Acs' -> ' dsm' acs -> dsm Acs -> Dsm ACS -> DSM
2025-08-04 13:55:39 -05:00 · 2024-05-22 10:55:22 -05:00
parent 7d7774072c
commit a92fda6560
20 changed files with 69 additions and 69 deletions
--- a/configure/EXAMPLE_RELEASE.local
+++ b/configure/EXAMPLE_RELEASE.local
@@ -1,4 +1,4 @@
 MOTOR=
 -include $(MOTOR)/modules/RELEASE.$(EPICS_HOST_ARCH).local
-# path to motorAcs is needed to build the IOC inside motorAcs, but outside motor
-MOTOR_ACS=
+# path to motorDsm is needed to build the IOC inside motorDsm, but outside motor
+MOTOR_DSM=
--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -2,6 +2,6 @@

 # Use motor/module's generated release file when buidling inside motor
 -include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
-# Use motorAcs's RELEASE.local when building outside motor
+# Use motorDsm's RELEASE.local when building outside motor
 -include $(TOP)/configure/RELEASE.local

--- a/docs/RELEASE.md
+++ b/docs/RELEASE.md
@@ -1,4 +1,4 @@
-# motorAcs Releases
+# motorDsm Releases

 ## __R1-1-1 (2023-04-11)__
 R1-1-1 is a release based on the master branch.  
@@ -27,22 +27,22 @@ R1-1 is a release based on the master branch.
 * None

 #### Modifications to existing features
-* Commit [1bd580a](https://github.com/epics-motor/motorAcs/commit/1bd580a87869fb140939978c0b06856917282da9): ``iocsh`` dir moved into ``acsApp`` dir; ``ACS_MCB4B.iocsh`` is now installed at build time 
+* Commit [1bd580a](https://github.com/epics-motor/motorDsm/commit/1bd580a87869fb140939978c0b06856917282da9): ``iocsh`` dir moved into ``dsmApp`` dir; ``DSM_MCB4B.iocsh`` is now installed at build time

 #### Bug fixes
-* Commit [5ab502c](https://github.com/epics-motor/motorAcs/commit/5ab502c53ac81885e2a511ade95f22d0a0db4f43): Include ``$(MOTOR)/modules/RELEASE.$(EPICS_HOST_ARCH).local`` instead of ``$(MOTOR)/configure/RELEASE``
-* Pull request [#1](https://github.com/epics-motor/motorAcs/pull/1): Eliminated compiler warnings
+* Commit [5ab502c](https://github.com/epics-motor/motorDsm/commit/5ab502c53ac81885e2a511ade95f22d0a0db4f43): Include ``$(MOTOR)/modules/RELEASE.$(EPICS_HOST_ARCH).local`` instead of ``$(MOTOR)/configure/RELEASE``
+* Pull request [#1](https://github.com/epics-motor/motorDsm/pull/1): Eliminated compiler warnings

 ## __R1-0 (2019-04-18)__
 R1-0 is a release based on the master branch.  

 ### Changes since motor-6-11

-motorAcs is now a standalone module, as well as a submodule of [motor](https://github.com/epics-modules/motor)
+motorDsm is now a standalone module, as well as a submodule of [motor](https://github.com/epics-modules/motor)

 #### New features
-* motorAcs can be built outside of the motor directory
-* motorAcs has a dedicated example IOC that can be built outside of motorAcs
+* motorDsm can be built outside of the motor directory
+* motorDsm has a dedicated example IOC that can be built outside of motorDsm

 #### Modifications to existing features
 * None
--- a/dsmApp/iocsh/DSM_MD90.iocsh
+++ b/dsmApp/iocsh/DSM_MD90.iocsh
@@ -1,4 +1,4 @@
-# ### ACS_MCB4B.iocsh ###
+# ### DSM_MCB4B.iocsh ###

 #- ###################################################
 #- PORT             - Serial port for communications
@@ -17,7 +17,7 @@
 #-                    Default: 100
 #- ###################################################

-# ACS MCB-4B serial connection settings
+# DSM MCB-4B serial connection settings
 iocshLoad("$(IP)/iocsh/setSerialParams.iocsh", "PORT=$(PORT), BAUD=19200, BITS=8, STOP=1, PARITY=none")
 asynOctetSetInputEos( "$(PORT)", -1, "\r")
 asynOctetSetOutputEos("$(PORT)", -1, "\r")
--- a/dsmApp/iocsh/Makefile
+++ b/dsmApp/iocsh/Makefile
@@ -1,6 +1,6 @@
 TOP = ../..
 include $(TOP)/configure/CONFIG

-IOCSH += ACS_MCB4B.iocsh
+IOCSH += DSM_MCB4B.iocsh

 include $(TOP)/configure/RULES
--- a/dsmApp/src/MD90Driver.cpp
+++ b/dsmApp/src/MD90Driver.cpp
@@ -1,6 +1,6 @@
 /*
 FILENAME... MCB4BDriver.cpp
-USAGE...    Motor driver support for the ACS MCB-4B controller.
+USAGE...    Motor driver support for the DSM MCB-4B controller.

 Mark Rivers
 March 1, 2012
--- a/dsmApp/src/MD90Driver.h
+++ b/dsmApp/src/MD90Driver.h
@@ -1,6 +1,6 @@
 /*
 FILENAME...   MCB4BDriver.h
-USAGE...      Motor driver support for the ACS MCB-4B controller.
+USAGE...      Motor driver support for the DSM MCB-4B controller.

 Mark Rivers
 March 1, 2012
--- a/dsmApp/src/Makefile
+++ b/dsmApp/src/Makefile
@@ -5,18 +5,18 @@ include $(TOP)/configure/CONFIG
 # The following are used for debugging messages.
 USR_CXXFLAGS += -DDEBUG

-DBD += devAcsMotor.dbd
+DBD += devDsmMotor.dbd

-LIBRARY_IOC = Acs
+LIBRARY_IOC = dsm

-SRCS += AcsRegister.cc
+SRCS += dsmRegister.cc

 # Advanced Control Systems driver support.
 SRCS += devMCB4B.c drvMCB4B.c
 SRCS += MCB4BDriver.cpp

-Acs_LIBS += motor asyn
-Acs_LIBS += $(EPICS_BASE_IOC_LIBS)
+dsm_LIBS += motor asyn
+dsm_LIBS += $(EPICS_BASE_IOC_LIBS)

 include $(TOP)/configure/RULES

--- a/dsmApp/src/devDsmMotor.dbd
+++ b/dsmApp/src/devDsmMotor.dbd
@@ -1,9 +1,9 @@
 # Advanced Control Systems driver support.

 # Model 1 (non-asyn) driver
-device(motor,VME_IO,devMCB4B,"ACS MCB-4B")
+device(motor,VME_IO,devMCB4B,"DSM MCB-4B")
 driver(drvMCB4B)
-registrar(AcsRegister)
+registrar(dsmRegister)

 # Model 3 driver
 registrar(MCB4BRegister)
--- a/dsmApp/src/drvMD90.cc
+++ b/dsmApp/src/drvMD90.cc
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <errlog.h>
 #include "motor.h"
-#include "AcsRegister.h"
+#include "dsmRegister.h"
 #include "drvMCB4B.h"
 #include "asynOctetSyncIO.h"
 #include "epicsExport.h"
--- a/dsmApp/src/dsmRegister.cc
+++ b/dsmApp/src/dsmRegister.cc
@@ -1,6 +1,6 @@
 /*
-FILENAME...	AcsRegister.cc
-USAGE...	Register ACS motor device driver shell commands.
+FILENAME...	dsmRegister.cc
+USAGE...	Register DSM motor device driver shell commands.

 */

@@ -16,16 +16,16 @@ of this distribution.
 **********************************************************************/

 #include <iocsh.h>
-#include "AcsRegister.h"
+#include "dsmRegister.h"
 #include "epicsExport.h"

 extern "C"
 {

-// ACS Setup arguments
+// DSM Setup arguments
 static const iocshArg setupArg0 = {"Max. controller count", iocshArgInt};
 static const iocshArg setupArg1 = {"Polling rate", iocshArgInt};
-// ACS Config arguments
+// DSM Config arguments
 static const iocshArg configArg0 = {"Card being configured", iocshArgInt};
 static const iocshArg configArg1 = {"asyn port name", iocshArgString};

@@ -44,12 +44,12 @@ static void configMCB4BCallFunc(const iocshArgBuf *args)
    MCB4BConfig(args[0].ival, args[1].sval);
 }

-static void AcsRegister(void)
+static void dsmRegister(void)
 {
    iocshRegister(&setupMCB4B, setupMCB4BCallFunc);
    iocshRegister(&configMCB4B, configMCB4BCallFunc);
 }

-epicsExportRegistrar(AcsRegister);
+epicsExportRegistrar(dsmRegister);

 } // extern "C"
--- a/dsmApp/src/dsmRegister.h
+++ b/dsmApp/src/dsmRegister.h
@@ -1,6 +1,6 @@
 /*
-FILENAME...	AcsRegister.h
-USAGE... This file contains function prototypes for ACS IOC shell commands.
+FILENAME...	dsmRegister.h
+USAGE... This file contains function prototypes for DSM IOC shell commands.

 */

--- a/iocs/Makefile
+++ b/iocs/Makefile
@@ -1,7 +1,7 @@
 TOP = ..
 include $(TOP)/configure/CONFIG

-DIRS += acsIOC
+DIRS += dsmIOC

 include $(TOP)/configure/RULES_TOP

--- a/iocs/dsmIOC/configure/CONFIG_SITE
+++ b/iocs/dsmIOC/configure/CONFIG_SITE
@@ -37,8 +37,8 @@ CHECK_RELEASE = YES

 # Include motor's CONFIG_SITE.local when building inside motor
 -include $(TOP)/../../../../configure/CONFIG_SITE.local
-# Include motorAcs's CONFIG_SITE.local when building inside motorAcs
+# Include motorDsm's CONFIG_SITE.local when building inside motorDsm
 -include $(TOP)/../../configure/CONFIG_SITE.local
-# Use acsIOC's CONFIG_SITE.local
+# Use dsmIOC's CONFIG_SITE.local
 -include $(TOP)/configure/CONFIG_SITE.local

--- a/iocs/dsmIOC/configure/EXAMPLE_RELEASE.local
+++ b/iocs/dsmIOC/configure/EXAMPLE_RELEASE.local
@@ -1,6 +1,6 @@
-# Use the following lines if motorAcs was built inside motor
+# Use the following lines if motorDsm was built inside motor
 MOTOR=
 -include $(MOTOR)/configure/RELEASE
-# Use the following lines if motorAcs was built outside motor
-#!MOTOR_ACS=
-#!-include $(MOTOR_ACS)/configure/RELEASE.local
+# Use the following lines if motorDsm was built outside motor
+#!MOTOR_DSM=
+#!-include $(MOTOR_DSM)/configure/RELEASE.local
--- a/iocs/dsmIOC/configure/RELEASE
+++ b/iocs/dsmIOC/configure/RELEASE
@@ -2,7 +2,7 @@

 # Use motor/module's generated release file when buidling inside motor
 -include $(TOP)/../../../RELEASE.$(EPICS_HOST_ARCH).local
-# Use motorAcs's release file when building inside motorAcs, but outside motor
+# Use motorDsm's release file when building inside motorDsm, but outside motor
 -include $(TOP)/../../configure/RELEASE.local
-# Use acsIOC's RELEASE.local when building outside motorAcs
+# Use dsmIOC's RELEASE.local when building outside motorDsm
 -include $(TOP)/configure/RELEASE.local
--- a/iocs/dsmIOC/dsmApp/src/Makefile
+++ b/iocs/dsmIOC/dsmApp/src/Makefile
@@ -11,44 +11,44 @@ include $(TOP)/configure/CONFIG
 #=============================
 # Build the IOC application

-PROD_IOC = acs
-# acs.dbd will be created and installed
-DBD += acs.dbd
+PROD_IOC = dsm
+# dsm.dbd will be created and installed
+DBD += dsm.dbd

-# acs.dbd will be made up from these files:
-acs_DBD += base.dbd
+# dsm.dbd will be made up from these files:
+dsm_DBD += base.dbd

 # Include dbd files from all support applications:
 #ifdef ASYN
-acs_DBD += asyn.dbd
-acs_DBD += drvAsynSerialPort.dbd
-acs_DBD += drvAsynIPPort.dbd
+dsm_DBD += asyn.dbd
+dsm_DBD += drvAsynSerialPort.dbd
+dsm_DBD += drvAsynIPPort.dbd
 #endif
-acs_DBD += motorSupport.dbd
-acs_DBD += devAcsMotor.dbd
+dsm_DBD += motorSupport.dbd
+dsm_DBD += devDsmMotor.dbd

 # Add all the support libraries needed by this IOC
-acs_LIBS += Acs
-acs_LIBS += motor
+dsm_LIBS += dsm
+dsm_LIBS += motor
 #ifdef ASYN
-acs_LIBS += asyn
+dsm_LIBS += asyn
 #endif
 #ifdef SNCSEQ
-acs_LIBS += seq pv
+dsm_LIBS += seq pv
 #endif

-# acs_registerRecordDeviceDriver.cpp derives from acs.dbd
-acs_SRCS += acs_registerRecordDeviceDriver.cpp
+# dsm_registerRecordDeviceDriver.cpp derives from dsm.dbd
+dsm_SRCS += dsm_registerRecordDeviceDriver.cpp

 # Build the main IOC entry point on workstation OSs.
-acs_SRCS_DEFAULT += acsMain.cpp
-acs_SRCS_vxWorks += -nil-
+dsm_SRCS_DEFAULT += dsmMain.cpp
+dsm_SRCS_vxWorks += -nil-

 # Add support from base/src/vxWorks if needed
-#acs_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
+#dsm_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary

 # Finally link to the EPICS Base libraries
-acs_LIBS += $(EPICS_BASE_IOC_LIBS)
+dsm_LIBS += $(EPICS_BASE_IOC_LIBS)

 #===========================

--- a/iocs/dsmIOC/dsmApp/src/dsmMain.cpp
+++ b/iocs/dsmIOC/dsmApp/src/dsmMain.cpp
@@ -1,4 +1,4 @@
-/* acsMain.cpp */
+/* dsmMain.cpp */
 /* Author:  Marty Kraimer Date:    17MAR2000 */

 #include <stddef.h>
--- a/iocs/dsmIOC/iocBoot/iocDsm/st.cmd
+++ b/iocs/dsmIOC/iocBoot/iocDsm/st.cmd
@@ -1,24 +1,24 @@
-#!../../bin/linux-x86_64/acs
+#!../../bin/linux-x86_64/dsm

 < envPaths

 cd "${TOP}"

 ## Register all support components
-dbLoadDatabase "dbd/acs.dbd"
-acs_registerRecordDeviceDriver pdbbase
+dbLoadDatabase "dbd/dsm.dbd"
+dsm_registerRecordDeviceDriver pdbbase

 cd "${TOP}/iocBoot/${IOC}"


 ## motorUtil (allstop & alldone)
-dbLoadRecords("$(MOTOR)/db/motorUtil.db", "P=acs:")
+dbLoadRecords("$(MOTOR)/db/motorUtil.db", "P=dsm:")

 ##

 iocInit

 ## motorUtil (allstop & alldone)
-motorUtilInit("acs:")
+motorUtilInit("dsm:")

 # Boot complete
--- a/iocs/dsmIOC/iocBoot/iocDsm/st.cmd.md90
+++ b/iocs/dsmIOC/iocBoot/iocDsm/st.cmd.md90
@@ -2,8 +2,8 @@
 < envPaths

 # Tell EPICS all about the record types, device-support modules, drivers, etc.
-dbLoadDatabase("../../dbd/acs.dbd")
-acs_registerRecordDeviceDriver(pdbbase)
+dbLoadDatabase("../../dbd/dsm.dbd")
+dsm_registerRecordDeviceDriver(pdbbase)

 # Port 2 on a Moxa
 #!drvAsynIPPortConfigure("serial0", "192.168.1.16:4002",0,0,0)