From 29fa983a7d362e585ee52230d17af4b61a49b085 Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Wed, 6 Jul 2011 22:04:59 +0000 Subject: [PATCH] Change from ipmIntConnect to devConnectInterruptVME; downside is it only works on VME; upside is that it builds on 64-bit systems --- motorApp/HytecSrc/HytecMotorDriver.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/motorApp/HytecSrc/HytecMotorDriver.cpp b/motorApp/HytecSrc/HytecMotorDriver.cpp index a3c6fb7e..8b4e825a 100644 --- a/motorApp/HytecSrc/HytecMotorDriver.cpp +++ b/motorApp/HytecSrc/HytecMotorDriver.cpp @@ -75,7 +75,7 @@ #include "HytecMotorDriver.h" -static void ISR_8601(int pDrv); +static void ISR_8601(void* pDrv); static void intQueuedTask( void *pDrv ); #define MAX_MESSAGES 100 /* maximum number of messages */ @@ -188,12 +188,11 @@ asynStatus HytecMotorController::SetupCard() } /* Setup Interrupts. THIS SEEMS NOT RIGHT. 8601 HAS 4 AXIS AND EACH ONE HAS A VECTOR SO 4 ISRs ARE NEEDED?????????????? */ - st=ipmIntConnect(this->ip_carrier, - this->ipslot, - this->vector, - &ISR_8601, - (int)this); - + st = devConnectInterruptVME( + this->vector, + ISR_8601, + this); + /* If Interrupts NOT Setup OK */ if (st!=OK) { @@ -490,7 +489,7 @@ asynStatus HytecMotorController::writeFloat64(asynUser *pasynUser, epicsFloat64 } // ISR8601 Routines to handle interrupts -static void ISR_8601(int pDrv) +static void ISR_8601(void* pDrv) { HytecMotorController *pController = (HytecMotorController*) pDrv; HytecMotorAxis * pAxis;