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

Fixed macro name clash.

Browse Source
This commit is contained in:
Ralph Lange
2002-11-07 17:08:30 +00:00
parent 8c936886e8
commit e6501454af
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/db/dbTest.c
View File

@@ -51,8 +51,12 @@ struct msgBuff { /* line output structure */
};
typedef struct msgBuff TAB_BUFFER;
#define MIN(x,y) ((x < y)?x:y)
#define MAX(x,y) ((x > y)?x:y)
#ifndef MIN
# define MIN(x,y) (((x) < (y)) ? (x) : (y))
#endif
#ifndef MAX
# define MAX(x,y) (((x) < (y)) ? (x) : (y))
#endif
/* Local Routines */
static void printDbAddr(long status,DBADDR *paddr);

10
src/rec/calcRecord.c
View File

@@ -82,7 +82,7 @@ static void monitor();
static int fetch_values();
#define ARG_MAX 12
#define NO_OF_INPUTS 12
static long init_record(pcalc,pass)
struct calcRecord *pcalc;
@@ -98,7 +98,7 @@ static long init_record(pcalc,pass)
plink = &pcalc->inpa;
pvalue = &pcalc->a;
for(i=0; i<ARG_MAX; i++, plink++, pvalue++) {
for(i=0; i<NO_OF_INPUTS; i++, plink++, pvalue++) {
if (plink->type == CONSTANT) {
recGblInitConstantLink(plink,DBF_DOUBLE,pvalue);
}
@@ -327,7 +327,7 @@ static void monitor(pcalc)
db_post_events(pcalc,&pcalc->val,monitor_mask);
}
/* check all input fields for changes*/
for(i=0, pnew=&pcalc->a, pprev=&pcalc->la; i<ARG_MAX; i++, pnew++, pprev++) {
for(i=0, pnew=&pcalc->a, pprev=&pcalc->la; i<NO_OF_INPUTS; i++, pnew++, pprev++) {
if((*pnew != *pprev) || (monitor_mask&DBE_ALARM)) {
db_post_events(pcalc,pnew,monitor_mask|DBE_VALUE|DBE_LOG);
*pprev = *pnew;
@@ -344,7 +344,9 @@ struct calcRecord *pcalc;
long status = 0;
int i;
for(i=0, plink=&pcalc->inpa, pvalue=&pcalc->a; i<ARG_MAX; i++, plink++, pvalue++) {
for(i=0, plink=&pcalc->inpa, pvalue=&pcalc->a;
i<NO_OF_INPUTS;
i++, plink++, pvalue++) {
status = dbGetLink(plink,DBR_DOUBLE, pvalue,0,0);

12
src/rec/calcoutRecord.c
View File

@@ -117,7 +117,7 @@ static void checkLinksCallback();
int calcoutRecDebug;
#define ARG_MAX 12
#define NO_OF_INPUTS 12
static long init_record(pcalc,pass)
@@ -144,10 +144,10 @@ static long init_record(pcalc,pass)
plink = &pcalc->inpa;
pvalue = &pcalc->a;
plinkValid = &pcalc->inav;
for(i=0; i<(ARG_MAX+1); i++, plink++, pvalue++, plinkValid++) {
for(i=0; i<(NO_OF_INPUTS+1); i++, plink++, pvalue++, plinkValid++) {
if (plink->type == CONSTANT) {
/* Don't InitConstantLink the .OUT link */
if(i<ARG_MAX) {
if(i<NO_OF_INPUTS) {
recGblInitConstantLink(plink,DBF_DOUBLE,pvalue);
}
*plinkValid = calcoutINAV_CON;
@@ -635,7 +635,7 @@ static void monitor(pcalc)
db_post_events(pcalc,&pcalc->val,monitor_mask);
}
/* check all input fields for changes*/
for(i=0, pnew=&pcalc->a, pprev=&pcalc->la; i<ARG_MAX;
for(i=0, pnew=&pcalc->a, pprev=&pcalc->la; i<NO_OF_INPUTS;
i++, pnew++, pprev++) {
if((*pnew != *pprev) || (monitor_mask&DBE_ALARM)) {
db_post_events(pcalc,pnew,monitor_mask|DBE_VALUE|DBE_LOG);
@@ -658,7 +658,7 @@ static int fetch_values(pcalc)
long status = 0;
int i;
for(i=0, plink=&pcalc->inpa, pvalue=&pcalc->a; i<ARG_MAX;
for(i=0, plink=&pcalc->inpa, pvalue=&pcalc->a; i<NO_OF_INPUTS;
i++, plink++, pvalue++) {
status = dbGetLink(plink,DBR_DOUBLE, pvalue,0,0);
@@ -703,7 +703,7 @@ static void checkLinks(pcalc)
plink = &pcalc->inpa;
plinkValid = &pcalc->inav;
for(i=0; i<ARG_MAX+1; i++, plink++, plinkValid++) {
for(i=0; i<NO_OF_INPUTS+1; i++, plink++, plinkValid++) {
if (plink->type == CA_LINK) {
caLink = 1;
stat = dbCaIsLinkConnected(plink);