diff --git a/src/dev/softDev/devSoSoft.c b/src/dev/softDev/devSoSoft.c index db77845b6..9904d23a4 100644 --- a/src/dev/softDev/devSoSoft.c +++ b/src/dev/softDev/devSoSoft.c @@ -7,13 +7,12 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* devSoSoft.c */ -/* base/src/dev $Id$ */ +/* $Id$ */ /* - * Author: Janet Anderson - * Date: 04-21-91 -*/ - + * Author: Janet Anderson + * Date: 21APR1991 + */ + #include #include #include @@ -28,35 +27,28 @@ #include "epicsExport.h" /* Create the dset for devSoSoft */ -static long init_record(); static long write_stringout(); struct { - long number; - DEVSUPFUN report; - DEVSUPFUN init; - DEVSUPFUN init_record; - DEVSUPFUN get_ioint_info; - DEVSUPFUN write_stringout; -}devSoSoft={ - 5, - NULL, - NULL, - init_record, - NULL, - write_stringout + long number; + DEVSUPFUN report; + DEVSUPFUN init; + DEVSUPFUN init_record; + DEVSUPFUN get_ioint_info; + DEVSUPFUN write_stringout; +} devSoSoft = { + 5, + NULL, + NULL, + NULL, + NULL, + write_stringout }; -epicsExportAddress(dset,devSoSoft); - -static long init_record(stringoutRecord *pstringout) -{ - return 0; -} /* end init_record() */ +epicsExportAddress(dset, devSoSoft); -static long write_stringout(pstringout) - struct stringoutRecord *pstringout; +static long write_stringout(stringoutRecord *pstringout) { long status; - status = dbPutLink(&pstringout->out,DBR_STRING,pstringout->val,1); - return(status); + status = dbPutLink(&pstringout->out, DBR_STRING, pstringout->val, 1); + return status; } diff --git a/src/dev/softDev/devSoSoftCallback.c b/src/dev/softDev/devSoSoftCallback.c index e51d4a924..64a3b8bab 100644 --- a/src/dev/softDev/devSoSoftCallback.c +++ b/src/dev/softDev/devSoSoftCallback.c @@ -7,10 +7,10 @@ * and higher are distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* devSoSoftCallback.c */ +/* $Id$ */ /* - * Author: Marty Kraimer - * Date: 04NOV2003 + * Author: Marty Kraimer + * Date: 04NOV2003 */ #include @@ -29,39 +29,40 @@ /* Create the dset for devSoSoftCallback */ static long write_stringout(); struct { - long number; - DEVSUPFUN report; - DEVSUPFUN init; - DEVSUPFUN init_record; - DEVSUPFUN get_ioint_info; - DEVSUPFUN write_stringout; -}devSoSoftCallback={ - 5, - NULL, - NULL, - NULL, - NULL, - write_stringout + long number; + DEVSUPFUN report; + DEVSUPFUN init; + DEVSUPFUN init_record; + DEVSUPFUN get_ioint_info; + DEVSUPFUN write_stringout; +} devSoSoftCallback = { + 5, + NULL, + NULL, + NULL, + NULL, + write_stringout }; -epicsExportAddress(dset,devSoSoftCallback); +epicsExportAddress(dset, devSoSoftCallback); -static long write_stringout(pstringout) - struct stringoutRecord *pstringout; +static long write_stringout(stringoutRecord *pstringout) { struct link *plink = &pstringout->out; long status; - if(pstringout->pact) return(0); - if(plink->type!=CA_LINK) { - status = dbPutLink(plink,DBR_STRING,&pstringout->val,1); - return(status); + if (pstringout->pact) return 0; + + if (plink->type != CA_LINK) { + return dbPutLink(plink, DBR_STRING, &pstringout->val, 1); } - status = dbCaPutLinkCallback(plink,DBR_STRING,&pstringout->val,1, - (dbCaCallback)dbCaCallbackProcess,plink); - if(status) { - recGblSetSevr(pstringout,LINK_ALARM,INVALID_ALARM); - return(status); + + status = dbCaPutLinkCallback(plink, DBR_STRING, &pstringout->val, 1, + (dbCaCallback)dbCaCallbackProcess, plink); + if (status) { + recGblSetSevr(pstringout, LINK_ALARM, INVALID_ALARM); + return status; } + pstringout->pact = TRUE; - return(0); + return 0; }