From b72ae9057e2db2a9ad532664600002d732f1bb20 Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Mon, 19 May 2003 17:14:03 +0000 Subject: [PATCH] 3.14.2 compatible. --- motorApp/SoftMotorSrc/Makefile | 2 ++ motorApp/SoftMotorSrc/devSoft.cc | 11 +++++++---- motorApp/SoftMotorSrc/devSoftAux.cc | 6 +++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/motorApp/SoftMotorSrc/Makefile b/motorApp/SoftMotorSrc/Makefile index 775959e5..6a7f17ba 100644 --- a/motorApp/SoftMotorSrc/Makefile +++ b/motorApp/SoftMotorSrc/Makefile @@ -15,6 +15,8 @@ LIBRARY_IOC = softMotor # The following is required for the Soft Channel (i.e., MotorSoft) device driver. SRCS += devSoft.cc devSoftAux.cc +softMotor_LIBS += $(EPICS_BASE_IOC_LIBS) + include $(TOP)/configure/RULES #---------------------------------------- # ADD RULES AFTER THIS LINE diff --git a/motorApp/SoftMotorSrc/devSoft.cc b/motorApp/SoftMotorSrc/devSoft.cc index 781ec766..806ef8c5 100644 --- a/motorApp/SoftMotorSrc/devSoft.cc +++ b/motorApp/SoftMotorSrc/devSoft.cc @@ -1,10 +1,10 @@ /* -FILENAME... devSoft.c +FILENAME... devSoft.cc USAGE... Motor record device level support for Soft channel. -Version: $Revision: 1.3 $ +Version: $Revision: 1.4 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2003-02-14 15:00:21 $ +Last Modified: $Date: 2003-05-19 17:14:03 $ */ /* @@ -57,6 +57,8 @@ NOTES... #include "motor.h" #include "devSoft.h" +#include "epicsExport.h" + #define STATIC static STATIC CALLBACK_VALUE update(struct motorRecord *); @@ -68,13 +70,14 @@ STATIC void soft_process(struct motorRecord *); struct motor_dset devMotorSoft = { - {8, NULL, soft_init, soft_init_record, NULL}, + {8, NULL, (DEVSUPFUN) soft_init, (DEVSUPFUN) soft_init_record, NULL}, update, start, build, end }; +epicsExportAddress(dset,devMotorSoft); STATIC CALLBACK_VALUE update(struct motorRecord *mr) { diff --git a/motorApp/SoftMotorSrc/devSoftAux.cc b/motorApp/SoftMotorSrc/devSoftAux.cc index c5580cbc..16fa69ce 100644 --- a/motorApp/SoftMotorSrc/devSoftAux.cc +++ b/motorApp/SoftMotorSrc/devSoftAux.cc @@ -1,10 +1,10 @@ /* -FILENAME... devSoftAux.c +FILENAME... devSoftAux.cc USAGE... Motor record device level support for Soft channel. -Version: $Revision: 1.2 $ +Version: $Revision: 1.3 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2002-10-31 21:06:24 $ +Last Modified: $Date: 2003-05-19 17:14:03 $ */ /*