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

Replaced YES and NO macros with their menuYesNo or menuSimm equivalents.

Browse Source
This commit is contained in:
Andrew Johnson
2009-07-08 18:14:11 +00:00
parent 16f839ac12
commit a318ace551
14 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/rec/aaiRecord.c
View File

@@ -36,6 +36,7 @@
#include "errMdef.h"
#include "recSup.h"
#include "recGbl.h"
#include "menuYesNo.h"
#define GEN_SIZE_OFFSET
#include "aaiRecord.h"
#undef GEN_SIZE_OFFSET
@@ -254,12 +255,12 @@ static long readValue(aaiRecord *prec)
if (status)
return(status);
if (prec->simm == NO){
if (prec->simm == menuYesNoNO){
/* Call dev support */
status = pdset->read_aai(prec);
return status;
}
if (prec->simm == YES){
if (prec->simm == menuYesNoYES){
/* Simm processing split performed in devSup */
/* Call dev support */
status = pdset->read_aai(prec);

5
src/rec/aaoRecord.c
View File

@@ -36,6 +36,7 @@
#include "devSup.h"
#include "recSup.h"
#include "recGbl.h"
#include "menuYesNo.h"
#define GEN_SIZE_OFFSET
#include "aaoRecord.h"
#undef GEN_SIZE_OFFSET
@@ -251,12 +252,12 @@ static long writeValue(aaoRecord *prec)
if (status)
return status;
if (prec->simm == NO) {
if (prec->simm == menuYesNoNO) {
/* Call dev support */
status = pdset->write_aao(prec);
return status;
}
if (prec->simm == YES) {
if (prec->simm == menuYesNoYES) {
/* Call dev support */
status = pdset->write_aao(prec);
return status;

5
src/rec/aoRecord.c
View File

@@ -36,6 +36,7 @@
#include "recGbl.h"
#include "menuConvert.h"
#include "menuOmsl.h"
#include "menuYesNo.h"
#define GEN_SIZE_OFFSET
#include "aoRecord.h"
#undef GEN_SIZE_OFFSET
@@ -531,11 +532,11 @@ static long writeValue(aoRecord *prec)
if (status)
return(status);
if (prec->simm == NO){
if (prec->simm == menuYesNoNO){
status=(*pdset->write_ao)(prec);
return(status);
}
if (prec->simm == YES){
if (prec->simm == menuYesNoYES){
status = dbPutLink(&(prec->siol),DBR_DOUBLE,&(prec->oval),1);
} else {
status=-1;

5
src/rec/boRecord.c
View File

@@ -38,6 +38,7 @@
#undef GEN_SIZE_OFFSET
#include "menuIvoa.h"
#include "menuOmsl.h"
#include "menuYesNo.h"
#include "epicsExport.h"
/* Create RSET - Record Support Entry Table*/
@@ -383,11 +384,11 @@ static long writeValue(boRecord *prec)
if (status)
return(status);
if (prec->simm == NO){
if (prec->simm == menuYesNoNO){
status=(*pdset->write_bo)(prec);
return(status);
}
if (prec->simm == YES){
if (prec->simm == menuYesNoYES){
status=dbPutLink(&(prec->siol),DBR_USHORT, &(prec->val),1);
} else {
status=-1;

5
src/rec/eventRecord.c
View File

@@ -32,6 +32,7 @@
#include "errMdef.h"
#include "recSup.h"
#include "recGbl.h"
#include "menuYesNo.h"
#define GEN_SIZE_OFFSET
#include "eventRecord.h"
#undef GEN_SIZE_OFFSET
@@ -171,11 +172,11 @@ static long readValue(eventRecord *prec)
if (status)
return(status);
if (prec->simm == NO){
if (prec->simm == menuYesNoNO){
status=(*pdset->read_event)(prec);
return(status);
}
if (prec->simm == YES){
if (prec->simm == menuYesNoYES){
status=dbGetLink(&(prec->siol),DBR_USHORT,
&(prec->sval),0,0);
if (status==0) {

5
src/rec/histogramRecord.c
View File

@@ -36,6 +36,7 @@
#include "special.h"
#include "recSup.h"
#include "recGbl.h"
#include "menuYesNo.h"
#define GEN_SIZE_OFFSET
#include "histogramRecord.h"
#undef GEN_SIZE_OFFSET
@@ -364,11 +365,11 @@ static long readValue(histogramRecord *prec)
if (status)
return(status);
if (prec->simm == NO){
if (prec->simm == menuYesNoNO){
status=(*pdset->read_histogram)(prec);
return(status);
}
if (prec->simm == YES){
if (prec->simm == menuYesNoYES){
status=dbGetLink(&(prec->siol),DBR_DOUBLE,
&(prec->sval),0,0);

5
src/rec/longinRecord.c
View File

@@ -31,6 +31,7 @@
#include "errMdef.h"
#include "recSup.h"
#include "recGbl.h"
#include "menuYesNo.h"
#define GEN_SIZE_OFFSET
#include "longinRecord.h"
#undef GEN_SIZE_OFFSET
@@ -306,11 +307,11 @@ static long readValue(longinRecord *prec)
if (status)
return(status);
if (prec->simm == NO){
if (prec->simm == menuYesNoNO){
status=(*pdset->read_longin)(prec);
return(status);
}
if (prec->simm == YES){
if (prec->simm == menuYesNoYES){
status=dbGetLink(&(prec->siol),DBR_LONG,
&(prec->sval),0,0);

5
src/rec/longoutRecord.c
View File

@@ -28,6 +28,7 @@
#include "errMdef.h"
#include "recSup.h"
#include "recGbl.h"
#include "menuYesNo.h"
#define GEN_SIZE_OFFSET
#include "longoutRecord.h"
#undef GEN_SIZE_OFFSET
@@ -346,11 +347,11 @@ static long writeValue(longoutRecord *prec)
if (!RTN_SUCCESS(status))
return(status);
if (prec->simm == NO){
if (prec->simm == menuYesNoNO){
status=(*pdset->write_longout)(prec);
return(status);
}
if (prec->simm == YES){
if (prec->simm == menuYesNoYES){
status=dbPutLink(&prec->siol,DBR_LONG,&prec->val,1);
} else {
status=-1;

2
src/rec/mbbiDirectRecord.c
View File

@@ -243,7 +243,7 @@ static long readValue(mbbiDirectRecord *prec)
if (status)
return(status);
if (prec->simm == NO){
if (prec->simm == menuSimmNO){
status=(*pdset->read_mbbi)(prec);
return(status);
}

5
src/rec/mbboDirectRecord.c
View File

@@ -37,6 +37,7 @@
#undef GEN_SIZE_OFFSET
#include "menuOmsl.h"
#include "menuIvoa.h"
#include "menuYesNo.h"
#include "epicsExport.h"
/* Create RSET - Record Support Entry Table*/
@@ -336,11 +337,11 @@ static long writeValue(mbboDirectRecord *prec)
if (status)
return(status);
if (prec->simm == NO){
if (prec->simm == menuYesNoNO){
status=(*pdset->write_mbbo)(prec);
return(status);
}
if (prec->simm == YES){
if (prec->simm == menuYesNoYES){
status=dbPutLink(&prec->siol,DBR_USHORT,
&prec->val,1);
} else {

5
src/rec/mbboRecord.c
View File

@@ -38,6 +38,7 @@
#undef GEN_SIZE_OFFSET
#include "menuOmsl.h"
#include "menuIvoa.h"
#include "menuYesNo.h"
#include "epicsExport.h"
/* Create RSET - Record Support Entry Table*/
@@ -437,11 +438,11 @@ static long writeValue(mbboRecord *prec)
if (status)
return(status);
if (prec->simm == NO){
if (prec->simm == menuYesNoNO){
status=(*pdset->write_mbbo)(prec);
return(status);
}
if (prec->simm == YES){
if (prec->simm == menuYesNoYES){
status=dbPutLink(&prec->siol,DBR_USHORT, &prec->val,1);
} else {
status=-1;

5
src/rec/stringinRecord.c
View File

@@ -32,6 +32,7 @@
#include "errMdef.h"
#include "recSup.h"
#include "recGbl.h"
#include "menuYesNo.h"
#define GEN_SIZE_OFFSET
#include "stringinRecord.h"
#undef GEN_SIZE_OFFSET
@@ -183,11 +184,11 @@ static long readValue(stringinRecord *prec)
if (status)
return(status);
if (prec->simm == NO){
if (prec->simm == menuYesNoNO){
status=(*pdset->read_stringin)(prec);
return(status);
}
if (prec->simm == YES){
if (prec->simm == menuYesNoYES){
status=dbGetLink(&(prec->siol),DBR_STRING,
prec->sval,0,0);
if (status==0) {

5
src/rec/stringoutRecord.c
View File

@@ -37,6 +37,7 @@
#undef GEN_SIZE_OFFSET
#include "menuOmsl.h"
#include "menuIvoa.h"
#include "menuYesNo.h"
#include "epicsExport.h"
/* Create RSET - Record Support Entry Table*/
@@ -213,11 +214,11 @@ static long writeValue(stringoutRecord *prec)
if (status)
return(status);
if (prec->simm == NO){
if (prec->simm == menuYesNoNO){
status=(*pdset->write_stringout)(prec);
return(status);
}
if (prec->simm == YES){
if (prec->simm == menuYesNoYES){
status=dbPutLink(&prec->siol,DBR_STRING,
prec->val,1);
} else {

6
src/rec/waveformRecord.c
View File

@@ -33,11 +33,13 @@
#include "recSup.h"
#include "recGbl.h"
#include "cantProceed.h"
#include "menuYesNo.h"
#define GEN_SIZE_OFFSET
#include "waveformRecord.h"
#undef GEN_SIZE_OFFSET
#include "epicsExport.h"
#include "epicsString.h"
/* Create RSET - Record Support Entry Table*/
#define report NULL
#define initialize NULL
@@ -288,11 +290,11 @@ static long readValue(waveformRecord *prec)
if (status)
return status;
if (prec->simm == NO){
if (prec->simm == menuYesNoNO){
return (*pdset->read_wf)(prec);
}
if (prec->simm == YES){
if (prec->simm == menuYesNoYES){
long nRequest = prec->nelm;
status = dbGetLink(&(prec->siol), prec->ftvl, prec->bptr, 0, &nRequest);
/* nord set only for db links: needed for old db_access */