encorporate latest SAFE (hop[efully) changes on 09JUL99

This commit is contained in:
Marty Kraimer
1999-07-09 14:04:38 +00:00
parent 41228df369
commit 446621f87a
43 changed files with 460 additions and 445 deletions
+3
View File
@@ -219,13 +219,16 @@ long ErRegisterErrorHandler(int Card, ERROR_FUNC func)
******************************************************************************/
long ErGetTicks(int Card, unsigned long *Ticks)
{
int key;
if (ErHaveReceiver(Card) < 0)
return(-1);
/* BUG -- Do we read the HI first or the low? */
key = intLock();
*Ticks = ErLink[Card].pEr->EventCounterLo;
*Ticks += ErLink[Card].pEr->EventCounterHi << 16;
intUnlock(key);
return(0);
}