From 6e9ffc1b47b0d0fd01e54d607e119d9b68ecf7c4 Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Tue, 8 Mar 2011 15:13:20 +0000 Subject: [PATCH] Change to single parameter version of callParamCallbacks, other version is an historical artifact, should not be used --- motorApp/MotorSrc/asynMotorDriver.cpp | 8 ++++---- motorApp/MotorSrc/asynMotorDriver.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/motorApp/MotorSrc/asynMotorDriver.cpp b/motorApp/MotorSrc/asynMotorDriver.cpp index 18c5d7e4..6a52cdae 100644 --- a/motorApp/MotorSrc/asynMotorDriver.cpp +++ b/motorApp/MotorSrc/asynMotorDriver.cpp @@ -103,13 +103,13 @@ asynStatus asynMotorDriver::setDoubleParam(int axis, int function, double value) return asynPortDriver::setDoubleParam(axis, function, value); } -asynStatus asynMotorDriver::callParamCallbacks(int axis, int addr) +asynStatus asynMotorDriver::callParamCallbacks(int axis) { if (this->axisStatusChanged[axis]) { this->axisStatusChanged[axis] = 0; doCallbacksGenericPointer((void *)&this->axisStatus[axis], motorStatus, axis); } - return asynPortDriver::callParamCallbacks(axis, addr); + return asynPortDriver::callParamCallbacks(axis); } asynStatus asynMotorDriver::writeInt32(asynUser *pasynUser, epicsInt32 value) @@ -136,7 +136,7 @@ asynStatus asynMotorDriver::writeInt32(asynUser *pasynUser, epicsInt32 value) } /* Do callbacks so higher layers see any changes */ - callParamCallbacks(axis, axis); + callParamCallbacks(axis); if (status) asynPrint(pasynUser, ASYN_TRACE_ERROR, "%s:%s error, status=%d axis=%d, function=%d, value=%d\n", @@ -184,7 +184,7 @@ asynStatus asynMotorDriver::writeFloat64(asynUser *pasynUser, epicsFloat64 value } /* Do callbacks so higher layers see any changes */ - callParamCallbacks(axis, axis); + callParamCallbacks(axis); if (status) asynPrint(pasynUser, ASYN_TRACE_ERROR, "%s:%s error, status=%d axis=%d, function=%d, value=%f\n", diff --git a/motorApp/MotorSrc/asynMotorDriver.h b/motorApp/MotorSrc/asynMotorDriver.h index 0e3a55bc..15c61ce7 100644 --- a/motorApp/MotorSrc/asynMotorDriver.h +++ b/motorApp/MotorSrc/asynMotorDriver.h @@ -70,7 +70,7 @@ public: virtual asynStatus readGenericPointer(asynUser *pasynUser, void *pointer); virtual asynStatus setIntegerParam(int list, int index, int value); virtual asynStatus setDoubleParam(int list, int index, double value); - virtual asynStatus callParamCallbacks(int list, int addr); + virtual asynStatus callParamCallbacks(int addr); /* These are the methods that are new to this class */ virtual asynStatus moveAxis(asynUser *pasynUser, double position, int relative, double min_velocity, double max_velocity, double acceleration);