diff --git a/src/rec/recLongout.c b/src/rec/recLongout.c index 832735ec2..7903c7de8 100644 --- a/src/rec/recLongout.c +++ b/src/rec/recLongout.c @@ -31,6 +31,7 @@ * ----------------- * .01 11-11-91 jba Moved set and reset of alarm stat and sevr to macros * .02 02-05-92 jba Changed function arguments from paddr to precord + * .03 02-28-92 jba ANSI C changes */ @@ -38,6 +39,7 @@ #include #include #include +#include #include #include @@ -51,21 +53,21 @@ /* Create RSET - Record Support Entry Table*/ #define report NULL #define initialize NULL -long init_record(); -long process(); +static long init_record(); +static long process(); #define special NULL -long get_value(); +static long get_value(); #define cvt_dbaddr NULL #define get_array_info NULL #define put_array_info NULL -long get_units(); +static long get_units(); #define get_precision NULL #define get_enum_str NULL #define get_enum_strs NULL #define put_enum_str NULL -long get_graphic_double(); -long get_control_double(); -long get_alarm_double(); +static long get_graphic_double(); +static long get_control_double(); +static long get_alarm_double(); struct rset longoutRSET={ RSETNUMBER, @@ -200,8 +202,10 @@ static long get_graphic_double(paddr,pgd) { struct longoutRecord *plongout=(struct longoutRecord *)paddr->precord; - pgd->upper_disp_limit = plongout->hopr; - pgd->lower_disp_limit = plongout->lopr; + if(paddr->pfield==(void *)plongout->val){ + pgd->upper_disp_limit = plongout->hopr; + pgd->lower_disp_limit = plongout->lopr; + } else recGblGetGraphicDouble(paddr,pgd); return(0); } @@ -211,8 +215,10 @@ static long get_control_double(paddr,pcd) { struct longoutRecord *plongout=(struct longoutRecord *)paddr->precord; - pcd->upper_ctrl_limit = plongout->hopr; - pcd->lower_ctrl_limit = plongout->lopr; + if(paddr->pfield==(void *)plongout->val){ + pcd->upper_ctrl_limit = plongout->hopr; + pcd->lower_ctrl_limit = plongout->lopr; + } else recGblGetControlDouble(paddr,pcd); return(0); } static long get_alarm_double(paddr,pad) diff --git a/src/rec/recPulseCounter.c b/src/rec/recPulseCounter.c index 74793fe8e..4cfc4dd97 100644 --- a/src/rec/recPulseCounter.c +++ b/src/rec/recPulseCounter.c @@ -31,6 +31,7 @@ * ----------------- * .01 11-11-91 jba Moved set and reset of alarm stat and sevr to macros * .02 02-05-92 jba Changed function arguments from paddr to precord + * .03 02-28-92 jba ANSI C changes */ #include @@ -51,10 +52,10 @@ /* Create RSET - Record Support Entry Table*/ #define report NULL #define initialize NULL -long init_record(); -long process(); +static long init_record(); +static long process(); #define special NULL -long get_value(); +static long get_value(); #define cvt_dbaddr NULL #define get_array_info NULL #define put_array_info NULL @@ -222,22 +223,12 @@ static long get_graphic_double(paddr,pgd) struct dbAddr *paddr; struct dbr_grDouble *pgd; { - struct pulseCounterRecord *ppc=(struct pulseCounterRecord *)paddr->precord; - struct fldDes *pfldDes=(struct fldDes *)(paddr->pfldDes); - - if(((void *)(paddr->pfield))==((void *)&(ppc->clks))){ - pgd->upper_disp_limit = (double)pfldDes->range2.value.short_value; - pgd->lower_disp_limit = (double)pfldDes->range1.value.short_value; - return(0); - } - if(((void *)(paddr->pfield))==((void *)&(ppc->gate))){ - pgd->upper_disp_limit = (double)pfldDes->range2.value.short_value; - pgd->lower_disp_limit = (double)pfldDes->range1.value.short_value; - return(0); - } - pgd->upper_disp_limit = ppc->hopr; - pgd->lower_disp_limit = ppc->lopr; + struct pulseCounterRecord *ppc=(struct pulseCounterRecord *)paddr->precord; + if(paddr->pfield==(void *)&ppc->val){ + pgd->upper_disp_limit = ppc->hopr; + pgd->lower_disp_limit = ppc->lopr; + } else recGblGetGraphicDouble(paddr,pgd); return(0); } @@ -245,22 +236,12 @@ static long get_control_double(paddr,pcd) struct dbAddr *paddr; struct dbr_ctrlDouble *pcd; { - struct pulseCounterRecord *ppc=(struct pulseCounterRecord *)paddr->precord; - struct fldDes *pfldDes=(struct fldDes *)(paddr->pfldDes); - - if(((void *)(paddr->pfield))==((void *)&(ppc->clks))){ - pcd->upper_ctrl_limit = (double)pfldDes->range2.value.short_value; - pcd->lower_ctrl_limit = (double)pfldDes->range1.value.short_value; - return(0); - } - if(((void *)(paddr->pfield))==((void *)&(ppc->gate))){ - pcd->upper_ctrl_limit = (double)pfldDes->range1.value.short_value; - pcd->lower_ctrl_limit = (double)pfldDes->range2.value.short_value; - return(0); - } - pcd->upper_ctrl_limit = ppc->hopr; - pcd->lower_ctrl_limit = ppc->lopr; + struct pulseCounterRecord *ppc=(struct pulseCounterRecord *)paddr->precord; + if(paddr->pfield==(void *)&ppc->val){ + pcd->upper_ctrl_limit = ppc->hopr; + pcd->lower_ctrl_limit = ppc->lopr; + } else recGblGetControlDouble(paddr,pcd); return(0); }