diff --git a/motorApp/AcsSrc/devMCB4B.cc b/motorApp/AcsSrc/devMCB4B.cc index 77617b03..775e34e1 100644 --- a/motorApp/AcsSrc/devMCB4B.cc +++ b/motorApp/AcsSrc/devMCB4B.cc @@ -107,7 +107,7 @@ static struct board_stat **MCB4B_cards; STATIC long MCB4B_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; Debug(5, "MCB4B_init: entry\n"); if (after == 0) diff --git a/motorApp/AcsTech80Src/devSPiiPlus.cc b/motorApp/AcsTech80Src/devSPiiPlus.cc index 6a01acbc..2ad65767 100644 --- a/motorApp/AcsTech80Src/devSPiiPlus.cc +++ b/motorApp/AcsTech80Src/devSPiiPlus.cc @@ -2,9 +2,9 @@ FILENAME... devSPiiPlus.cc USAGE... Motor record device level support for ACS Tech80 SPiiPlus -Version: $Revision: 1.1 $ -Modified By: $Author: sullivan $ -Last Modified: $Date: 2006-05-19 16:39:45 $ +Version: $Revision: 1.2 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2008-03-14 20:07:43 $ */ /* @@ -109,7 +109,7 @@ static struct board_stat **SPiiPlus_cards; STATIC long SPiiPlus_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/DeltaTauSrc/devPmac.cc b/motorApp/DeltaTauSrc/devPmac.cc index 4d6c1f80..c5296bcf 100644 --- a/motorApp/DeltaTauSrc/devPmac.cc +++ b/motorApp/DeltaTauSrc/devPmac.cc @@ -2,9 +2,9 @@ FILENAME... devPmac.cc USAGE... Device level support for Delta Tau PMAC. -Version: $Revision: 1.4 $ +Version: $Revision: 1.5 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-12-20 21:05:19 $ +Last Modified: $Date: 2008-03-14 20:09:01 $ */ /* @@ -102,7 +102,7 @@ static const char errmsg[] = {"\n\n!!!ERROR!!! - Oms driver uninitialized.\n"}; static long Pmac_init(void *arg) { - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (*(Pmac_access.init_indicator) == NO) { diff --git a/motorApp/FaulhaberSrc/devMCDC2805.cc b/motorApp/FaulhaberSrc/devMCDC2805.cc index bb1f1c96..7ad38ccf 100644 --- a/motorApp/FaulhaberSrc/devMCDC2805.cc +++ b/motorApp/FaulhaberSrc/devMCDC2805.cc @@ -3,9 +3,9 @@ FILENAME... devMCDC2805.cc USAGE... Motor record device level support for Intelligent Motion Systems, Inc. MCDC2805 series of controllers. -Version: $Revision: 1.2 $ -Modified By: $Author: rivers $ -Last Modified: $Date: 2005-11-04 23:05:34 $ +Version: $Revision: 1.3 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2008-03-14 20:09:24 $ */ /* @@ -109,7 +109,7 @@ static struct board_stat **MCDC2805_cards; STATIC long MCDC2805_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/ImsSrc/devIM483PL.cc b/motorApp/ImsSrc/devIM483PL.cc index 969ab371..ee1c4833 100644 --- a/motorApp/ImsSrc/devIM483PL.cc +++ b/motorApp/ImsSrc/devIM483PL.cc @@ -3,9 +3,9 @@ FILENAME... devIM483PL.cc USAGE... Motor record device level support for Intelligent Motion Systems, Inc. IM483(I/IE). -Version: $Revision: 1.5 $ +Version: $Revision: 1.6 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-12-20 21:06:43 $ +Last Modified: $Date: 2008-03-14 20:10:01 $ */ /* @@ -113,7 +113,7 @@ static struct board_stat **IM483PL_cards; STATIC long IM483PL_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/ImsSrc/devIM483SM.cc b/motorApp/ImsSrc/devIM483SM.cc index cf23d9b6..d728b63f 100644 --- a/motorApp/ImsSrc/devIM483SM.cc +++ b/motorApp/ImsSrc/devIM483SM.cc @@ -3,9 +3,9 @@ FILENAME... devIM483SM.cc USAGE... Motor record device level support for Intelligent Motion Systems, Inc. IM483(I/IE). -Version: $Revision: 1.4 $ +Version: $Revision: 1.5 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-12-20 21:06:43 $ +Last Modified: $Date: 2008-03-14 20:10:01 $ */ /* @@ -113,7 +113,7 @@ static struct board_stat **IM483SM_cards; STATIC long IM483SM_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/ImsSrc/devMDrive.cc b/motorApp/ImsSrc/devMDrive.cc index af46a6be..77229598 100644 --- a/motorApp/ImsSrc/devMDrive.cc +++ b/motorApp/ImsSrc/devMDrive.cc @@ -3,9 +3,9 @@ FILENAME... devMDrive.cc USAGE... Motor record device level support for Intelligent Motion Systems, Inc. MDrive series of controllers. -Version: $Revision: 1.6 $ +Version: $Revision: 1.7 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2005-04-14 20:31:05 $ +Last Modified: $Date: 2008-03-14 20:10:01 $ */ /* @@ -115,7 +115,7 @@ static struct board_stat **MDrive_cards; STATIC long MDrive_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/KohzuSrc/devSC800.cc b/motorApp/KohzuSrc/devSC800.cc index 7265793b..a0b953fd 100644 --- a/motorApp/KohzuSrc/devSC800.cc +++ b/motorApp/KohzuSrc/devSC800.cc @@ -2,9 +2,9 @@ FILENAME... devSC800.cc USAGE... Motor record device level support for Kohzu SC800 motor controller. -Version: $Revision: 1.1 $ +Version: $Revision: 1.2 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2007-11-27 18:01:17 $ +Last Modified: $Date: 2008-03-14 20:10:22 $ */ /* @@ -111,7 +111,7 @@ static struct board_stat **SC800_cards; static long SC800_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/MXmotorSrc/devMXmotor.cc b/motorApp/MXmotorSrc/devMXmotor.cc index b13f8e7d..de5fa0a4 100644 --- a/motorApp/MXmotorSrc/devMXmotor.cc +++ b/motorApp/MXmotorSrc/devMXmotor.cc @@ -2,9 +2,9 @@ FILENAME... devMXmotor.cc USAGE... Motor record device level support for MX device driver. -Version: $Revision: 1.5 $ +Version: $Revision: 1.6 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-12-20 21:07:26 $ +Last Modified: $Date: 2008-03-14 20:12:06 $ */ /* @@ -91,7 +91,7 @@ static const char errmsg[] = {"\n\n!!!ERROR!!! - MX driver uninitialized.\n"}; /* initialize device support for MX motor */ static long MXmotor_init(void *after) { - int before_after = (int) after; + int before_after = (after == 0) ? 0 : 1; if (*(MXmotor_access.init_indicator) == NO) { diff --git a/motorApp/MclennanSrc/devPM304.cc b/motorApp/MclennanSrc/devPM304.cc index bc526893..34a229f3 100644 --- a/motorApp/MclennanSrc/devPM304.cc +++ b/motorApp/MclennanSrc/devPM304.cc @@ -115,7 +115,7 @@ static struct board_stat **PM304_cards; STATIC long PM304_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/MicosSrc/devMicos.cc b/motorApp/MicosSrc/devMicos.cc index 69464b17..97213bea 100644 --- a/motorApp/MicosSrc/devMicos.cc +++ b/motorApp/MicosSrc/devMicos.cc @@ -97,7 +97,7 @@ static struct board_stat **Micos_cards; static long Micos_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; Debug(5, "Micos_init: entry\n"); if (after == 0) diff --git a/motorApp/MicroMoSrc/devMVP2001.cc b/motorApp/MicroMoSrc/devMVP2001.cc index fe7452e0..1b44106b 100644 --- a/motorApp/MicroMoSrc/devMVP2001.cc +++ b/motorApp/MicroMoSrc/devMVP2001.cc @@ -3,9 +3,9 @@ FILENAME... devMVP2001.cc USAGE... Motor record device level support for MicroMo MVP 2001 B02 (Linear, RS-485). -Version: $Revision: 1.2 $ +Version: $Revision: 1.3 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-12-20 21:09:09 $ +Last Modified: $Date: 2008-03-14 20:13:20 $ */ /* @@ -158,7 +158,7 @@ static struct board_stat **MVP2001_cards; static long MVP2001_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/NewFocusSrc/devPMNC87xx.cc b/motorApp/NewFocusSrc/devPMNC87xx.cc index 68114d49..25430bf8 100644 --- a/motorApp/NewFocusSrc/devPMNC87xx.cc +++ b/motorApp/NewFocusSrc/devPMNC87xx.cc @@ -114,7 +114,7 @@ static struct board_stat **PMNC87xx_cards; STATIC long PMNC87xx_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/NewportSrc/devESP300.cc b/motorApp/NewportSrc/devESP300.cc index c49d4c21..b1ec1686 100644 --- a/motorApp/NewportSrc/devESP300.cc +++ b/motorApp/NewportSrc/devESP300.cc @@ -2,9 +2,9 @@ FILENAME... devESP300.cc USAGE... Motor record device level support for Newport ESP300. -Version: $Revision: 1.3 $ +Version: $Revision: 1.4 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-12-20 21:10:53 $ +Last Modified: $Date: 2008-03-14 20:17:14 $ */ /* @@ -109,7 +109,7 @@ static struct board_stat **ESP300_cards; static long ESP300_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/NewportSrc/devMM3000.cc b/motorApp/NewportSrc/devMM3000.cc index 996c3ecf..6d322be4 100644 --- a/motorApp/NewportSrc/devMM3000.cc +++ b/motorApp/NewportSrc/devMM3000.cc @@ -2,9 +2,9 @@ FILENAME... devMM3000.cc USAGE... Motor record device level support for Newport MM3000. -Version: $Revision: 1.3 $ +Version: $Revision: 1.4 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-12-20 21:10:53 $ +Last Modified: $Date: 2008-03-14 20:17:14 $ */ /* @@ -113,7 +113,7 @@ static struct board_stat **MM3000_cards; STATIC long MM3000_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/NewportSrc/devMM4000.cc b/motorApp/NewportSrc/devMM4000.cc index 063b39c7..ef9a07f0 100644 --- a/motorApp/NewportSrc/devMM4000.cc +++ b/motorApp/NewportSrc/devMM4000.cc @@ -2,9 +2,9 @@ FILENAME... devMM4000.cc USAGE... Motor record device level support for Newport MM4000. -Version: $Revision: 1.3 $ +Version: $Revision: 1.4 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-12-20 21:10:53 $ +Last Modified: $Date: 2008-03-14 20:17:14 $ */ /* @@ -115,7 +115,7 @@ static struct board_stat **MM4000_cards; STATIC long MM4000_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/NewportSrc/devPM500.cc b/motorApp/NewportSrc/devPM500.cc index 86e82cb5..5a2a1073 100644 --- a/motorApp/NewportSrc/devPM500.cc +++ b/motorApp/NewportSrc/devPM500.cc @@ -3,9 +3,9 @@ FILENAME... devPM500.cc USAGE... Motor record device level support for the Newport PM500 motor controller. -Version: $Revision: 1.2 $ +Version: $Revision: 1.3 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-12-20 21:10:53 $ +Last Modified: $Date: 2008-03-14 20:17:14 $ */ /* @@ -114,7 +114,7 @@ static struct board_stat **PM500_cards; STATIC long PM500_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/OmsSrc/devMAXv.cc b/motorApp/OmsSrc/devMAXv.cc index d2898b01..71368fb0 100644 --- a/motorApp/OmsSrc/devMAXv.cc +++ b/motorApp/OmsSrc/devMAXv.cc @@ -2,9 +2,9 @@ FILENAME... devMAXV.cc USAGE... Device level support for OMS MAXv model. -Version: $Revision: 1.2 $ +Version: $Revision: 1.3 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-12-20 21:11:53 $ +Last Modified: $Date: 2008-03-14 20:19:06 $ */ /* @@ -67,7 +67,7 @@ static const char errmsg[] = {"\n\n!!!ERROR!!! - Oms MAXv driver uninitialized.\ static long MAXv_init(void *arg) { - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (*(MAXv_access.init_indicator) == NO) { diff --git a/motorApp/OmsSrc/devOms.cc b/motorApp/OmsSrc/devOms.cc index ed37a94c..9e167ba6 100644 --- a/motorApp/OmsSrc/devOms.cc +++ b/motorApp/OmsSrc/devOms.cc @@ -2,9 +2,9 @@ FILENAME... devOms.cc USAGE... Device level support for OMS VME8 and VME44 models. -Version: $Revision: 1.7 $ +Version: $Revision: 1.8 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2006-01-24 20:01:37 $ +Last Modified: $Date: 2008-03-14 20:19:06 $ */ /* @@ -87,7 +87,7 @@ static const char errmsg[] = {"\n\n!!!ERROR!!! - Oms driver uninitialized.\n"}; static long oms_init(void *arg) { - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (*(oms_access.init_indicator) == NO) { diff --git a/motorApp/OmsSrc/devOms58.cc b/motorApp/OmsSrc/devOms58.cc index ae0c15d4..a8fdc097 100644 --- a/motorApp/OmsSrc/devOms58.cc +++ b/motorApp/OmsSrc/devOms58.cc @@ -2,9 +2,9 @@ FILENAME... devOms58.c USAGE... Motor record device level support for OMS VME58. -Version: $Revision: 1.6 $ +Version: $Revision: 1.7 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2006-01-24 20:01:37 $ +Last Modified: $Date: 2008-03-14 20:19:06 $ */ /* @@ -86,7 +86,8 @@ static const char errmsg[] = {"\n\n!!!ERROR!!! - Oms58 driver uninitialized.\n"} static long oms_init(void *arg) { - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; + if (*(oms58_access.init_indicator) == NO) { errlogSevPrintf(errlogMinor, "%s", errmsg); diff --git a/motorApp/OmsSrc/devOmsPC68.cc b/motorApp/OmsSrc/devOmsPC68.cc index f3156f4d..0eb60abf 100644 --- a/motorApp/OmsSrc/devOmsPC68.cc +++ b/motorApp/OmsSrc/devOmsPC68.cc @@ -1,16 +1,16 @@ /* -FILENAME... devOmsPC68.c -USAGE... Motor record device level support for OMS VME58. +FILENAME... devOmsPC68.c +USAGE... Motor record device level support for OMS VME58. -Version: 1.5 -Modified By: sluiter -Last Modified: 2004/12/20 21:11:53 +Version: $Revision: 1.2 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2008-03-14 20:19:06 $ */ /* - * Original Author: Jim Kowalkowski - * Current Author: Joe Sullivan - * Date: 11/14/94 + * Original Author: Brian Tieman + * Current Author: Ron Sluiter + * Date: 04/24/06 * * Experimental Physics and Industrial Control System (EPICS) * @@ -22,44 +22,39 @@ Last Modified: 2004/12/20 21:11:53 * and (W-31-109-ENG-38) at Argonne National Laboratory. * * Initial development by: - * The Controls and Automation Group (AT-8) - * Ground Test Accelerator - * Accelerator Technology Division - * Los Alamos National Laboratory + * The Controls and Automation Group (AT-8) + * Ground Test Accelerator + * Accelerator Technology Division + * Los Alamos National Laboratory * * Co-developed with - * The Controls and Computing Group - * Accelerator Systems Division - * Advanced Photon Source - * Argonne National Laboratory + * The Controls and Computing Group + * Accelerator Systems Division + * Advanced Photon Source + * Argonne National Laboratory * * Modification Log: * ----------------- - * .01 01-18-93 jbk initialized - * .02 11-14-94 jps copy devOMS.c and modify to point to vme58 driver - * .03 03-19-96 tmm v1.10: modified encoder-ratio calculation - * .04 06-20-96 jps allow for bumpless-reboot on position - * .04a 02-19-97 tmm fixed for EPICS 3.13 - * .05 06-16-03 rls Converted to R3.14.x. + * .01 04-25-06 copied from devOms.cc */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "motorRecord.h" -#include "motor.h" -#include "drvOmsPC68Com.h" -#include "devOmsCom.h" +#include "motorRecord.h" +#include "motor.h" +#include "drvOmsPC68Com.h" +#include "devOmsCom.h" -#include "epicsExport.h" +#include "epicsExport.h" #define STATIC static @@ -81,9 +76,7 @@ struct motor_dset devOmsPC68 = oms_end_trans }; -extern "C" { -epicsExportAddress(dset,devOmsPC68); -} +extern "C" {epicsExportAddress(dset,devOmsPC68);} STATIC struct board_stat **oms_cards; STATIC const char errmsg[] = {"\n\n!!!ERROR!!! - OmsPC68 driver uninitialized.\n"}; @@ -92,33 +85,33 @@ STATIC const char errmsg[] = {"\n\n!!!ERROR!!! - OmsPC68 driver uninitialized.\n STATIC long oms_init(void *arg) { -int after = (int) arg; + int after = (arg == 0) ? 0 : 1; - if (*(OmsPC68_access.init_indicator) == NO) + if (*(OmsPC68_access.init_indicator) == NO) { - errlogSevPrintf(errlogMinor, "%s", errmsg); - return(ERROR); + errlogSevPrintf(errlogMinor, "%s", errmsg); + return(ERROR); } else - return (motor_init_com (after, OmsPC68_num_cards, &OmsPC68_access, &oms_cards)); + return(motor_init_com (after, OmsPC68_num_cards, &OmsPC68_access, &oms_cards)); } //__________________________________________________________________________________________ STATIC long oms_init_record(void *arg) { -struct motorRecord *mr = (struct motorRecord *) arg; + struct motorRecord *mr = (struct motorRecord *) arg; - return (motor_init_record_com(mr, OmsPC68_num_cards, &OmsPC68_access, oms_cards)); + return(motor_init_record_com(mr, OmsPC68_num_cards, &OmsPC68_access, oms_cards)); } //__________________________________________________________________________________________ STATIC long oms_start_trans(struct motorRecord *mr) { -struct motor_trans *trans; -long rtnval; - + struct motor_trans *trans; + long rtnval; + rtnval = motor_start_trans_com(mr, oms_cards); /* Initialize a STOP_AXIS command termination string pointer. */ trans = (struct motor_trans *) mr->dpvt; @@ -132,11 +125,11 @@ STATIC RTN_STATUS oms_end_trans(struct motorRecord *mr) { if (*(OmsPC68_access.init_indicator) == NO) { - errlogSevPrintf(errlogMinor, "%s", errmsg); - return(ERROR); + errlogSevPrintf(errlogMinor, "%s", errmsg); + return(ERROR); } else - return(motor_end_trans_com(mr, &OmsPC68_access)); + return(motor_end_trans_com(mr, &OmsPC68_access)); } //__________________________________________________________________________________________ diff --git a/motorApp/OrielSrc/devEMC18011.cc b/motorApp/OrielSrc/devEMC18011.cc index 16c91ecb..bd767ad3 100755 --- a/motorApp/OrielSrc/devEMC18011.cc +++ b/motorApp/OrielSrc/devEMC18011.cc @@ -2,9 +2,9 @@ FILENAME... devEMC18011.cc USAGE... Motor record device level support for Parker Compumotor drivers -Version: $Revision: 1.3 $ -Modified By: $Author: sullivan $ -Last Modified: $Date: 2006-11-02 21:05:56 $ +Version: $Revision: 1.4 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2008-03-14 20:19:25 $ */ /* @@ -110,7 +110,7 @@ static struct board_stat **EMC18011_cards; STATIC long EMC18011_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/PC6KSrc/devPC6K.cc b/motorApp/PC6KSrc/devPC6K.cc index a5e7d9d8..963ba028 100755 --- a/motorApp/PC6KSrc/devPC6K.cc +++ b/motorApp/PC6KSrc/devPC6K.cc @@ -2,9 +2,9 @@ FILENAME... devPC6K.cc USAGE... Motor record device level support for Parker Compumotor drivers -Version: $Revision: 1.3 $ -Modified By: $Author: sullivan $ -Last Modified: $Date: 2007-01-16 17:15:31 $ +Version: $Revision: 1.4 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2008-03-14 20:19:43 $ */ /* @@ -109,7 +109,7 @@ static struct board_stat **PC6K_cards; STATIC long PC6K_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/PiJenaSrc/devPIJEDS.cc b/motorApp/PiJenaSrc/devPIJEDS.cc index e6d5ba69..c3f79a9f 100644 --- a/motorApp/PiJenaSrc/devPIJEDS.cc +++ b/motorApp/PiJenaSrc/devPIJEDS.cc @@ -3,9 +3,9 @@ FILENAME... devPIJEDS.cc USAGE... Motor record device level support for Physik Instrumente (PI) GmbH & Co. E-516 motor controller. -Version: $Revision: 1.1 $ -Modified By: $Author: sullivan $ -Last Modified: $Date: 2007-06-14 15:56:59 $ +Version: $Revision: 1.2 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2008-03-14 20:20:03 $ */ /* @@ -107,7 +107,7 @@ static struct board_stat **PIJEDS_cards; static long PIJEDS_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/PiSrc/devPIC630.cc b/motorApp/PiSrc/devPIC630.cc index 7ed27552..ba9ca67b 100644 --- a/motorApp/PiSrc/devPIC630.cc +++ b/motorApp/PiSrc/devPIC630.cc @@ -105,7 +105,7 @@ static struct board_stat **PIC630_cards; static long PIC630_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; Debug(5, "PIC630_init: entry\n"); if (after == 0) diff --git a/motorApp/PiSrc/devPIC662.cc b/motorApp/PiSrc/devPIC662.cc index c1905c1c..713e0ca6 100644 --- a/motorApp/PiSrc/devPIC662.cc +++ b/motorApp/PiSrc/devPIC662.cc @@ -3,9 +3,9 @@ FILENAME... devPIC662.cc USAGE... Motor record device level support for Physik Instrumente (PI) GmbH & Co. C-844 motor controller. -Version: $Revision: 1.1 $ -Modified By: $Author: sullivan $ -Last Modified: $Date: 2006-04-14 20:34:42 $ +Version: $Revision: 1.2 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2008-03-14 20:21:36 $ */ /* @@ -107,7 +107,7 @@ static struct board_stat **PIC662_cards; static long PIC662_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/PiSrc/devPIC844.cc b/motorApp/PiSrc/devPIC844.cc index fddb3a39..f5660044 100644 --- a/motorApp/PiSrc/devPIC844.cc +++ b/motorApp/PiSrc/devPIC844.cc @@ -3,9 +3,9 @@ FILENAME... devPIC844.cc USAGE... Motor record device level support for Physik Instrumente (PI) GmbH & Co. C-844 motor controller. -Version: $Revision: 1.5 $ +Version: $Revision: 1.6 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2005-10-04 19:47:12 $ +Last Modified: $Date: 2008-03-14 20:21:36 $ */ /* @@ -107,7 +107,7 @@ static struct board_stat **PIC844_cards; static long PIC844_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/PiSrc/devPIC848.cc b/motorApp/PiSrc/devPIC848.cc index 18dec268..e3c62bff 100644 --- a/motorApp/PiSrc/devPIC848.cc +++ b/motorApp/PiSrc/devPIC848.cc @@ -3,9 +3,9 @@ FILENAME... devPIC848.cc USAGE... Motor record device level support for Physik Instrumente (PI) GmbH & Co. C-848 motor controller. -Version: $Revision: 1.2 $ +Version: $Revision: 1.3 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2007-10-17 19:54:51 $ +Last Modified: $Date: 2008-03-14 20:21:37 $ */ /* @@ -111,7 +111,7 @@ static struct board_stat **PIC848_cards; static long PIC848_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/PiSrc/devPIC862.cc b/motorApp/PiSrc/devPIC862.cc index c38ae004..e4bfa674 100644 --- a/motorApp/PiSrc/devPIC862.cc +++ b/motorApp/PiSrc/devPIC862.cc @@ -86,7 +86,7 @@ static struct board_stat **PIC862_cards; static long PIC862_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/PiSrc/devPIE516.cc b/motorApp/PiSrc/devPIE516.cc index c4bc6a75..e70afd97 100644 --- a/motorApp/PiSrc/devPIE516.cc +++ b/motorApp/PiSrc/devPIE516.cc @@ -3,9 +3,9 @@ FILENAME... devPIE516.cc USAGE... Motor record device level support for Physik Instrumente (PI) GmbH & Co. E-516 motor controller. -Version: $Revision: 1.1 $ -Modified By: $Author: sullivan $ -Last Modified: $Date: 2007-03-30 20:01:05 $ +Version: $Revision: 1.2 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2008-03-14 20:21:37 $ */ /* @@ -108,7 +108,7 @@ static struct board_stat **PIE516_cards; static long PIE516_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/PiSrc/devPIE710.cc b/motorApp/PiSrc/devPIE710.cc index 7c316a0f..636eb212 100644 --- a/motorApp/PiSrc/devPIE710.cc +++ b/motorApp/PiSrc/devPIE710.cc @@ -3,9 +3,9 @@ FILENAME... devPIE710.cc USAGE... Motor record device level support for Physik Instrumente (PI) GmbH & Co. E-710 motor controller. -Version: $Revision: 1.2 $ -Modified By: $Author: sullivan $ -Last Modified: $Date: 2006-12-18 17:42:56 $ +Version: $Revision: 1.3 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2008-03-14 20:21:36 $ */ /* @@ -108,7 +108,7 @@ static struct board_stat **PIE710_cards; static long PIE710_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/SmartMotorSrc/devSmartMotor.cc b/motorApp/SmartMotorSrc/devSmartMotor.cc index d7d8ddf0..919340d2 100644 --- a/motorApp/SmartMotorSrc/devSmartMotor.cc +++ b/motorApp/SmartMotorSrc/devSmartMotor.cc @@ -2,9 +2,9 @@ FILENAME... devSmartMotor.cc USAGE... Motor record driver level support for Animatics Corporation SmartMotors. -Version: $Revision: 1.1 $ +Version: $Revision: 1.2 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2007-05-08 14:45:16 $ +Last Modified: $Date: 2008-03-14 20:21:56 $ */ /* @@ -132,7 +132,7 @@ static struct board_stat **SmartMotor_cards; static long SmartMotor_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) { diff --git a/motorApp/SoftMotorSrc/devSoftAux.cc b/motorApp/SoftMotorSrc/devSoftAux.cc index a4b59ec6..1cd82381 100644 --- a/motorApp/SoftMotorSrc/devSoftAux.cc +++ b/motorApp/SoftMotorSrc/devSoftAux.cc @@ -2,9 +2,9 @@ FILENAME... devSoftAux.cc USAGE... Motor record device level support for Soft channel. -Version: $Revision: 1.11 $ -Modified By: $Author: peterd $ -Last Modified: $Date: 2007-09-19 15:57:41 $ +Version: $Revision: 1.12 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2008-03-14 20:23:27 $ */ /* @@ -79,7 +79,8 @@ STATIC void soft_rinp(struct event_handler_args args) long soft_init(void *after) { - int before_after = (int) after; + int before_after = (after == 0) ? 0 : 1; + if (before_after == 0) { epicsThreadId dbCaTask_tid; diff --git a/motorApp/ThorLabsSrc/devMDT695.cc b/motorApp/ThorLabsSrc/devMDT695.cc index a94df236..c46b339d 100644 --- a/motorApp/ThorLabsSrc/devMDT695.cc +++ b/motorApp/ThorLabsSrc/devMDT695.cc @@ -3,9 +3,9 @@ FILENAME... devMDT695.cc USAGE... Motor record device level support for ThorLabs Piezo Control Module (MDT695) -Version: $Revision: 1.1 $ -Modified By: $Author: sullivan $ -Last Modified: $Date: 2006-09-27 20:32:37 $ +Version: $Revision: 1.2 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2008-03-14 20:23:45 $ */ /* @@ -110,7 +110,7 @@ static struct board_stat **MDT695_cards; STATIC long MDT695_init(void *arg) { long rtnval; - int after = (int) arg; + int after = (arg == 0) ? 0 : 1; if (after == 0) {