epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Cleanup after fix for Mantis #314.

Browse Source
This commit is contained in:
Andrew Johnson
2008-06-13 15:32:05 +00:00
parent 3a36b75c01
commit e0e3053b36
2 changed files with 37 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dev/softDev/devCalcoutSoft.c
+14 -20
View File
@@ -1,10 +1,9 @@
/*************************************************************************\
* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
* Copyright (c) 2008 UChicago Argonne LLC, as Operator of Argonne
* National Laboratory.
* Copyright (c) 2002 The Regents of the University of California, as
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
* EPICS BASE is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* devCalcoutSoft.c */
@@ -31,25 +30,20 @@
#include "epicsExport.h"
static long write_calcout();
struct {
long number;
DEVSUPFUN report;
DEVSUPFUN init;
DEVSUPFUN init_record;
DEVSUPFUN get_ioint_info;
DEVSUPFUN write;
DEVSUPFUN special_linconv;
}devCalcoutSoft={
6,
NULL,
NULL,
NULL,
NULL,
write_calcout,
NULL};
epicsExportAddress(dset,devCalcoutSoft);
long number;
DEVSUPFUN report;
DEVSUPFUN init;
DEVSUPFUN init_record;
DEVSUPFUN get_ioint_info;
DEVSUPFUN write;
} devCalcoutSoft = {
5, NULL, NULL, NULL, NULL, write_calcout
};
epicsExportAddress(dset, devCalcoutSoft);
static long write_calcout(calcoutRecord *pcalcout)
{
return dbPutLink(&pcalcout->out,DBR_DOUBLE, &pcalcout->oval,1);
return dbPutLink(&pcalcout->out, DBR_DOUBLE, &pcalcout->oval, 1);
}
src/dev/softDev/devCalcoutSoftCallback.c
+23 -29
View File
@@ -1,10 +1,9 @@
/*************************************************************************\
* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
* Copyright (c) 2008 UChicago Argonne LLC, as Operator of Argonne
* National Laboratory.
* Copyright (c) 2002 The Regents of the University of California, as
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
* EPICS BASE is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* devCalcoutSoftCallback.c */
@@ -31,40 +30,35 @@
#include "epicsExport.h"
static long write_calcout();
struct {
long number;
DEVSUPFUN report;
DEVSUPFUN init;
DEVSUPFUN init_record;
DEVSUPFUN get_ioint_info;
DEVSUPFUN write;
DEVSUPFUN special_linconv;
}devCalcoutSoftCallback={
6,
NULL,
NULL,
NULL,
NULL,
write_calcout,
NULL};
epicsExportAddress(dset,devCalcoutSoftCallback);
long number;
DEVSUPFUN report;
DEVSUPFUN init;
DEVSUPFUN init_record;
DEVSUPFUN get_ioint_info;
DEVSUPFUN write;
} devCalcoutSoftCallback = {
5, NULL, NULL, NULL, NULL, write_calcout
};
epicsExportAddress(dset, devCalcoutSoftCallback);
static long write_calcout(calcoutRecord *pcalcout)
{
struct link *plink = &pcalcout->out;
long status;
if(pcalcout->pact) return(0);
if(plink->type!=CA_LINK) {
status = dbPutLink(plink,DBR_DOUBLE,&pcalcout->oval,1);
return(status);
if (pcalcout->pact) return 0;
if (plink->type != CA_LINK) {
status = dbPutLink(plink, DBR_DOUBLE, &pcalcout->oval, 1);
return status;
}
status = dbCaPutLinkCallback(plink,DBR_DOUBLE,&pcalcout->oval,1,
(dbCaCallback)dbCaCallbackProcess,plink);
if(status) {
recGblSetSevr(pcalcout,LINK_ALARM,INVALID_ALARM);
return(status);
status = dbCaPutLinkCallback(plink, DBR_DOUBLE, &pcalcout->oval, 1,
(dbCaCallback)dbCaCallbackProcess, plink);
if (status) {
recGblSetSevr(pcalcout, LINK_ALARM, INVALID_ALARM);
return status;
}
pcalcout->pact = TRUE;
return(0);
return 0;
}