From 803e2c89b7b63dad18a9d75b0c105c82a0962df3 Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Fri, 1 Apr 2011 20:02:18 +0000 Subject: [PATCH] Broke asynMotorDriver into asynMotorController and asynMotorAxis --- motorApp/MotorSrc/Makefile | 6 ++++-- motorApp/MotorSrc/devMotorAsyn.c | 2 +- motorApp/MotorSrc/drvMotorAsyn.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/motorApp/MotorSrc/Makefile b/motorApp/MotorSrc/Makefile index 4fca1e51..a7e2147b 100644 --- a/motorApp/MotorSrc/Makefile +++ b/motorApp/MotorSrc/Makefile @@ -16,7 +16,8 @@ INC += motordrvComCode.h ifdef ASYN INC += motor_interface.h INC += paramLib.h -INC += asynMotorDriver.h +INC += asynMotorController.h +INC += asynMotorAxis.h endif LIBRARY_IOC += motor @@ -29,7 +30,8 @@ ifdef ASYN motor_SRCS += drvMotorAsyn.c motor_SRCS += devMotorAsyn.c motor_SRCS += paramLib.c -motor_SRCS += asynMotorDriver.cpp +motor_SRCS += asynMotorController.cpp +motor_SRCS += asynMotorAxis.cpp motor_LIBS += asyn endif diff --git a/motorApp/MotorSrc/devMotorAsyn.c b/motorApp/MotorSrc/devMotorAsyn.c index 55d6a47d..78d179b5 100644 --- a/motorApp/MotorSrc/devMotorAsyn.c +++ b/motorApp/MotorSrc/devMotorAsyn.c @@ -58,7 +58,7 @@ #include "motorRecord.h" #include "motor.h" #include "epicsExport.h" -#include "asynMotorDriver.h" +#include "asynMotorController.h" #include "motor_interface.h" /*Create the dset for devMotor */ diff --git a/motorApp/MotorSrc/drvMotorAsyn.c b/motorApp/MotorSrc/drvMotorAsyn.c index 6e81f311..a1b60daa 100644 --- a/motorApp/MotorSrc/drvMotorAsyn.c +++ b/motorApp/MotorSrc/drvMotorAsyn.c @@ -57,7 +57,7 @@ #include #include -#include "asynMotorDriver.h" +#include "asynMotorController.h" #include "motor_interface.h" #include #include