From 0fc9bd1229bba651c282adbd721d9217d45eb9d4 Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Wed, 6 Sep 2006 15:44:35 +0000 Subject: [PATCH] Added support for int32 callbacks in general case --- motorApp/MotorSrc/drvMotorAsyn.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/motorApp/MotorSrc/drvMotorAsyn.c b/motorApp/MotorSrc/drvMotorAsyn.c index b7ae95f1..2c57bc74 100644 --- a/motorApp/MotorSrc/drvMotorAsyn.c +++ b/motorApp/MotorSrc/drvMotorAsyn.c @@ -19,9 +19,9 @@ * of this distribution. * ************************************************************************ * - * Version: $Revision: 1.12 $ - * Modified by: $Author: peterd $ - * Last Modified: $Date: 2006-08-10 08:12:47 $ + * Version: $Revision: 1.13 $ + * Modified by: $Author: rivers $ + * Last Modified: $Date: 2006-09-06 15:44:35 $ * * Original Author: Peter Denison * Current Author: Peter Denison @@ -770,11 +770,17 @@ static void intCallback(void *axisPvt, unsigned int nChanged, } } /* If we've subscribed to the aggregate status */ - if (reason == motorStatus) { + else if (reason == motorStatus) { pint32Interrupt->callback(pint32Interrupt->userPvt, pint32Interrupt->pasynUser, pAxis->status.status); } + else { + (*pPvt->drvset->getInteger)(pAxis->axis, reason, &ivalue); + pint32Interrupt->callback(pint32Interrupt->userPvt, + pint32Interrupt->pasynUser, + ivalue); + } } pnode = (interruptNode *)ellNext(&pnode->node); }