diff --git a/src/rec/recAai.c b/src/rec/recAai.c index 4e2ddb59e..66981ebe1 100644 --- a/src/rec/recAai.c +++ b/src/rec/recAai.c @@ -109,8 +109,6 @@ static int sizeofTypes[] = {0,1,1,2,2,4,4,4,8,2}; static void monitor(); static long readValue(); -/*Following from timing system */ -extern unsigned int gts_trigger_counter; static long init_record(paai,pass) @@ -187,22 +185,16 @@ static long process(paai) recGblRecordError(S_dev_missingSup,(void *)paai,"read_aai"); return(S_dev_missingSup); } - /* event throttling */ - if (paai->scan == SCAN_IO_EVENT){ - if ((paai->evnt != 0) && (gts_trigger_counter != 0)){ - if ((gts_trigger_counter % paai->evnt) != 0){ - status=readValue(paai); - return(0); - } - } - } if ( pact ) return(0); status=readValue(paai); /* read the new value */ + /* check if device support set pact */ + if ( !pact && paai->pact ) return(0); + paai->pact = TRUE; paai->udf=FALSE; - tsLocalTime(&paai->time); + recGblGetTimeStamp(paai); monitor(paai); /* process the forward scan link record */ @@ -328,8 +320,8 @@ static long readValue(paai) if (paai->pact == TRUE){ - /* no asyn allowed, pact true means do not process */ - return(0); + status=(*pdset->read_aai)(paai); + return(status); } status=recGblGetLinkValue(&(paai->siml), diff --git a/src/rec/recAao.c b/src/rec/recAao.c index 9701d9502..600e6074a 100644 --- a/src/rec/recAao.c +++ b/src/rec/recAao.c @@ -109,8 +109,6 @@ static int sizeofTypes[] = {0,1,1,2,2,4,4,4,8,2}; static void monitor(); static long writeValue(); -/*Following from timing system */ -extern unsigned int gts_trigger_counter; static long init_record(paao,pass) @@ -187,22 +185,13 @@ static long process(paao) recGblRecordError(S_dev_missingSup,(void *)paao,"write_aao"); return(S_dev_missingSup); } - /* event throttling */ - if (paao->scan == SCAN_IO_EVENT){ - if ((paao->evnt != 0) && (gts_trigger_counter != 0)){ - if ((gts_trigger_counter % paao->evnt) != 0){ - status=writeValue(paao); - return(0); - } - } - } if ( pact ) return(0); status=writeValue(paao); /* write the data */ paao->udf=FALSE; - tsLocalTime(&paao->time); + recGblGetTimeStamp(paao); monitor(paao); /* process the forward scan link record */ diff --git a/src/rec/recDfanout.c b/src/rec/recDfanout.c index 6bdefc7d8..c3c28d02e 100644 --- a/src/rec/recDfanout.c +++ b/src/rec/recDfanout.c @@ -213,7 +213,7 @@ static long process(pdfanout) if ( !pact && pdfanout->pact ) return(0); pdfanout->pact = TRUE; - tsLocalTime(&pdfanout->time); + recGblGetTimeStamp(pdfanout); /* check for alarms */ alarm(pdfanout); diff --git a/src/rec/recMbbiDirect.c b/src/rec/recMbbiDirect.c index d05e86a3d..3bd1fef64 100644 --- a/src/rec/recMbbiDirect.c +++ b/src/rec/recMbbiDirect.c @@ -212,7 +212,7 @@ static long process(pmbbiDirect) if ( !pact && pmbbiDirect->pact ) return(0); pmbbiDirect->pact = TRUE; - tsLocalTime(&pmbbiDirect->time); + recGblGetTimeStamp(pmbbiDirect); if(status==0) { /* convert the value */ unsigned long rval = pmbbiDirect->rval; diff --git a/src/rec/recMbboDirect.c b/src/rec/recMbboDirect.c index e30cd9d38..7772fd208 100644 --- a/src/rec/recMbboDirect.c +++ b/src/rec/recMbboDirect.c @@ -208,7 +208,7 @@ static long process(pmbboDirect) if ( !pact && pmbboDirect->pact ) return(0); pmbboDirect->pact = TRUE; - tsLocalTime(&pmbboDirect->time); + recGblGetTimeStamp(pmbboDirect); /* check event list */ monitor(pmbboDirect); /* process the forward scan link record */ diff --git a/src/rec/recSubArray.c b/src/rec/recSubArray.c index 5e098df7b..e118f62d0 100644 --- a/src/rec/recSubArray.c +++ b/src/rec/recSubArray.c @@ -175,7 +175,7 @@ static long process(psa) psa->pact = TRUE; psa->udf=FALSE; - tsLocalTime(&psa->time); + recGblGetTimeStamp(psa); monitor(psa); /* process the forward scan link record */