diff --git a/src/dev/softDev/devCalcoutSoft.c b/src/dev/softDev/devCalcoutSoft.c index 9f074c40c..70d77a56a 100644 --- a/src/dev/softDev/devCalcoutSoft.c +++ b/src/dev/softDev/devCalcoutSoft.c @@ -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); } diff --git a/src/dev/softDev/devCalcoutSoftCallback.c b/src/dev/softDev/devCalcoutSoftCallback.c index 1a00f393b..d9a6334d2 100644 --- a/src/dev/softDev/devCalcoutSoftCallback.c +++ b/src/dev/softDev/devCalcoutSoftCallback.c @@ -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; }