lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity

Added status argument in callbacks; deleted unused resolution variable

Browse Source
This commit is contained in:
MarkRivers
2007-04-17 21:05:42 +00:00
parent 9556f74d93
commit 99438abc45
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/MotorSrc/devMotorAsyn.c
+6 -5
View File
@@ -11,9 +11,9 @@
* Notwithstanding the above, explicit permission is granted for APS to
* redistribute this software.
*
* Version: $Revision: 1.17 $
* Version: $Revision: 1.18 $
* Modified by: $Author: rivers $
* Last Modified: $Date: 2007-02-13 22:02:18 $
* Last Modified: $Date: 2007-04-17 21:05:42 $
*
* Original Author: Peter Denison
* Current Author: Peter Denison
@@ -54,7 +54,7 @@ static long start_trans(struct motorRecord *);
static RTN_STATUS build_trans( motor_cmnd, double *, struct motorRecord *);
static RTN_STATUS end_trans(struct motorRecord *);
static void asynCallback(asynUser *);
static void statusCallback(void *, asynUser *, struct MotorStatus *);
static void statusCallback(void *, asynUser *, struct MotorStatus *, asynStatus status);
typedef enum {int32Type, float64Type, float64ArrayType} interfaceType;
@@ -144,7 +144,6 @@ static long init_record(struct motorRecord * pmr )
asynStatus status;
asynInterface *pasynInterface;
motorAsynPvt *pPvt;
double resolution;
/* Allocate motorAsynPvt private structure */
pPvt = callocMustSucceed(1, sizeof(motorAsynPvt), "devMotorAsyn init_record()");
@@ -513,11 +512,13 @@ static void asynCallback(asynUser *pasynUser)
* True callback to notify that controller status has changed.
*/
static void statusCallback(void *drvPvt, asynUser *pasynUser,
struct MotorStatus *value)
struct MotorStatus *value, asynStatus status)
{
motorAsynPvt *pPvt = (motorAsynPvt *)drvPvt;
motorRecord *pmr = pPvt->pmr;
/* We should probably do something sensible if status != asynSuccess !! */
asynPrint(pasynUser, ASYN_TRACEIO_DEVICE,
"%s devMotorAsyn::statusCallback new value=[p:%f,e:%f,s:%x] %c%c\n",
pmr->name, value->position, value->encoder_posn, value->status,