*** empty log message ***

diff --git a/hadaq/hwtip.c b/hadaq/hwtip.c
index d19eb4d8d136577f088e428664fbf272fe89e55f..ada253dfa6d4396661fd0baa71e5e51ba32f637d 100644 (file)
--- a/hadaq/hwtip.c
+++ b/hadaq/hwtip.c
@@ -215,15 +215,23 @@ int HwTip_readSubEvt(HwTip * my, void *subEvt)
        size_t size;
        UInt1 trigTag;
 
-       size = berrGetL(my->lvme, my->currAddr);
-       msglog(LOG_DEBUG, "size: 0x%08x\n", size);
+       do {
+         size = berrGetL(my->lvme, my->currAddr);
+         msglog(LOG_DEBUG, "size: 0x%08x\n", size);
+       } while(size > 2250);
 
+#if 0
        if (size > 2400) {
                msglog(LOG_ERR, "size too large: 0x%08x on 0x%08x\n", size, my->currAddr);
        }
+#endif
 
        /* copy one sub evt from RC to memory */
-       for (firstAddr = my->currAddr; my->currAddr - firstAddr < size; my->currAddr += 4) {
+       firstAddr = my->currAddr;
+       /* take the size from above to use the check */
+       *data++ = size;
+       my->currAddr += 4;
+       for (; my->currAddr - firstAddr < size; my->currAddr += 4) {
                *data++ = berrGetL(my->lvme, my->currAddr);
        }
 

diff --git a/hadaq/hwtof.c b/hadaq/hwtof.c
index 1815417e68aab9de9dfc8ad6551b5258cf7b6454..faa61d19354f8b44c53dfd717ee999b70a2b6579 100644 (file)
--- a/hadaq/hwtof.c
+++ b/hadaq/hwtof.c
@@ -1,4 +1,4 @@
-static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtof.c,v 1.10 2000-05-09 12:24:22 hades Exp $";
+static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtof.c,v 1.11 2000-06-01 08:39:32 hades Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -45,7 +45,7 @@ Hardware *newHardware(void)
        }
        my = allocMem(sizeof(Hardware));
 
-       my->maxSubEvtSize = SubEvt_hdrSize() + (800 * sizeof(UInt4));
+       my->maxSubEvtSize = SubEvt_hdrSize() + (560 * sizeof(UInt4));
        my->tipToRead = 0;
 
        for (i = 0; i < NTIPS; i++) {