forked from epics_driver_modules/motorBase
Eliminate 64-bit compiler warnings.
This commit is contained in:
@@ -98,16 +98,11 @@ struct driver_table MCB4B_access =
|
||||
NULL
|
||||
};
|
||||
|
||||
struct
|
||||
struct drvMCB4B_drvet
|
||||
{
|
||||
long number;
|
||||
#ifdef __cplusplus
|
||||
long (*report) (int);
|
||||
long (*init) (void);
|
||||
#else
|
||||
DRVSUPFUN report;
|
||||
DRVSUPFUN init;
|
||||
#endif
|
||||
} drvMCB4B = {2, report, init};
|
||||
|
||||
extern "C" {epicsExportAddress(drvet, drvMCB4B);}
|
||||
|
||||
@@ -3,9 +3,9 @@ FILENAME... drvSPiiPlus.cc
|
||||
USAGE... Motor record driver level support for ACS Tech80
|
||||
SPiiPlus
|
||||
|
||||
Version: $Revision: 1.3 $
|
||||
Modified By: $Author: sullivan $
|
||||
Last Modified: $Date: 2008-05-21 21:18:53 $
|
||||
Version: $Revision: 1.4 $
|
||||
Modified By: $Author: sluiter $
|
||||
Last Modified: $Date: 2009-09-08 18:24:12 $
|
||||
|
||||
*/
|
||||
|
||||
@@ -140,16 +140,11 @@ struct driver_table SPiiPlus_access =
|
||||
NULL
|
||||
};
|
||||
|
||||
struct
|
||||
struct drvSPiiPlus_drvet
|
||||
{
|
||||
long number;
|
||||
#ifdef __cplusplus
|
||||
long (*report) (int);
|
||||
long (*init) (void);
|
||||
#else
|
||||
DRVSUPFUN report;
|
||||
DRVSUPFUN init;
|
||||
#endif
|
||||
} drvSPiiPlus = {2, report, init};
|
||||
|
||||
extern "C" {epicsExportAddress(drvet, drvSPiiPlus);}
|
||||
@@ -624,7 +619,7 @@ SPiiPlusConfig(int card, /* card being configured */
|
||||
|
||||
// Set controller command interface mode - BUFFER is the default
|
||||
// Assure upper case argument - only check first 3 letters
|
||||
modeCas[0]=NULL;
|
||||
modeCas[0]= (char) NULL;
|
||||
if (modeStr != NULL) {
|
||||
for (modeIdx=0; modeIdx < 3; modeIdx++)
|
||||
modeCas[modeIdx] = toupper(modeStr[modeIdx]);
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
FILENAME... drvEnsemble.cc
|
||||
USAGE... Motor record driver level support for Aerotech Ensemble.
|
||||
|
||||
Version: $Revision: 1.6 $
|
||||
Version: $Revision: 1.7 $
|
||||
Modified By: $Author: sluiter $
|
||||
Last Modified: $Date: 2009-05-01 18:13:12 $
|
||||
Last Modified: $Date: 2009-09-08 18:24:33 $
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -143,7 +143,7 @@ struct driver_table Ensemble_access =
|
||||
NULL
|
||||
};
|
||||
|
||||
struct
|
||||
struct drvEnsemble_drvet
|
||||
{
|
||||
long number;
|
||||
long (*report) (int);
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
FILENAME... drvPmac.cc
|
||||
USAGE... Driver level support for Delta Tau PMAC model.
|
||||
|
||||
Version: $Revision: 1.10 $
|
||||
Version: $Revision: 1.11 $
|
||||
Modified By: $Author: sluiter $
|
||||
Last Modified: $Date: 2009-05-01 18:26:30 $
|
||||
Last Modified: $Date: 2009-09-08 18:25:19 $
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -125,7 +125,7 @@ static void Pmac_reset();
|
||||
|
||||
static RTN_STATUS PmacPut(int, char *);
|
||||
static int motorIsrEnable(int);
|
||||
static void motorIsrDisable(int);
|
||||
/* static void motorIsrDisable(int); */
|
||||
|
||||
struct driver_table Pmac_access =
|
||||
{
|
||||
@@ -600,6 +600,7 @@ static int motorIsrEnable(int card)
|
||||
return (OK);
|
||||
}
|
||||
|
||||
/*
|
||||
static void motorIsrDisable(int card)
|
||||
{
|
||||
long status;
|
||||
@@ -610,8 +611,8 @@ static void motorIsrDisable(int card)
|
||||
if (!RTN_SUCCESS(status))
|
||||
errPrintf(status, __FILE__, __LINE__, "Can't disconnect vector %d\n",
|
||||
PmacInterruptVector + card);
|
||||
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
/*****************************************************
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
FILENAME... drvMCDC2805.cc
|
||||
USAGE... Motor record driver level support for Faulhaber MCDC2805
|
||||
|
||||
Version: $Revision: 1.3 $
|
||||
Modified By: $Author: rivers $
|
||||
Last Modified: $Date: 2005-12-08 00:07:47 $
|
||||
Version: $Revision: 1.4 $
|
||||
Modified By: $Author: sluiter $
|
||||
Last Modified: $Date: 2009-09-08 18:25:39 $
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -113,7 +113,7 @@ struct driver_table MCDC2805_access =
|
||||
MCDC2805_axis
|
||||
};
|
||||
|
||||
struct
|
||||
struct drvMCDC2805_drvet
|
||||
{
|
||||
long number;
|
||||
long (*report) (int);
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
FILENAME... drvSC800.cc
|
||||
USAGE... Motor record driver level support for Kohzu SC800
|
||||
|
||||
Version: $Revision: 1.1 $
|
||||
Version: $Revision: 1.2 $
|
||||
Modified By: $Author: sluiter $
|
||||
Last Modified: $Date: 2007-11-27 18:01:17 $
|
||||
Last Modified: $Date: 2009-09-08 18:26:02 $
|
||||
|
||||
*/
|
||||
|
||||
@@ -124,7 +124,7 @@ struct driver_table SC800_access =
|
||||
NULL
|
||||
};
|
||||
|
||||
struct
|
||||
struct drvSC800_drvet
|
||||
{
|
||||
long number;
|
||||
long (*report) (int);
|
||||
|
||||
@@ -3,9 +3,9 @@ FILENAME... drvMVP2001.cc
|
||||
USAGE... Motor record driver level support for MicroMo
|
||||
MVP 2001 B02 (Linear, RS-485).
|
||||
|
||||
Version: $Revision: 1.12 $
|
||||
Version: $Revision: 1.13 $
|
||||
Modified By: $Author: sluiter $
|
||||
Last Modified: $Date: 2008-06-09 19:49:25 $
|
||||
Last Modified: $Date: 2009-09-08 18:26:32 $
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -189,7 +189,7 @@ struct driver_table MVP2001_access =
|
||||
NULL
|
||||
};
|
||||
|
||||
struct
|
||||
struct drvMVP2001_drvet
|
||||
{
|
||||
long number;
|
||||
long (*report) (int);
|
||||
|
||||
@@ -190,7 +190,7 @@ struct driver_table PMNC87xx_access =
|
||||
NULL
|
||||
};
|
||||
|
||||
struct
|
||||
struct drvPMNC87xx_drvet
|
||||
{
|
||||
long number;
|
||||
long (*report) (int);
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
FILENAME... drvMAXv.cc
|
||||
USAGE... Motor record driver level support for OMS model MAXv.
|
||||
|
||||
Version: $Revision: 1.24 $
|
||||
Version: $Revision: 1.25 $
|
||||
Modified By: $Author: sluiter $
|
||||
Last Modified: $Date: 2009-07-02 17:54:14 $
|
||||
Last Modified: $Date: 2009-09-08 18:27:59 $
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -186,7 +186,7 @@ struct driver_table MAXv_access =
|
||||
MAXv_axis
|
||||
};
|
||||
|
||||
struct
|
||||
struct drvMAXv_drvet
|
||||
{
|
||||
long number;
|
||||
long (*report) (int);
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
FILENAME... drvOms.cc
|
||||
USAGE... Driver level support for OMS models VME8, VME44 and VS4.
|
||||
|
||||
Version: $Revision: 1.28 $
|
||||
Version: $Revision: 1.29 $
|
||||
Modified By: $Author: sluiter $
|
||||
Last Modified: $Date: 2009-06-18 19:09:58 $
|
||||
Last Modified: $Date: 2009-09-08 18:27:58 $
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -189,7 +189,7 @@ struct driver_table oms_access =
|
||||
oms_axis
|
||||
};
|
||||
|
||||
struct
|
||||
struct drvOms_drvet
|
||||
{
|
||||
long number;
|
||||
long (*report) (int);
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
FILENAME... drvOms58.cc
|
||||
USAGE... Motor record driver level support for OMS model VME58.
|
||||
|
||||
Version: $Revision: 1.28 $
|
||||
Version: $Revision: 1.29 $
|
||||
Modified By: $Author: sluiter $
|
||||
Last Modified: $Date: 2009-06-18 19:10:49 $
|
||||
Last Modified: $Date: 2009-09-08 18:27:58 $
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -215,7 +215,7 @@ struct driver_table oms58_access =
|
||||
oms58_axis
|
||||
};
|
||||
|
||||
struct
|
||||
struct drvOms58_drvet
|
||||
{
|
||||
long number;
|
||||
long (*report) (int);
|
||||
|
||||
@@ -3,9 +3,9 @@ FILENAME... drvEMC18011.cc
|
||||
USAGE... Motor record driver level support for Spectra-Physics
|
||||
Encoder Mike Controller (Model: 18011)
|
||||
|
||||
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: 2009-09-08 18:28:23 $
|
||||
|
||||
*/
|
||||
|
||||
@@ -137,16 +137,11 @@ struct driver_table EMC18011_access =
|
||||
NULL
|
||||
};
|
||||
|
||||
struct
|
||||
struct drvEMC18011_drvet
|
||||
{
|
||||
long number;
|
||||
#ifdef __cplusplus
|
||||
long (*report) (int);
|
||||
long (*init) (void);
|
||||
#else
|
||||
DRVSUPFUN report;
|
||||
DRVSUPFUN init;
|
||||
#endif
|
||||
} drvEMC18011 = {2, report, init};
|
||||
|
||||
extern "C" {epicsExportAddress(drvet, drvEMC18011);}
|
||||
|
||||
@@ -3,9 +3,9 @@ FILENAME... drvPC6K.cc
|
||||
USAGE... Motor record driver level support for Parker Computmotor
|
||||
6K Series motor controllers
|
||||
|
||||
Version: $Revision: 1.5 $
|
||||
Modified By: $Author: sullivan $
|
||||
Last Modified: $Date: 2006-12-18 19:31:15 $
|
||||
Version: $Revision: 1.6 $
|
||||
Modified By: $Author: sluiter $
|
||||
Last Modified: $Date: 2009-09-08 18:28:46 $
|
||||
|
||||
*/
|
||||
|
||||
@@ -183,16 +183,11 @@ struct driver_table PC6K_access =
|
||||
NULL
|
||||
};
|
||||
|
||||
struct
|
||||
struct drvPC6K_drvet
|
||||
{
|
||||
long number;
|
||||
#ifdef __cplusplus
|
||||
long (*report) (int);
|
||||
long (*init) (void);
|
||||
#else
|
||||
DRVSUPFUN report;
|
||||
DRVSUPFUN init;
|
||||
#endif
|
||||
} drvPC6K = {2, report, init};
|
||||
|
||||
extern "C" {epicsExportAddress(drvet, drvPC6K);}
|
||||
|
||||
@@ -3,9 +3,9 @@ FILENAME... drvPIJEDS.cc
|
||||
USAGE... Motor record driver level support for piezosystem jena
|
||||
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: 2009-09-08 18:29:06 $
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -135,7 +135,7 @@ struct driver_table PIJEDS_access =
|
||||
PIJEDS_axis
|
||||
};
|
||||
|
||||
struct
|
||||
struct drvPIJEDS_drvet
|
||||
{
|
||||
long number;
|
||||
long (*report) (int);
|
||||
|
||||
@@ -124,7 +124,7 @@ struct driver_table PIE816_access =
|
||||
PIE816_axis
|
||||
};
|
||||
|
||||
struct
|
||||
struct drvPIE816_drvet
|
||||
{
|
||||
long number;
|
||||
long (*report) (int);
|
||||
|
||||
Reference in New Issue
Block a user