lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity

More error checks to prevent IOC crashing when controller powered-down.

Browse Source
This commit is contained in:
Ron Sluiter
2010-04-29 14:08:19 +00:00
parent a691680383
commit fe49cfae67
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/AerotechSrc/drvEnsembleAsyn.cc
+3 -3
View File
@@ -287,7 +287,7 @@ static int motorAxisClose(AXIS_HDL pAxis)
static int motorAxisGetInteger(AXIS_HDL pAxis, motorAxisParam_t function, int * value) static int motorAxisGetInteger(AXIS_HDL pAxis, motorAxisParam_t function, int * value)
{ {
if (pAxis == NULL) if (pAxis == NULL || pAxis->params == NULL)
return (MOTOR_AXIS_ERROR); return (MOTOR_AXIS_ERROR);
else else
return (motorParam->getInteger(pAxis->params, (paramIndex) function, value)); return (motorParam->getInteger(pAxis->params, (paramIndex) function, value));
@@ -295,7 +295,7 @@ static int motorAxisGetInteger(AXIS_HDL pAxis, motorAxisParam_t function, int *
static int motorAxisGetDouble(AXIS_HDL pAxis, motorAxisParam_t function, double * value) static int motorAxisGetDouble(AXIS_HDL pAxis, motorAxisParam_t function, double * value)
{ {
if (pAxis == NULL) if (pAxis == NULL || pAxis->params == NULL)
return (MOTOR_AXIS_ERROR); return (MOTOR_AXIS_ERROR);
else else
return (motorParam->getDouble(pAxis->params, (paramIndex) function, value)); return (motorParam->getDouble(pAxis->params, (paramIndex) function, value));
@@ -303,7 +303,7 @@ static int motorAxisGetDouble(AXIS_HDL pAxis, motorAxisParam_t function, double
static int motorAxisSetCallback(AXIS_HDL pAxis, motorAxisCallbackFunc callback, void * param) static int motorAxisSetCallback(AXIS_HDL pAxis, motorAxisCallbackFunc callback, void * param)
{ {
if (pAxis == NULL) if (pAxis == NULL || pAxis->params == NULL)
return (MOTOR_AXIS_ERROR); return (MOTOR_AXIS_ERROR);
else else
return (motorParam->setCallback(pAxis->params, callback, param)); return (motorParam->setCallback(pAxis->params, callback, param));