diff --git a/motorApp/OmsSrc/drvMAXv.cc b/motorApp/OmsSrc/drvMAXv.cc index e7ff093f..ae4fd270 100644 --- a/motorApp/OmsSrc/drvMAXv.cc +++ b/motorApp/OmsSrc/drvMAXv.cc @@ -2,9 +2,9 @@ FILENAME... drvMAXv.cc USAGE... Motor record driver level support for OMS model MAXv. -Version: $Revision: 1.7 $ -Modified By: $Author: sluiter $ -Last Modified: $Date: 2005-05-10 18:19:06 $ +Version: $Revision: 1.8 $ +Modified By: $Author: rivers $ +Last Modified: $Date: 2005-12-03 23:34:43 $ */ /* @@ -853,7 +853,7 @@ static int motorIsrSetup(int card) #ifdef vxWorks status = pdevLibVirtualOS->pDevConnectInterruptVME( - MAXvInterruptVector + card, (void (*)()) motorIsr, (void *) card); + MAXvInterruptVector + card, (void (*)(void *)) motorIsr, (void *) card); if (!RTN_SUCCESS(status)) { diff --git a/motorApp/OmsSrc/drvOms.cc b/motorApp/OmsSrc/drvOms.cc index 474f8dc0..ee7c1b0b 100644 --- a/motorApp/OmsSrc/drvOms.cc +++ b/motorApp/OmsSrc/drvOms.cc @@ -2,9 +2,9 @@ FILENAME... drvOms.cc USAGE... Driver level support for OMS models VME8, VME44 and VS4. -Version: $Revision: 1.23 $ -Modified By: $Author: sluiter $ -Last Modified: $Date: 2005-05-10 16:50:22 $ +Version: $Revision: 1.24 $ +Modified By: $Author: rivers $ +Last Modified: $Date: 2005-12-03 23:34:43 $ */ /* @@ -881,7 +881,7 @@ static int motorIsrEnable(int card) #ifdef vxWorks status = pdevLibVirtualOS->pDevConnectInterruptVME( - omsInterruptVector + card, (void (*)()) motorIsr, (void *) card); + omsInterruptVector + card, (void (*)(void *)) motorIsr, (void *) card); if (!RTN_SUCCESS(status)) { diff --git a/motorApp/OmsSrc/drvOms58.cc b/motorApp/OmsSrc/drvOms58.cc index d0d1b9d6..1bca0a1d 100644 --- a/motorApp/OmsSrc/drvOms58.cc +++ b/motorApp/OmsSrc/drvOms58.cc @@ -2,9 +2,9 @@ FILENAME... drvOms58.cc USAGE... Motor record driver level support for OMS model VME58. -Version: $Revision: 1.16 $ -Modified By: $Author: sluiter $ -Last Modified: $Date: 2005-05-10 18:30:26 $ +Version: $Revision: 1.17 $ +Modified By: $Author: rivers $ +Last Modified: $Date: 2005-12-03 23:34:43 $ */ /* @@ -940,7 +940,7 @@ static int motorIsrSetup(int card) pmotor = (struct vmex_motor *) (motor_state[card]->localaddr); status = pdevLibVirtualOS->pDevConnectInterruptVME( - omsInterruptVector + card, (void (*)()) motorIsr, (void *) card); + omsInterruptVector + card, (void (*)(void *)) motorIsr, (void *) card); if (!RTN_SUCCESS(status)) {