forked from epics_driver_modules/motorBase
Minor changes to avoid compiler warnings
This commit is contained in:
@@ -2,9 +2,9 @@
|
||||
FILENAME... drvESP300.cc
|
||||
USAGE... Motor record driver level support for Newport ESP300/100.
|
||||
|
||||
Version: $Revision: 1.24 $
|
||||
Modified By: $Author: sluiter $
|
||||
Last Modified: $Date: 2009-04-27 14:03:02 $
|
||||
Version: $Revision: 1.25 $
|
||||
Modified By: $Author: rivers $
|
||||
Last Modified: $Date: 2009-09-01 16:17:46 $
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -128,7 +128,7 @@ struct driver_table ESP300_access =
|
||||
NULL
|
||||
};
|
||||
|
||||
struct
|
||||
struct drvESP300_drvet
|
||||
{
|
||||
long number;
|
||||
#ifdef __cplusplus
|
||||
@@ -572,7 +572,7 @@ static int motor_init()
|
||||
int card_index, motor_index;
|
||||
char buff[BUFF_SIZE];
|
||||
int total_axis = 0;
|
||||
int status;
|
||||
int status=0;
|
||||
asynStatus success_rtn;
|
||||
static const char output_terminator[] = "\r";
|
||||
static const char input_terminator[] = "\n";
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
FILENAME... drvMM3000.cc
|
||||
USAGE... Motor record driver level support for Newport MM3000.
|
||||
|
||||
Version: $Revision: 1.21 $
|
||||
Version: $Revision: 1.22 $
|
||||
Modified By: $Author: rivers $
|
||||
Last Modified: $Date: 2005-12-15 20:19:02 $
|
||||
Last Modified: $Date: 2009-09-01 16:18:09 $
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -151,7 +151,7 @@ struct driver_table MM3000_access =
|
||||
NULL
|
||||
};
|
||||
|
||||
struct
|
||||
struct drvMM3000_drvet
|
||||
{
|
||||
long number;
|
||||
long (*report) (int);
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
FILENAME... drvMM4000.cc
|
||||
USAGE... Motor record driver level support for Newport MM4000.
|
||||
|
||||
Version: $Revision: 1.23 $
|
||||
Modified By: $Author: sluiter $
|
||||
Last Modified: $Date: 2009-02-18 20:54:20 $
|
||||
Version: $Revision: 1.24 $
|
||||
Modified By: $Author: rivers $
|
||||
Last Modified: $Date: 2009-09-01 16:18:28 $
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -157,7 +157,7 @@ struct driver_table MM4000_access =
|
||||
NULL
|
||||
};
|
||||
|
||||
struct
|
||||
struct drvMM4000_drvet
|
||||
{
|
||||
long number;
|
||||
#ifdef __cplusplus
|
||||
@@ -635,7 +635,7 @@ static int motor_init()
|
||||
char buff[BUFF_SIZE];
|
||||
char *tok_save, *pos_ptr;
|
||||
int total_axis = 0;
|
||||
int status, model_num, digits;
|
||||
int status=0, model_num, digits;
|
||||
asynStatus success_rtn;
|
||||
|
||||
initialized = true; /* Indicate that driver is initialized. */
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
FILENAME... drvPM500.cc
|
||||
USAGE... Motor record driver level support for Newport PM500.
|
||||
|
||||
Version: $Revision: 1.21 $
|
||||
Modified By: $Author: sluiter $
|
||||
Last Modified: $Date: 2009-08-25 18:25:54 $
|
||||
Version: $Revision: 1.22 $
|
||||
Modified By: $Author: rivers $
|
||||
Last Modified: $Date: 2009-09-01 16:20:08 $
|
||||
*/
|
||||
|
||||
/* Device Driver Support routines for PM500 motor controller */
|
||||
@@ -141,7 +141,7 @@ struct driver_table PM500_access =
|
||||
PM500_axis_names
|
||||
};
|
||||
|
||||
struct
|
||||
struct drvP500_drvet
|
||||
{
|
||||
long number;
|
||||
#ifdef __cplusplus
|
||||
@@ -514,7 +514,7 @@ static int motor_init()
|
||||
int card_index, motor_index;
|
||||
char buff[BUFF_SIZE];
|
||||
int total_axis = 0;
|
||||
int status, digits;
|
||||
int status=0, digits;
|
||||
asynStatus success_rtn;
|
||||
|
||||
initialized = true; /* Indicate that driver is initialized. */
|
||||
|
||||
@@ -384,7 +384,7 @@ static asynStatus readUInt32D(void *drvPvt, asynUser *pasynUser,
|
||||
channel);
|
||||
return(asynError);
|
||||
}
|
||||
status = GPIOAnalogGainGet(pPvt->socketID, 1, analogInputNames[channel], value);
|
||||
status = GPIOAnalogGainGet(pPvt->socketID, 1, analogInputNames[channel], (int*)value);
|
||||
if (status) {
|
||||
epicsSnprintf(pasynUser->errorMessage, pasynUser->errorMessageSize,
|
||||
"drvXPSAsynAux::writeUInt32D error calling GPIOAnalogGainSet=%d",
|
||||
@@ -441,7 +441,7 @@ static asynStatus writeUInt32D(void *drvPvt, asynUser *pasynUser,
|
||||
return(asynError);
|
||||
}
|
||||
GPIOName = analogInputNames[channel];
|
||||
status = GPIOAnalogGainSet(pPvt->socketID, 1, GPIOName, &value);
|
||||
status = GPIOAnalogGainSet(pPvt->socketID, 1, GPIOName, (int*)&value);
|
||||
if (status) {
|
||||
epicsSnprintf(pasynUser->errorMessage, pasynUser->errorMessageSize,
|
||||
"drvXPSAsynAux::writeUInt32D error calling GPIOAnalogGainSet=%d",
|
||||
|
||||
@@ -24,7 +24,9 @@
|
||||
static int code(char*);
|
||||
static int sendFtpCommandAndReceive (int, char*, char*);
|
||||
static int getPort (int, char*);
|
||||
#ifdef DEBUG
|
||||
static void printRecv (char*, int);
|
||||
#endif
|
||||
|
||||
|
||||
/******[ ftpConnect ]************************************************/
|
||||
@@ -370,6 +372,7 @@ static int getPort (int socketFD, char* ip)
|
||||
}
|
||||
|
||||
|
||||
#ifdef DEBUG
|
||||
/******[ printRecv ]**************************************************/
|
||||
static void printRecv (char *str, int i)
|
||||
{
|
||||
@@ -377,3 +380,4 @@ static void printRecv (char *str, int i)
|
||||
for (j = 0; j < i; j++)
|
||||
printf("%c", str[j]);
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user