*** empty log message ***

diff --git a/hadaq/hwtof.c b/hadaq/hwtof.c
index be1d0cf920668d7e8c910bcf148a86e4614124c7..c02c4bd2faa7a27f8caccd8cdd5cfb23d275ba46 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.4 1999-09-02 11:19:15 hades Exp $";
+static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtof.c,v 1.5 1999-09-02 12:38:03 hades Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -121,6 +121,9 @@ void Hardware_waitForTrigger(const Hardware *my, void *subEvt)
        SubEvt_setDecoding(subEvt, SubEvtDecoding_32bitData);
        SubEvt_setTrigNr(subEvt, trigNr << 24 | trigTag);
        SubEvt_setId(subEvt, SubEvtId_tofTest);
+
+       trigTag++;
+       trigNr++;
 }
 
 void Hardware_readout(const Hardware *my, void *subEvt)

diff --git a/hadaq/hwv775.c b/hadaq/hwv775.c
index 88524e7bdc6969304c5e05218301708074983330..374a3644ff694b7b7a500fb0126f0cd1ef161d07 100644 (file)
--- a/hadaq/hwv775.c
+++ b/hadaq/hwv775.c
@@ -1,4 +1,4 @@
-static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwv775.c,v 1.5 1999-09-02 11:19:15 hades Exp $";
+static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwv775.c,v 1.6 1999-09-02 12:38:03 hades Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -65,7 +65,6 @@ int HwV775_isEmpty(HwV775 *my)
 int HwV775_readData(HwV775 *my, void *subEvt)
 {
        UInt4 *data = SubEvt_end(subEvt);
-       UInt4 *first = data;
        UInt4 hdr;
        UInt4 eob;
        int nWords;
@@ -83,6 +82,7 @@ int HwV775_readData(HwV775 *my, void *subEvt)
        while (--nWords >= 0) {
                *data++ = LVme_getL(my->lvme, V775_OUT_BUF);
        }
+
        *data++ = eob = LVme_getL(my->lvme, V775_OUT_BUF);
        if ((eob & 0x07000000) != 0x04000000) {
                msglog(LOG_EMERG, "V775 Last word not eob: 0x%08x\n", eob);
@@ -95,6 +95,6 @@ int HwV775_readData(HwV775 *my, void *subEvt)
                msglog(LOG_EMERG, "%s trigNr mismatch: 0x%08x != 0x%02x \n",
                           my->name, SubEvt_trigNr(subEvt), trigTag);
        }
-       SubEvt_setSize(subEvt, SubEvt_size(subEvt) + (char *) data - (char *) first);
+       SubEvt_setSize(subEvt, (char *) data - (char *) subevt);
        return 0;
 }

diff --git a/hadaq/hwv878.c b/hadaq/hwv878.c
index 49b0d639eab4f58c73145ad12279ac3736556bf2..d3af519f76e82961a94d4dfcdbc8a09bc152b24d 100644 (file)
--- a/hadaq/hwv878.c
+++ b/hadaq/hwv878.c
@@ -1,4 +1,4 @@
-static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwv878.c,v 1.3 1999-09-02 11:19:15 hades Exp $";
+static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwv878.c,v 1.4 1999-09-02 12:38:03 hades Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -64,7 +64,6 @@ int HwV878_isEmpty(HwV878 *my)
 int HwV878_readData(HwV878 *my, void *subEvt)
 {
        UInt4 *data = SubEvt_end(subEvt);
-       UInt4 *first = data;
        UInt4 hdr;
        UInt4 eob;
        int nWords;
@@ -82,6 +81,7 @@ int HwV878_readData(HwV878 *my, void *subEvt)
        while (--nWords >= 0) {
                *data++ = LVme_getL(my->lvme, V878_OUT_BUF);
        }
+
        *data++ = eob = LVme_getL(my->lvme, V878_OUT_BUF);
        if ((eob & 0x07000000) != 0x04000000) {
                msglog(LOG_EMERG, "V878 Last word not eob: 0x%08x\n", eob);
@@ -94,6 +94,6 @@ int HwV878_readData(HwV878 *my, void *subEvt)
                msglog(LOG_EMERG, "%s trigNr mismatch: 0x%08x != 0x%02x \n",
                           my->name, SubEvt_trigNr(subEvt), trigTag);
        }
-       SubEvt_setSize(subEvt, SubEvt_size(subEvt) + (char *) data - (char *) first);
+       SubEvt_setSize(subEvt, (char *) data - (char *) subevt);
        return 0;
 }