From 5c7d9e750f10ac64d4438a448c12669afd860690 Mon Sep 17 00:00:00 2001 From: hadaq Date: Mon, 8 Apr 2002 14:46:07 +0000 Subject: [PATCH] cleaner, shorter, one cycle less, from wk, ocmmitted by mt --- hadaq/hwrace.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hadaq/hwrace.c b/hadaq/hwrace.c index 79f9373..422c510 100644 --- a/hadaq/hwrace.c +++ b/hadaq/hwrace.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrace.c,v 6.15 2001-11-18 11:56:21 hadaq Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrace.c,v 6.16 2002-04-08 14:46:07 hadaq Exp $"; #define _POSIX_C_SOURCE 199309L @@ -121,13 +121,15 @@ int HwRace_isEmpty(HwRace *my) int HwRace_readSubEvt(HwRace *my, void *subEvt) { uint32_t *data = (uint32_t *) subEvt; - int firstAddr; + int lastAddr; int size; size = Rc_readMem(my->rc, my->currAddr); + *data++ = size; + lastAddr = my->currAddr + size; /* copy one sub evt from RC to memory */ - for (firstAddr = my->currAddr; my->currAddr - firstAddr < size; my->currAddr += 4) { + while ((my->currAddr+= 4) < lastAddr) { *data++ = Rc_readMem(my->rc, my->currAddr); } -- 2.43.0