Commit cf3fd753 authored by kpetersn's avatar kpetersn
Browse files

Don't pass pointers that aren't needed. Corrected parameter strings in db.

parent 7c72d958
......@@ -92,7 +92,7 @@ record(longin, "$(P)$(T):controllerConfig_RBV")
record(longin, "$(P)$(T):controllerError_RBV")
{
field(DTYP, "asynInt32")
field(INP, "@asyn($(PORT),$(ADDR))CONTROLLER_CONFIG_IN_VALUE")
field(INP, "@asyn($(PORT),$(ADDR))CONTROLLER_ERROR_IN_VALUE")
field(PINI, "YES")
field(EGU, "N/A")
field(SCAN, "Passive")
......@@ -101,7 +101,7 @@ record(longin, "$(P)$(T):controllerError_RBV")
record(longin, "$(P)$(T):controllerStatus_RBV")
{
field(DTYP, "asynInt32")
field(INP, "@asyn($(PORT),$(ADDR))CONTROLLER_CONFIG_IN_VALUE")
field(INP, "@asyn($(PORT),$(ADDR))CONTROLLER_STATUS_IN_VALUE")
field(PINI, "YES")
field(EGU, "N/A")
field(SCAN, "Passive")
......@@ -110,7 +110,7 @@ record(longin, "$(P)$(T):controllerStatus_RBV")
record(longin, "$(P)$(T):stageConfig_RBV")
{
field(DTYP, "asynInt32")
field(INP, "@asyn($(PORT),$(ADDR))CONTROLLER_CONFIG_IN_VALUE")
field(INP, "@asyn($(PORT),$(ADDR))STAGE_CONFIG_IN_VALUE")
field(PINI, "YES")
field(EGU, "N/A")
field(SCAN, "Passive")
......
......@@ -391,19 +391,19 @@ asynStatus Linkam::readInt32(asynUser *pasynUser, epicsInt32 *value)
if (function == controllerConfigInValue_) {
status = readControllerConfig(&controllerConfig_);
status = readControllerConfig();
} else if (function == controllerErrorInValue_) {
status = readControllerError(&controllerError_);
status = readControllerError();
} else if (function == controllerStatusInValue_) {
status = readControllerStatus(&controllerStatus_);
status = readControllerStatus();
} else if (function == stageConfigInValue_) {
status = readStageConfig(&stageConfig_);
status = readStageConfig();
}
......@@ -427,62 +427,62 @@ asynStatus Linkam::readInt32(asynUser *pasynUser, epicsInt32 *value)
return (status==0) ? asynSuccess : asynError;
}
asynStatus Linkam::readControllerConfig(epicsUInt64 *value)
asynStatus Linkam::readControllerConfig()
{
static const char *functionName = "readControllerConfig";
this->lock();
*value = GetControllerConfig();
this->controllerConfig_ = GetControllerConfig();
this->unlock();
asynPrint(this->pasynUserSelf, ASYN_TRACEIO_DRIVER,
"%s:%s, port %s, value = %llx\n",
driverName, functionName, this->portName, *value);
"%s:%s, port %s, controllerConfig_ = %llx\n",
driverName, functionName, this->portName, this->controllerConfig_);
return asynSuccess;
}
asynStatus Linkam::readControllerError(epicsUInt32 *value)
asynStatus Linkam::readControllerError()
{
static const char *functionName = "readControllerError";
this->lock();
*value = GetControllerError();
this->controllerError_ = GetControllerError();
this->unlock();
asynPrint(this->pasynUserSelf, ASYN_TRACEIO_DRIVER,
"%s:%s, port %s, value = %lx\n",
driverName, functionName, this->portName, *value);
"%s:%s, port %s, controllerError_ = %lx\n",
driverName, functionName, this->portName, this->controllerError_);
return asynSuccess;
}
asynStatus Linkam::readControllerStatus(epicsUInt64 *value)
asynStatus Linkam::readControllerStatus()
{
static const char *functionName = "readControllerStatus";
this->lock();
*value = GetStatus();
this->controllerStatus_ = GetStatus();
this->unlock();
asynPrint(this->pasynUserSelf, ASYN_TRACEIO_DRIVER,
"%s:%s, port %s, value = %llx\n",
driverName, functionName, this->portName, *value);
"%s:%s, port %s, controllerStatus_ = %llx\n",
driverName, functionName, this->portName, this->controllerStatus_);
return asynSuccess;
}
asynStatus Linkam::readStageConfig(epicsUInt64 *value)
asynStatus Linkam::readStageConfig()
{
static const char *functionName = "readStageConfig";
this->lock();
*value = GetStageConfig();
this->stageConfig_ = GetStageConfig();
this->unlock();
asynPrint(this->pasynUserSelf, ASYN_TRACEIO_DRIVER,
"%s:%s, port %s, value = %llx\n",
driverName, functionName, this->portName, *value);
"%s:%s, port %s, stageConfig_ = %llx\n",
driverName, functionName, this->portName, this->stageConfig_);
return asynSuccess;
}
......
......@@ -70,10 +70,10 @@ private:
asynStatus setRampRate(epicsFloat64 value);
asynStatus readHeaterPower(epicsFloat64 *value);
asynStatus setHeating(epicsInt32 value);
asynStatus readControllerConfig(epicsUInt64 *value);
asynStatus readControllerError(epicsUInt32 *value);
asynStatus readControllerStatus(epicsUInt64 *value);
asynStatus readStageConfig(epicsUInt64 *value);
asynStatus readControllerConfig();
asynStatus readControllerError();
asynStatus readControllerStatus();
asynStatus readStageConfig();
void report(FILE *fp, int details);
epicsUInt32 commType_;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment