diff --git a/src/rec/recAo.c b/src/rec/recAo.c index 6401bb5ef..84a96d01c 100644 --- a/src/rec/recAo.c +++ b/src/rec/recAo.c @@ -67,7 +67,7 @@ #include /* Create RSET - Record Support Entry Table*/ -long report(); +#define report NULL #define initialize NULL long init_record(); long process(); @@ -124,36 +124,6 @@ void alarm(); void convert(); void monitor(); - -static long report(fp,paddr) - FILE *fp; - struct dbAddr *paddr; -{ - struct aoRecord *pao=(struct aoRecord*)(paddr->precord); - - if(recGblReportDbCommon(fp,paddr)) return(-1); - if(fprintf(fp,"VAL %-12.4G OROC %-12.4G\n",pao->val,pao->oroc)) return(-1); - if(recGblReportLink(fp,"OUT ",&(pao->out))) return(-1); - if(fprintf(fp,"PREC %d\n",pao->prec)) return(-1); - if(recGblReportCvtChoice(fp,"LINR",pao->linr)) return(-1); - if(fprintf(fp,"EGUF %-12.4G EGUL %-12.4G EGU %-8s\n", - pao->eguf,pao->egul,pao->egu)) return(-1); - if(fprintf(fp,"HOPR %-12.4G LOPR %-12.4G\n", - pao->hopr,pao->lopr)) return(-1); - if(recGblReportLink(fp,"FLNK",&(pao->flnk))) return(-1); - if(fprintf(fp,"HIHI %-12.4G HIGH %-12.4G LOW %-12.4G LOLO %-12.4G\n", - pao->hihi,pao->high,pao->low,pao->lolo)) return(-1); - if(recGblReportGblChoice(fp,pao,"HHSV",pao->hhsv)) return(-1); - if(recGblReportGblChoice(fp,pao,"HSV ",pao->hsv)) return(-1); - if(recGblReportGblChoice(fp,pao,"LSV ",pao->lsv)) return(-1); - if(recGblReportGblChoice(fp,pao,"LLSV",pao->llsv)) return(-1); - if(fprintf(fp,"HYST %-12.4G ADEL %-12.4G MDEL %-12.4G ESLO %-12.4G\n", - pao->hyst,pao->adel,pao->mdel,pao->eslo)) return(-1); - if(fprintf(fp,"RVAL 0x%-8X\n", pao->rval)) return(-1); - if(fprintf(fp,"LALM %-12.4G ALST %-12.4G MLST %-12.4G\n", - pao->lalm,pao->alst,pao->mlst)) return(-1); - return(0); -} static long init_record(pao) struct aoRecord *pao; @@ -200,6 +170,7 @@ static long process(paddr) if(pao->pact == FALSE) { convert(pao); if(pao->oraw != pao->oval) status=(*pdset->write_ao)(pao); + else status=0; } else { status=(*pdset->write_ao)(pao); /* write the new value */ pao->pact = TRUE; @@ -216,7 +187,7 @@ static long process(paddr) monitor(pao); /* process the forward scan link record */ - if (pao->flnk.type==DB_LINK) dbScanPassive(&pao->flnk.value.db_link.pdbAddr); + if (pao->flnk.type==DB_LINK) dbScanPassive(pao->flnk.value.db_link.pdbAddr); pao->pact=FALSE; return(status); diff --git a/src/rec/recBi.c b/src/rec/recBi.c index 761db4b8d..6ca679293 100644 --- a/src/rec/recBi.c +++ b/src/rec/recBi.c @@ -60,7 +60,7 @@ #include #include /* Create RSET - Record Support Entry Table*/ -long report(); +#define report NULL #define initialize NULL long init_record(); long process(); @@ -103,22 +103,6 @@ struct bidset { /* binary input dset */ void alarm(); void monitor(); -static long report(fp,paddr) - FILE *fp; - struct dbAddr *paddr; -{ - struct biRecord *pbi=(struct biRecord*)(paddr->precord); - - if(recGblReportDbCommon(fp,paddr)) return(-1); - if(fprintf(fp,"VAL %d\n",pbi->val)) return(-1); - if(recGblReportLink(fp,"INP ",&(pbi->inp))) return(-1); - if(recGblReportLink(fp,"FLNK",&(pbi->flnk))) return(-1); - if(fprintf(fp,"RVAL 0x%-8X\n", - pbi->rval)) return(-1); - return(0); -} - - static long init_record(pbi) struct biRecord *pbi; { @@ -166,7 +150,7 @@ static long process(paddr) /* check event list */ monitor(pbi); /* process the forward scan link record */ - if (pbi->flnk.type==DB_LINK) dbScanPassive(&pbi->flnk.value.db_link.pdbAddr); + if (pbi->flnk.type==DB_LINK) dbScanPassive(pbi->flnk.value.db_link.pdbAddr); pbi->pact=FALSE; return(status); @@ -288,7 +272,7 @@ static void monitor(pbi) db_post_events(pbi,&pbi->val,monitor_mask); } if(pbi->oraw!=pbi->rval) { - db_post_events(pbi,&pbi->rval,monitor_mask|=DBE_VALUE); + db_post_events(pbi,&pbi->rval,monitor_mask|DBE_VALUE); pbi->oraw = pbi->rval; } return; diff --git a/src/rec/recBo.c b/src/rec/recBo.c index d9b91e976..6619c534e 100644 --- a/src/rec/recBo.c +++ b/src/rec/recBo.c @@ -70,7 +70,7 @@ #include /* Create RSET - Record Support Entry Table*/ -long report(); +#define report NULL #define initialize NULL long init_record(); long process(); @@ -139,21 +139,6 @@ static void myCallback(pcallback) dbScanUnlock(pbo); } -static long report(fp,paddr) - FILE *fp; - struct dbAddr *paddr; -{ - struct boRecord *pbo=(struct boRecord*)(paddr->precord); - - if(recGblReportDbCommon(fp,paddr)) return(-1); - if(fprintf(fp,"VAL %d\n",pbo->val)) return(-1); - if(recGblReportLink(fp,"OUT ",&(pbo->out))) return(-1); - if(recGblReportLink(fp,"FLNK",&(pbo->flnk))) return(-1); - if(fprintf(fp,"RVAL 0x%-8X\n", - pbo->rval)) return(-1); - return(0); -} - static long init_record(pbo) struct boRecord *pbo; { @@ -239,7 +224,7 @@ static long process(paddr) /* check event list */ monitor(pbo); /* process the forward scan link record */ - if (pbo->flnk.type==DB_LINK) dbScanPassive(&pbo->flnk.value.db_link.pdbAddr); + if (pbo->flnk.type==DB_LINK) dbScanPassive(pbo->flnk.value.db_link.pdbAddr); pbo->pact=FALSE; return(status); @@ -361,11 +346,11 @@ static void monitor(pbo) db_post_events(pbo,&pbo->val,monitor_mask); } if(pbo->oraw!=pbo->rval) { - db_post_events(pbo,&pbo->rval,monitor_mask|=DBE_VALUE); + db_post_events(pbo,&pbo->rval,monitor_mask|DBE_VALUE); pbo->oraw = pbo->rval; } if(pbo->orbv!=pbo->rbv) { - db_post_events(pbo,&pbo->rbv,monitor_mask|=DBE_VALUE); + db_post_events(pbo,&pbo->rbv,monitor_mask|DBE_VALUE); pbo->orbv = pbo->rbv; } return; diff --git a/src/rec/recCalc.c b/src/rec/recCalc.c index c4f11b073..ef7eda6eb 100644 --- a/src/rec/recCalc.c +++ b/src/rec/recCalc.c @@ -74,7 +74,7 @@ #include /* Create RSET - Record Support Entry Table*/ -long report(); +#define report NULL #define initialize NULL long init_record(); long process(); @@ -114,44 +114,6 @@ int do_calc(); long postfix(); void fetch_values(); -static long report(fp,paddr) - FILE *fp; - struct dbAddr *paddr; -{ - struct calcRecord *pcalc=(struct calcRecord*)(paddr->precord); - - if(recGblReportDbCommon(fp,paddr)) return(-1); - if(fprintf(fp,"VAL %-12.4G\n",pcalc->val)) return(-1); - if(recGblReportLink(fp,"INPA ",&(pcalc->inpa))) return(-1); - if(recGblReportLink(fp,"INPB ",&(pcalc->inpb))) return(-1); - if(recGblReportLink(fp,"INPC ",&(pcalc->inpc))) return(-1); - if(recGblReportLink(fp,"INPD ",&(pcalc->inpd))) return(-1); - if(recGblReportLink(fp,"INPE ",&(pcalc->inpe))) return(-1); - if(recGblReportLink(fp,"INPF ",&(pcalc->inpf))) return(-1); - if(recGblReportLink(fp,"FLNK",&(pcalc->flnk))) return(-1); - if(fprintf(fp,"A %-12.4G\n",pcalc->a)) return(-1); - if(fprintf(fp,"B %-12.4G\n",pcalc->b)) return(-1); - if(fprintf(fp,"C %-12.4G\n",pcalc->c)) return(-1); - if(fprintf(fp,"D %-12.4G\n",pcalc->d)) return(-1); - if(fprintf(fp,"E %-12.4G\n",pcalc->e)) return(-1); - if(fprintf(fp,"F %-12.4G\n",pcalc->f)) return(-1); - if(fprintf(fp,"PREC %d EGU %-8s\n",pcalc->prec,pcalc->egu)) return(-1); - if(fprintf(fp,"HOPR %-12.4G LOPR %-12.4G\n", - pcalc->hopr,pcalc->lopr)) return(-1); - if(fprintf(fp,"HIHI %-12.4G HIGH %-12.4G LOW %-12.4G LOLO %-12.4G\n", - pcalc->hihi,pcalc->high,pcalc->low,pcalc->lolo)) return(-1); - if(recGblReportGblChoice(fp,pcalc,"HHSV",pcalc->hhsv)) return(-1); - if(recGblReportGblChoice(fp,pcalc,"HSV ",pcalc->hsv)) return(-1); - if(recGblReportGblChoice(fp,pcalc,"LSV ",pcalc->lsv)) return(-1); - if(recGblReportGblChoice(fp,pcalc,"LLSV",pcalc->llsv)) return(-1); - if(fprintf(fp,"HYST %-12.4G ADEL %-12.4G MDEL %-12.4G\n", - pcalc->hyst,pcalc->adel,pcalc->mdel)) return(-1); - if(fprintf(fp,"LALM %-12.4G ALST %-12.4G MLST %-12.4G\n", - pcalc->lalm,pcalc->alst,pcalc->mlst)) return(-1); - if(fprintf(fp,"CALC %s\n",pcalc->calc)) return(-1); - return(0); -} - static long init_record(pcalc) struct calcRecord *pcalc; { @@ -273,7 +235,7 @@ static long process(paddr) /* check event list */ monitor(pcalc); /* process the forward scan link record */ - if (pcalc->flnk.type==DB_LINK) dbScanPassive(&pcalc->flnk.value.db_link.pdbAddr); + if (pcalc->flnk.type==DB_LINK) dbScanPassive(pcalc->flnk.value.db_link.pdbAddr); pcalc->pact = FALSE; return(0); } @@ -391,7 +353,7 @@ static void monitor(pcalc) /* check all input fields for changes*/ for(i=0, pnew=&pcalc->a, pprev=&pcalc->la; i<6; i++, pnew++, pprev++) { if(*pnew != *pprev) { - db_post_events(pcalc,pnew,monitor_mask|=DBE_VALUE); + db_post_events(pcalc,pnew,monitor_mask|DBE_VALUE); *pprev = *pnew; } } diff --git a/src/rec/recCompress.c b/src/rec/recCompress.c index 182201d79..0ea58e126 100644 --- a/src/rec/recCompress.c +++ b/src/rec/recCompress.c @@ -66,7 +66,7 @@ #include /* Create RSET - Record Support Entry Table*/ -long report(); +#define report NULL #define initialize NULL long init_record(); long process(); @@ -111,16 +111,6 @@ void put_value(); int compress_array(); int compress_value(); -static long report(fp,paddr) - FILE *fp; - struct dbAddr *paddr; -{ - struct compressRecord *pcompress=(struct compressRecord*)(paddr->precord); - - if(recGblReportDbCommon(fp,paddr)) return(-1); - return(0); -} - static long init_record(pcompress) struct compressRecord *pcompress; { @@ -306,7 +296,7 @@ static long process(paddr) if(status!=1) { monitor(pcompress); /* process the forward scan link record */ - if (pcompress->flnk.type==DB_LINK) dbScanPassive(&pcompress->flnk.value.db_link.pdbAddr); + if (pcompress->flnk.type==DB_LINK) dbScanPassive(pcompress->flnk.value.db_link.pdbAddr); } pcompress->pact=FALSE; diff --git a/src/rec/recFanout.c b/src/rec/recFanout.c index de165da54..b3e1cb140 100644 --- a/src/rec/recFanout.c +++ b/src/rec/recFanout.c @@ -52,7 +52,7 @@ #include /* Create RSET - Record Support Entry Table*/ -long report(); +#define report NULL #define initialize NULL #define init_record NULL long process(); @@ -86,22 +86,6 @@ struct rset fanoutRSET={ get_control_double, get_enum_strs }; -static long report(fp,paddr) - FILE *fp; - struct dbAddr *paddr; -{ - struct fanoutRecord *pfanout=(struct fanoutRecord*)(paddr->precord); - - if(recGblReportDbCommon(fp,paddr)) return(-1); - if(recGblReportLink(fp,"LNK1",&(pfanout->lnk1))) return(-1); - if(recGblReportLink(fp,"LNK2",&(pfanout->lnk2))) return(-1); - if(recGblReportLink(fp,"LNK3",&(pfanout->lnk3))) return(-1); - if(recGblReportLink(fp,"LNK4",&(pfanout->lnk4))) return(-1); - if(recGblReportLink(fp,"LNK5",&(pfanout->lnk5))) return(-1); - if(recGblReportLink(fp,"LNK6",&(pfanout->lnk6))) return(-1); - return(0); -} - static long process(paddr) struct dbAddr *paddr; { diff --git a/src/rec/recMbbi.c b/src/rec/recMbbi.c index 8b1ccc85f..2f476f960 100644 --- a/src/rec/recMbbi.c +++ b/src/rec/recMbbi.c @@ -63,7 +63,7 @@ #include #include /* Create RSET - Record Support Entry Table*/ -long report(); +#define report NULL #define initialize NULL long init_record(); long process(); @@ -106,20 +106,6 @@ struct mbbidset { /* multi bit binary input dset */ void alarm(); void monitor(); -static long report(fp,paddr) - FILE *fp; - struct dbAddr *paddr; -{ - struct mbbiRecord *pmbbi=(struct mbbiRecord*)(paddr->precord); - - if(recGblReportDbCommon(fp,paddr)) return(-1); - if(fprintf(fp,"VAL %d\n",pmbbi->val)) return(-1); - if(recGblReportLink(fp,"INP ",&(pmbbi->inp))) return(-1); - if(recGblReportLink(fp,"FLNK",&(pmbbi->flnk))) return(-1); - if(fprintf(fp,"RVAL 0x%-8X\n",pmbbi->rval)) return(-1); - return(0); -} - static void init_common(pmbbi) struct mbbiRecord *pmbbi; { @@ -269,7 +255,7 @@ static long process(paddr) monitor(pmbbi); /* process the forward scan link record */ - if (pmbbi->flnk.type==DB_LINK) dbScanPassive(&pmbbi->flnk.value.db_link.pdbAddr); + if (pmbbi->flnk.type==DB_LINK) dbScanPassive(pmbbi->flnk.value.db_link.pdbAddr); pmbbi->pact=FALSE; return(status); diff --git a/src/rec/recMbbo.c b/src/rec/recMbbo.c index eb2248042..42d842932 100644 --- a/src/rec/recMbbo.c +++ b/src/rec/recMbbo.c @@ -67,7 +67,7 @@ #include /* Create RSET - Record Support Entry Table*/ -long report(); +#define report NULL #define initialize NULL long init_record(); long process(); @@ -114,21 +114,6 @@ struct mbbodset { /* multi bit binary input dset */ void alarm(); void monitor(); -static long report(fp,paddr) - FILE *fp; - struct dbAddr *paddr; -{ - struct mbboRecord *pmbbo=(struct mbboRecord*)(paddr->precord); - - if(recGblReportDbCommon(fp,paddr)) return(-1); - if(fprintf(fp,"VAL %d\n",pmbbo->val)) return(-1); - if(recGblReportLink(fp,"OUT ",&(pmbbo->out))) return(-1); - if(recGblReportLink(fp,"FLNK",&(pmbbo->flnk))) return(-1); - if(fprintf(fp,"RVAL 0x%-8X\n", - pmbbo->rval)) return(-1); - return(0); -} - static void init_common(pmbbo) struct mbboRecord *pmbbo; { @@ -308,7 +293,7 @@ static long process(paddr) /* check event list */ monitor(pmbbo); /* process the forward scan link record */ - if (pmbbo->flnk.type==DB_LINK) dbScanPassive(&pmbbo->flnk.value.db_link.pdbAddr); + if (pmbbo->flnk.type==DB_LINK) dbScanPassive(pmbbo->flnk.value.db_link.pdbAddr); pmbbo->pact=FALSE; return(status); @@ -391,11 +376,11 @@ static void monitor(pmbbo) db_post_events(pmbbo,&pmbbo->val,monitor_mask); } if(pmbbo->oraw!=pmbbo->rval) { - db_post_events(pmbbo,&pmbbo->rval,monitor_mask|=DBE_VALUE); + db_post_events(pmbbo,&pmbbo->rval,monitor_mask|DBE_VALUE); pmbbo->oraw = pmbbo->rval; } if(pmbbo->orbv!=pmbbo->rbv) { - db_post_events(pmbbo,&pmbbo->rbv,monitor_mask|=DBE_VALUE); + db_post_events(pmbbo,&pmbbo->rbv,monitor_mask|DBE_VALUE); pmbbo->orbv = pmbbo->rbv; } return; diff --git a/src/rec/recPermissive.c b/src/rec/recPermissive.c index 50f29c558..a47a66fdd 100644 --- a/src/rec/recPermissive.c +++ b/src/rec/recPermissive.c @@ -45,7 +45,7 @@ #include /* Create RSET - Record Support Entry Table*/ -long report(); +#define report NULL #define initialize NULL #define init_record NULL long process(); @@ -79,19 +79,6 @@ struct rset permissiveRSET={ get_control_double, get_enum_strs }; -static long report(fp,paddr) - FILE *fp; - struct dbAddr *paddr; -{ - struct permissiveRecord *ppermissive=(struct permissiveRecord*)(paddr->precord); - - if(recGblReportDbCommon(fp,paddr)) return(-1); - if(fprintf(fp,"LABL %s\n",ppermissive->labl)) return(-1); - if(fprintf(fp,"VAL %d\n",ppermissive->val)) return(-1); - if(fprintf(fp,"WFLG %d\n",ppermissive->wflg)) return(-1); - return(0); -} - static long get_value(ppermissive,pvdes) struct permissiveRecord *ppermissive; struct valueDes *pvdes; diff --git a/src/rec/recPid.c b/src/rec/recPid.c index 73b83924a..ce6113853 100644 --- a/src/rec/recPid.c +++ b/src/rec/recPid.c @@ -48,7 +48,7 @@ unsigned long tickGet(); #include /* Create RSET - Record Support Entry Table*/ -long report(); +#define report NULL #define initialize NULL long init_record(); long process(); @@ -87,17 +87,6 @@ void alarm(); void monitor(); long do_pid(); - -static long report(fp,paddr) - FILE *fp; - struct dbAddr *paddr; -{ - struct pidRecord *ppid=(struct pidRecord*)(paddr->precord); - - if(recGblReportDbCommon(fp,paddr)) return(-1); - if(fprintf(fp,"VAL %-12.4G\n",ppid->val)) return(-1); - return(0); -} static long init_record(ppid) struct pidRecord *ppid; @@ -190,7 +179,7 @@ static long process(paddr) monitor(ppid); /* process the forward scan link record */ - if (ppid->flnk.type==DB_LINK) dbScanPassive(&ppid->flnk.value.db_link.pdbAddr); + if (ppid->flnk.type==DB_LINK) dbScanPassive(ppid->flnk.value.db_link.pdbAddr); ppid->pact=FALSE; return(status); @@ -304,11 +293,11 @@ static void monitor(ppid) db_post_events(ppid,&ppid->val,monitor_mask); } if(ppid->ocva != ppid->cval) { - db_post_events(ppid,&ppid->cval,DBE_VALUE); + db_post_events(ppid,&ppid->cval,monitor_mask|DBE_VALUE); ppid->ocva = ppid->cval; } if(ppid->oout != ppid->out) { - db_post_events(ppid,&ppid->out,DBE_VALUE); + db_post_events(ppid,&ppid->out,monitor_mask|DBE_VALUE); ppid->oout = ppid->out; } return; diff --git a/src/rec/recSel.c b/src/rec/recSel.c index 8fee0f87a..398a600f3 100644 --- a/src/rec/recSel.c +++ b/src/rec/recSel.c @@ -49,7 +49,7 @@ #include /* Create RSET - Record Support Entry Table*/ -long report(); +#define report NULL #define initialize NULL long init_record(); long process(); @@ -94,17 +94,6 @@ void monitor(); void fetch_values(); int do_sel(); -static long report(fp,paddr) - FILE *fp; - struct dbAddr *paddr; -{ - struct selRecord *psel=(struct selRecord*)(paddr->precord); - - if(recGblReportDbCommon(fp,paddr)) return(-1); - if(fprintf(fp,"VAL %-12.4G\n",psel->val)) return(-1); - return(0); -} - static long init_record(psel) struct selRecord *psel; { @@ -200,7 +189,7 @@ static long process(paddr) monitor(psel); /* process the forward scan link record */ - if (psel->flnk.type==DB_LINK) dbScanPassive(&psel->flnk.value.db_link.pdbAddr); + if (psel->flnk.type==DB_LINK) dbScanPassive(psel->flnk.value.db_link.pdbAddr); psel->pact=FALSE; return(0); @@ -316,7 +305,7 @@ static void monitor(psel) /* check all input fields for changes*/ for(i=0, pnew=&psel->a, pprev=&psel->la; i<6; i++, pnew++, pprev++) { if(*pnew != *pprev) { - db_post_events(psel,pnew,monitor_mask|=DBE_VALUE); + db_post_events(psel,pnew,monitor_mask|DBE_VALUE); *pprev = *pnew; } } diff --git a/src/rec/recState.c b/src/rec/recState.c index 2928496c2..0637ea36f 100644 --- a/src/rec/recState.c +++ b/src/rec/recState.c @@ -46,7 +46,7 @@ #include /* Create RSET - Record Support Entry Table*/ -long report(); +#define report NULL #define initialize NULL #define init_record NULL long process(); @@ -80,17 +80,6 @@ struct rset stateRSET={ get_control_double, get_enum_strs }; -static long report(fp,paddr) - FILE *fp; - struct dbAddr *paddr; -{ - struct stateRecord *pstate=(struct stateRecord*)(paddr->precord); - - if(recGblReportDbCommon(fp,paddr)) return(-1); - if(fprintf(fp,"VAL %s\n",pstate->val)) return(-1); - return(0); -} - static long get_value(pstate,pvdes) struct stateRecord *pstate; struct valueDes *pvdes; @@ -114,7 +103,7 @@ static long process(paddr) strncpy(pstate->oval,pstate->val,sizeof(pstate->val)); } /* process the forward scan link record */ - if (pstate->flnk.type==DB_LINK) dbScanPassive(&pstate->flnk.value.db_link.pdbAddr); + if (pstate->flnk.type==DB_LINK) dbScanPassive(pstate->flnk.value.db_link.pdbAddr); pstate->pact=FALSE; return(0); } diff --git a/src/rec/recSub.c b/src/rec/recSub.c index eef287fc9..d1a8cab08 100644 --- a/src/rec/recSub.c +++ b/src/rec/recSub.c @@ -49,7 +49,7 @@ #include /* Create RSET - Record Support Entry Table*/ -long report(); +#define report NULL #define initialize NULL long init_record(); long process(); @@ -88,43 +88,6 @@ void monitor(); long do_sub(); void fetch_values(); -static long report(fp,paddr) - FILE *fp; - struct dbAddr *paddr; -{ - struct subRecord *psub=(struct subRecord*)(paddr->precord); - - if(recGblReportDbCommon(fp,paddr)) return(-1); - if(fprintf(fp,"VAL %-12.4G\n",psub->val)) return(-1); - if(recGblReportLink(fp,"INPA ",&(psub->inpa))) return(-1); - if(recGblReportLink(fp,"INPB ",&(psub->inpb))) return(-1); - if(recGblReportLink(fp,"INPC ",&(psub->inpc))) return(-1); - if(recGblReportLink(fp,"INPD ",&(psub->inpd))) return(-1); - if(recGblReportLink(fp,"INPE ",&(psub->inpe))) return(-1); - if(recGblReportLink(fp,"INPF ",&(psub->inpf))) return(-1); - if(recGblReportLink(fp,"FLNK",&(psub->flnk))) return(-1); - if(fprintf(fp,"A %-12.4G\n",psub->a)) return(-1); - if(fprintf(fp,"B %-12.4G\n",psub->b)) return(-1); - if(fprintf(fp,"C %-12.4G\n",psub->c)) return(-1); - if(fprintf(fp,"D %-12.4G\n",psub->d)) return(-1); - if(fprintf(fp,"E %-12.4G\n",psub->e)) return(-1); - if(fprintf(fp,"F %-12.4G\n",psub->f)) return(-1); - if(fprintf(fp,"PREC %d EGU %-8s\n",psub->prec,psub->egu)) return(-1); - if(fprintf(fp,"HOPR %-12.4G LOPR %-12.4G\n", - psub->hopr,psub->lopr)) return(-1); - if(fprintf(fp,"HIHI %-12.4G HIGH %-12.4G LOW %-12.4G LOLO %-12.4G\n", - psub->hihi,psub->high,psub->low,psub->lolo)) return(-1); - if(recGblReportGblChoice(fp,psub,"HHSV",psub->hhsv)) return(-1); - if(recGblReportGblChoice(fp,psub,"HSV ",psub->hsv)) return(-1); - if(recGblReportGblChoice(fp,psub,"LSV ",psub->lsv)) return(-1); - if(recGblReportGblChoice(fp,psub,"LLSV",psub->llsv)) return(-1); - if(fprintf(fp,"HYST %-12.4G ADEL %-12.4G MDEL %-12.4G\n", - psub->hyst,psub->adel,psub->mdel)) return(-1); - if(fprintf(fp,"LALM %-12.4G ALST %-12.4G MLST %-12.4G\n", - psub->lalm,psub->alst,psub->mlst)) return(-1); - return(0); -} - static long init_record(psub) struct subRecord *psub; { @@ -249,7 +212,7 @@ static long process(paddr) /* check event list */ monitor(psub); /* process the forward scan link record */ - if (psub->flnk.type==DB_LINK) dbScanPassive(&psub->flnk.value.db_link.pdbAddr); + if (psub->flnk.type==DB_LINK) dbScanPassive(psub->flnk.value.db_link.pdbAddr); psub->pact = FALSE; return(0); } @@ -365,7 +328,7 @@ static void monitor(psub) /* check all input fields for changes*/ for(i=0, pnew=&psub->a, pprev=&psub->la; i<6; i++, pnew++, pprev++) { if(*pnew != *pprev) { - db_post_events(psub,pnew,monitor_mask|=DBE_VALUE); + db_post_events(psub,pnew,monitor_mask|DBE_VALUE); *pprev = *pnew; } } diff --git a/src/rec/recTimer.c b/src/rec/recTimer.c index ae34c2472..53fa47e06 100644 --- a/src/rec/recTimer.c +++ b/src/rec/recTimer.c @@ -57,7 +57,7 @@ #include /* Create RSET - Record Support Entry Table*/ -long report(); +#define report NULL #define initialize NULL long init_record(); long process(); @@ -103,17 +103,6 @@ void read_timer(); void convert_timer(); void write_timer(); -static long report(fp,paddr) - FILE *fp; - struct dbAddr *paddr; -{ - struct timerRecord *ptimer=(struct timerRecord*)(paddr->precord); - - if(recGblReportDbCommon(fp,paddr)) return(-1); - if(fprintf(fp,"VAL %-12.4G\n",ptimer->val)) return(-1); - return(0); -} - static long init_record(ptimer) struct timerRecord *ptimer; { @@ -146,7 +135,7 @@ static long process(paddr) /* check event list */ monitor(ptimer); /* process the forward scan link record */ - if (ptimer->flnk.type==DB_LINK) dbScanPassive(&ptimer->flnk.value.db_link.pdbAddr); + if (ptimer->flnk.type==DB_LINK) dbScanPassive(ptimer->flnk.value.db_link.pdbAddr); ptimer->pact=FALSE; return(0); diff --git a/src/rec/recWaveform.c b/src/rec/recWaveform.c index 9b0a6d90d..18b14eff7 100644 --- a/src/rec/recWaveform.c +++ b/src/rec/recWaveform.c @@ -63,7 +63,7 @@ #include /* Create RSET - Record Support Entry Table*/ -long report(); +#define report NULL #define initialize NULL long init_record(); long process(); @@ -110,16 +110,6 @@ struct wfdset { /* waveform dset */ static int sizeofTypes[] = {0,1,1,2,2,4,4,4,8,2}; void monitor(); - -static long report(fp,paddr) - FILE *fp; - struct dbAddr *paddr; -{ - struct waveformRecord *pwf=(struct waveformRecord*)(paddr->precord); - - if(recGblReportDbCommon(fp,paddr)) return(-1); - return(0); -} static long init_record(pwf) struct waveformRecord *pwf; @@ -269,7 +259,7 @@ static long process(paddr) monitor(pwf); /* process the forward scan link record */ - if (pwf->flnk.type==DB_LINK) dbScanPassive(&pwf->flnk.value.db_link.pdbAddr); + if (pwf->flnk.type==DB_LINK) dbScanPassive(pwf->flnk.value.db_link.pdbAddr); pwf->pact=FALSE; return(0);