Join with shw-blt branch

diff --git a/hadaq/agent.c b/hadaq/agent.c
index f2640a39c74348794191e3339751be0e362ef6ab..f3f7b54ddf54a62f8edf0d6d0c91ad7864cfaf97 100644 (file)
--- a/hadaq/agent.c
+++ b/hadaq/agent.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/agent.c,v 6.12 2003-03-02 16:24:59 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/agent.c,v 6.13 2003-05-14 13:54:42 muench Exp $";
 
 #define _GNU_SOURCE
 #include <unistd.h>

diff --git a/hadaq/ansiTape.c b/hadaq/ansiTape.c
index 1aa2d4769fd3196b4b0ca5c93bd5fe5b8f02a9c6..eec62fb404d38013cafb53a1a3d49744e0a11e63 100644 (file)
--- a/hadaq/ansiTape.c
+++ b/hadaq/ansiTape.c
@@ -1,3 +1,5 @@
+
+
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/hadaq/ctrlctu.c b/hadaq/ctrlctu.c
index 1b41be82adc9310f496947dcdeb679df0b0fccd4..c93a3cd562a0059da09a00b0c81fe442aa103ed6 100644 (file)
--- a/hadaq/ctrlctu.c
+++ b/hadaq/ctrlctu.c
@@ -1,5 +1,5 @@
 
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/ctrlctu.c,v 6.15 2003-03-02 16:24:59 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/ctrlctu.c,v 6.16 2003-05-14 13:54:42 muench Exp $";
 
 #define _XOPEN_SOURCE
 #define _POSIX_C_SOURCE 199506L

diff --git a/hadaq/evt.c b/hadaq/evt.c
index e19ed5bf1bf58be396372803aa70d645573da7e0..615b59548110ae2f94eb47751d79be18957af7ad 100644 (file)
--- a/hadaq/evt.c
+++ b/hadaq/evt.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evt.c,v 6.16 2003-04-25 12:15:16 muench Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evt.c,v 6.17 2003-05-14 13:54:42 muench Exp $";
 
 
 #define _ANSI_C_SOURCE

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index 4a46ea467da4736a4520f61f5d0b699389dc58cd..cd4dcd7a96e39d2f07ba230619b94eec5fd66980 100644 (file)
--- a/hadaq/evtbuild.c
+++ b/hadaq/evtbuild.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.63 2003-04-25 12:15:16 muench Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.64 2003-05-14 13:54:42 muench Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L

diff --git a/hadaq/hadtu.c b/hadaq/hadtu.c
index e82c951b91fd5a16bf675e66f7fdba49d834d282..e86995892d586c6d042f00a87f2a02c12d29b87b 100644 (file)
--- a/hadaq/hadtu.c
+++ b/hadaq/hadtu.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/hadtu.c,v 6.5 2003-03-02 16:24:59 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/hadtu.c,v 6.6 2003-05-14 13:54:43 muench Exp $";
 
 
 #define _ANSI_C_SOURCE

diff --git a/hadaq/hadtuqueue.c b/hadaq/hadtuqueue.c
index 2f92a5ca38bd25c975b06eeeae48790a41dd0646..4ea5b9b53de94713be5a7363adf6bc6e4e08ed9d 100644 (file)
--- a/hadaq/hadtuqueue.c
+++ b/hadaq/hadtuqueue.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/hadtuqueue.c,v 6.5 2003-03-02 16:24:59 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/hadtuqueue.c,v 6.6 2003-05-14 13:54:43 muench Exp $";
 
 
 #define _ANSI_C_SOURCE

diff --git a/hadaq/hardware.h b/hadaq/hardware.h
index 411c87b5e69ea99ecc52d569284d5cfdfa3ce286..7485caee106651dc707c19debe1747c22bc1aa61 100644 (file)
--- a/hadaq/hardware.h
+++ b/hadaq/hardware.h
@@ -1,3 +1,4 @@
+
 #ifndef HARDWARE_H
 #define HARDWARE_H
 

diff --git a/hadaq/hldread.c b/hadaq/hldread.c
index 93e02795437b392e4e6bb89d79b369b7996400c1..51e108c7ae31b4f023c845d9060c4d953b7b52d4 100644 (file)
--- a/hadaq/hldread.c
+++ b/hadaq/hldread.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/hldread.c,v 6.7 2003-03-02 16:24:59 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/hldread.c,v 6.8 2003-05-14 13:54:43 muench Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L

diff --git a/hadaq/hwrich.c b/hadaq/hwrich.c
index 7e59c229a08715da6258bf0e662f6938c82dee93..dd1279c34b5804e48351e5fbb97baff75b8cf18c 100644 (file)
--- a/hadaq/hwrich.c
+++ b/hadaq/hwrich.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.39 2003-03-02 16:25:00 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.40 2003-05-14 13:54:43 muench Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>

diff --git a/hadaq/hwsam.c b/hadaq/hwsam.c
index ca62b5d5ba4e26a9e0829c8308f70ef152a30681..b43983b29e806cb65368ca59088aa76cc964cfdc 100644 (file)
--- a/hadaq/hwsam.c
+++ b/hadaq/hwsam.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsam.c,v 6.18 2003-03-02 16:25:00 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsam.c,v 6.19 2003-05-14 13:54:44 muench Exp $";
 
 #include <assert.h>
 #include <string.h>

diff --git a/hadaq/hwship.c b/hadaq/hwship.c
index 7b0899534e2bf4deb3a3457b9c36e96f8fe8c632..214e474e581d4acf058ef4ed900850ffb8e8b9aa 100644 (file)
--- a/hadaq/hwship.c
+++ b/hadaq/hwship.c
@@ -1,11 +1,10 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwship.c,v 6.29 2002-10-25 06:49:53 hadaq Exp $";
-
-#undef SHIP_DEBUG
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwship.c,v 6.30 2003-05-14 13:54:44 muench Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
 
 #include <assert.h>
+#include <errno.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -70,6 +69,7 @@ int conHwShip(HwShip *my, const char *name, const Param *param)
                syslog(LOG_ERR, "Parameter %s(cardbase) not found", my->name);
                return -1;
        }
+       my->cardBase = cardBase;        /* BUGBUG see header */
        my->lvme = malloc(sizeof(LVme));
        if (0 > conLVme(my->lvme, cardBase, 0x400000UL, 0x39UL, LVL2_OFFSET, 4)) {
                syslog(LOG_ERR, "%s on %p not found", my->name, cardBase);
@@ -133,7 +133,6 @@ void HwShip_getEndOfData(HwShip *my)
 #endif
 }
 
-#define SHIP_NODATASIZE 0x10
 int HwShip_readSubEvt(HwShip *my, void *subEvt)
 {
        int readSubEvtR;
@@ -148,14 +147,14 @@ int HwShip_readSubEvt(HwShip *my, void *subEvt)
        lastAddr = my->currAddr + size;
 
 #ifndef SHIP_DEBUG
-       assert(size < sizeof(uint32_t) * 0x1600);       /* whereever the 0x1600 comes from */
+       assert(size <= HwShip_maxSubEvtSize(my));
 #else
        if (my->isDoomed) {
                dumpDbgBufs(my);
                syslog(LOG_EMERG, "%s: was doomed in previous buffer, dump buffer again and abort", my->name);
                abort();
        }
-       if (size >= sizeof(uint32_t) * 0x1600) {
+       if (size >= HwShip_maxSubEvtSize(my)) {
                dumpDbgBufs(my);
                syslog(LOG_EMERG, "%s: corrupted subEvt, dump buffer and try one more", my->name);
                my->currAddr = my->endOfData;
@@ -168,7 +167,7 @@ int HwShip_readSubEvt(HwShip *my, void *subEvt)
        }
 #endif
 
-       if (size <= SHIP_NODATASIZE) {
+       if (size <= HwShip_minSubEvtSize(my)) {
                my->currAddr = lastAddr;
                readSubEvtR = 1;
                syslog(LOG_DEBUG, "subEvt: empty, skipped");
@@ -181,8 +180,61 @@ int HwShip_readSubEvt(HwShip *my, void *subEvt)
                        my->currAddr += 4;
                }
                readSubEvtR = 0;
+#ifndef NDEBUG
                syslog(LOG_DEBUG, "subEvt: %s", SubEvt_2charP(subEvt));
+#endif
        }
 
        return readSubEvtR;
 }
+
+int HwShip_fillLBmaChain(HwShip *my, LBma *lbma, unsigned long virtOff)
+{
+       int fillLBmeChainR;
+       unsigned long size;
+       unsigned long lastAddr;
+
+       assert(my->bankRequested == bankConfirmed(my));
+       assert(my->endOfData > 0);
+       assert(my->endOfData <= LVL2_OFFSET + sizeof(uint16_t) * LVL2_SIZE);
+
+       size = LVme_getL(my->lvme, my->currAddr);
+       lastAddr = my->currAddr + size;
+
+#ifndef SHIP_DEBUG
+       assert(size <= HwShip_maxSubEvtSize(my));
+#else
+       if (my->isDoomed) {
+               dumpDbgBufs(my);
+               syslog(LOG_EMERG, "%s: was doomed in previous buffer, dump buffer again and abort", my->name);
+               abort();
+       }
+       if (size >= HwShip_maxSubEvtSize(my)) {
+               dumpDbgBufs(my);
+               syslog(LOG_EMERG, "%s: corrupted subEvt, dump buffer and try one more", my->name);
+               my->currAddr = my->endOfData;
+               my->isDoomed = 1;
+               SubEvt_setDecoding(subEvt, 0x00020001);
+               SubEvt_setSize(subEvt, 0x10);
+               SubEvt_setId(subEvt, 399 | 0x80000000);
+               SubEvt_setTrigNr(subEvt, 0);
+               return 0;
+       }
+#endif
+
+       if (size <= HwShip_minSubEvtSize(my)) {
+               fillLBmeChainR = 0;
+       } else {
+               if (0 > LBma_readChain(lbma, virtOff, my->currAddr + my->cardBase, size / 4, 0x3bUL)) {
+                       fillLBmeChainR = -1;
+               } else {
+#ifndef NDEBUG
+                       syslog(LOG_DEBUG, "subEvt: %s", SubEvt_2charP(LVme_getPtrL(my->lvme, my->currAddr)));
+#endif
+                       fillLBmeChainR = size;
+               }
+       }
+       my->currAddr = lastAddr;
+
+       return fillLBmeChainR;
+}

diff --git a/hadaq/hwship.h b/hadaq/hwship.h
index c20b33f4572e8bc6acf547ef6e7794cda6eb6864..e72827bb2d92d4b071b3a57d904af86afe9d2181 100644 (file)
--- a/hadaq/hwship.h
+++ b/hadaq/hwship.h
@@ -2,6 +2,8 @@
 #ifndef HwShip_H
 #define HwShip_H
 
+#undef SHIP_DEBUG
+
 #include <lvme.h>
 
 #include <allParam.h>
@@ -10,7 +12,8 @@
 typedef struct HwShipS {
        char name[12];
        LVme *lvme;
-       int currAddr;
+       unsigned long cardBase;         /* BUGBUG workaround for stupid lvme design */
+       unsigned long currAddr;
        int endOfData;
        int bankRequested;
        int currDbgBuf;
@@ -29,6 +32,16 @@ HwShip;
 int conHwShip(HwShip *my, const char *name, const Param *param);
 void desHwShip(HwShip *my);
 
+static size_t HwShip_minSubEvtSize(const HwShip *my)
+{
+       return 16;
+}
+
+static size_t HwShip_maxSubEvtSize(const HwShip *my)
+{
+       return 3088;
+}
+
 void HwShip_requestBuffer(HwShip *my);
 
 static int HwShip_isEmpty(HwShip *my)
@@ -55,4 +68,5 @@ static int HwShip_isBusy(HwShip *my)
        return my->bankRequested != bankConfirmed(my);
 }
 
+int HwShip_fillLBmaChain(HwShip *my, LBma *lbma, unsigned long virtOff);
 #endif

diff --git a/hadaq/hwshow.c b/hadaq/hwshow.c
index 6bfce9e982c72071eecc5aa8391b979f3b99b82a..666f09f250028a207d99cbdd6b423833a4c60e71 100644 (file)
--- a/hadaq/hwshow.c
+++ b/hadaq/hwshow.c
@@ -1,4 +1,6 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.33 2003-02-14 11:54:41 sailer Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.34 2003-05-14 13:54:44 muench Exp $";
+
+#define SHIP_BLT
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -12,6 +14,7 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada
 #include <syslog.h>
 
 #include <allParam.h>
+#include <lvme.h>
 #include "subevt.h"
 #include "hwship.h"
 
@@ -19,6 +22,10 @@ struct HardwareS {
        size_t maxSubEvtSize;
        int nShips;
        HwShip **ship;
+#ifdef SHIP_BLT
+       LBma *lbma;
+       LVme_L *buf;
+#endif
 };
 
 #include "hardware.h"
@@ -66,10 +73,7 @@ Hardware *newHardware(const char *subsystem)
        my->ship = malloc(nCards * sizeof(HwShip *));
        my->nShips = nCards;
 
-#if 0
-       my->maxSubEvtSize = SubEvt_hdrSize() + (my->nShips * 1600 * sizeof(uint32_t));
-#endif
-       my->maxSubEvtSize = SubEvt_hdrSize() + (my->nShips * 1900 * sizeof(uint32_t));
+       my->maxSubEvtSize = SubEvt_hdrSize();
 
        for (i = 0; i < my->nShips; i++) {
                my->ship[i] = malloc(sizeof(HwShip));
@@ -77,8 +81,18 @@ Hardware *newHardware(const char *subsystem)
                        syslog(LOG_ERR, "Construction of card %s failed:%s", cards[i], strerror(errno));
                        return NULL;
                }
+               my->maxSubEvtSize += HwShip_maxSubEvtSize(my->ship[i]);
        }
 
+#ifdef SHIP_BLT
+       my->lbma = malloc(sizeof(LBma));
+       if (0 > conLBma(my->lbma, 0, Hardware_maxSubEvtSize(my), 0x3b)) {
+               syslog(LOG_ERR, "%s:%d:%s", __FILE__, __LINE__, strerror(errno));
+               return -1;
+       }
+       my->buf = LBma_getPtrL(my->lbma, 0);
+#endif
+
        desParam(param);
        return my;
 }
@@ -87,6 +101,10 @@ void deleteHardware(Hardware *my)
 {
        int i;
 
+#ifdef SHIP_BLT
+       desLBma(my->lbma);
+       free(my->lbma);
+#endif
        for (i = 0; i < my->nShips; i++) {
                desHwShip(my->ship[i]);
                free(my->ship[i]);
@@ -136,6 +154,50 @@ void Hardware_waitForTrigger(Hardware *my, void *subEvt)
 
 }
 
+#ifdef SHIP_BLT
+void Hardware_readout(Hardware *my, void *partEvt)
+{
+       int i;
+       int firstShip = -1;
+       void *subEvt = SubEvt_data(my->buf);
+       static unsigned long trigNr = 0;
+       unsigned trigTag;
+       int dataError;
+       int size;
+
+       /* init partial event, necessary for  SubEvt_next() */
+       SubEvt_setDecoding(my->buf, SubEvtDecoding_SubEvts);
+       dataError = 0;
+       SubEvt_setId(my->buf, 0);
+
+       for (i = 0; i < my->nShips; i++) {
+               if (0 > LBma_resetChain(my->lbma)) {
+                       syslog(LOG_ERR, "%s:%d:%s", __FILE__, __LINE__, strerror(errno));
+               }
+               size = HwShip_fillLBmaChain(my->ship[i], my->lbma, (char *) subEvt - (char *) my->buf);
+               if (size > 0) {
+                       subEvt = (char *) subEvt + (size + 0x7U & ~0x7U);
+               }
+               if (0 > LBma_startChain(my->lbma)) {
+                       syslog(LOG_ERR, "%s:%d:%s", __FILE__, __LINE__, strerror(errno));
+               }
+               if (0 > LBma_waitChain(my->lbma)) {
+                       syslog(LOG_ERR, "%s:%d:%s", __FILE__, __LINE__, strerror(errno));
+               }
+       }
+
+       SubEvt_setTrigNr(my->buf, trigNr << 8 | trigTag);
+       SubEvt_setSize(my->buf, (char *) subEvt - (char *) my->buf);
+       trigNr++;
+
+       assert(SubEvt_size(my->buf) <= Hardware_maxSubEvtSize(my));
+
+       memcpy(partEvt, my->buf, SubEvt_size(my->buf));
+
+       syslog(LOG_DEBUG, "partEvt: %s", SubEvt_2charP(partEvt));
+}
+
+#else
 void Hardware_readout(Hardware *my, void *partEvt)
 {
        int i;
@@ -177,8 +239,8 @@ void Hardware_readout(Hardware *my, void *partEvt)
        SubEvt_setSize(partEvt, (char *) subEvt - (char *) partEvt);
        trigNr++;
 
-       assert(SubEvt_size(partEvt) <= my->maxSubEvtSize);
-#ifndef NDEBUG
+       assert(SubEvt_size(partEvt) <= Hardware_maxSubEvtSize(my));
        syslog(LOG_DEBUG, "partEvt: %s", SubEvt_2charP(partEvt));
-#endif
 }
+
+#endif

diff --git a/hadaq/hwsoft.c b/hadaq/hwsoft.c
index 510853262ead10324937e0ae3f662367da0224d7..c70ef2f8ff83e130953f64b2e3fffd5d05553055 100644 (file)
--- a/hadaq/hwsoft.c
+++ b/hadaq/hwsoft.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsoft.c,v 6.28 2003-03-02 16:25:00 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsoft.c,v 6.29 2003-05-14 13:54:44 muench Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L

diff --git a/hadaq/hwtip.c b/hadaq/hwtip.c
index 888e39d8660e3f87258b9b7a8245a30935f3fb1c..15008f1ccaecc1c2579127891cee4921fa3b8761 100644 (file)
--- a/hadaq/hwtip.c
+++ b/hadaq/hwtip.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtip.c,v 1.30 2003-03-02 16:25:00 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtip.c,v 1.31 2003-05-14 13:54:44 muench Exp $";
 
 #include <assert.h>
 #include <string.h>

diff --git a/hadaq/hwtrig.c b/hadaq/hwtrig.c
index d486a9460869efb9aef9d41518dd7b3cd95924d2..c1ba0ad4e591c60a6e2e4b4eecffe43f892e2644 100644 (file)
--- a/hadaq/hwtrig.c
+++ b/hadaq/hwtrig.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtrig.c,v 6.36 2003-03-02 16:25:00 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtrig.c,v 6.37 2003-05-14 13:54:44 muench Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>

diff --git a/hadaq/indent.pro b/hadaq/indent.pro
index c25667fc93a245b5eeda99b6a80130c87668a714..eadea985a4e0b76bd4c44b3678bb5166f9174398 100644 (file)
--- a/hadaq/indent.pro
+++ b/hadaq/indent.pro
@@ -33,6 +33,7 @@
 -T Mask
 -T NetTrans
 -T NetTransType
+-T OurArgs
 -T Param
 -T Pixmap
 -T PsxShm
@@ -105,7 +106,6 @@
 -T Tcl_VarTraceProc
 -T Tcl_WaitForEventProc
 -T TheArgs
--T OurArgs
 -T TheStats
 -T ThrArgs
 -T Time

diff --git a/hadaq/netmem.c b/hadaq/netmem.c
index 52bf1e47b5046caaf15b9c444970a72586f45c40..2f841f6c67aa22fb9baf015a4c149717f2700fa8 100644 (file)
--- a/hadaq/netmem.c
+++ b/hadaq/netmem.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/netmem.c,v 6.25 2003-03-02 16:25:00 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/netmem.c,v 6.26 2003-05-14 13:54:44 muench Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L

diff --git a/hadaq/nettrans.c b/hadaq/nettrans.c
index 989987f6f73b5bc3998dc0538a5c2ab01b756284..43e533fc3277e3b718f357862908503c8e6b7b8a 100644 (file)
--- a/hadaq/nettrans.c
+++ b/hadaq/nettrans.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/nettrans.c,v 6.27 2003-03-02 16:25:00 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/nettrans.c,v 6.28 2003-05-14 13:54:44 muench Exp $";
 
 
 #define _GNU_SOURCE

diff --git a/hadaq/online.c b/hadaq/online.c
index 3cea679f35f3bdaaeee24270cb754285a925f194..79ab41e76e09e95230bdef208ded2ab17b1ca07e 100644 (file)
--- a/hadaq/online.c
+++ b/hadaq/online.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/online.c,v 6.8 2003-03-02 16:25:00 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/online.c,v 6.9 2003-05-14 13:54:45 muench Exp $";
 
 
 #define _GNU_SOURCE

diff --git a/hadaq/rc.c b/hadaq/rc.c
index 89d34ab74bddee5ea7353a47537fc6cf590f4760..672a2b30284e215997b58c4e896968460ea20e22 100644 (file)
--- a/hadaq/rc.c
+++ b/hadaq/rc.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/rc.c,v 6.5 2003-03-02 16:25:00 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/rc.c,v 6.6 2003-05-14 13:54:45 muench Exp $";
 
 
 #include <stdlib.h>

diff --git a/hadaq/readout.c b/hadaq/readout.c
index ee7896d15cba1ed17ca286862bbbe80e99a2d17c..609893b27b3366586e073409a6b346a590aa8652 100644 (file)
--- a/hadaq/readout.c
+++ b/hadaq/readout.c
@@ -1,5 +1,5 @@
 
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/readout.c,v 6.26 2003-03-02 16:25:00 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/readout.c,v 6.27 2003-05-14 13:54:45 muench Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #define SYSLOG_NAMES

diff --git a/hadaq/shmtrans.c b/hadaq/shmtrans.c
index 2974fe0743b5e5fcb225f88dadd09035eb6d6cc4..01c0a043cc4695a1f45c041f4146611ec84a3b2f 100644 (file)
--- a/hadaq/shmtrans.c
+++ b/hadaq/shmtrans.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/shmtrans.c,v 6.8 2003-03-02 16:25:00 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/shmtrans.c,v 6.9 2003-05-14 13:54:45 muench Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L

diff --git a/hadaq/showevt.c b/hadaq/showevt.c
index aa4d67bcce63c5418208c1ad5058be4bbe87a7b5..d67eb8611d3d7663955a4f987c6527dad9a6396f 100644 (file)
--- a/hadaq/showevt.c
+++ b/hadaq/showevt.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/showevt.c,v 6.10 2003-03-10 13:22:26 muench Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/showevt.c,v 6.11 2003-05-14 13:54:45 muench Exp $";
 
 
 #define _ANSI_C_SOURCE

diff --git a/hadaq/sniff.c b/hadaq/sniff.c
index 71ff68681e0cc5b1da805e542c6da993890eccad..08a439d8e8c2023b4c774fb59761dbcf1d104141 100644 (file)
--- a/hadaq/sniff.c
+++ b/hadaq/sniff.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/sniff.c,v 6.9 2003-03-02 16:25:00 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/sniff.c,v 6.10 2003-05-14 13:54:45 muench Exp $";
 
 
 #define SYSLOG_NAMES

diff --git a/hadaq/subevt.c b/hadaq/subevt.c
index 7f6aba3b9e6e2ff88f2fc787324cab09cf7e01d1..48955751aaf7e86444ea1f018caafd34ef179761 100644 (file)
--- a/hadaq/subevt.c
+++ b/hadaq/subevt.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/subevt.c,v 6.11 2003-03-02 16:25:00 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/subevt.c,v 6.12 2003-05-14 13:54:45 muench Exp $";
 
 
 #include <stdlib.h>

diff --git a/hadaq/tclAppInit.c b/hadaq/tclAppInit.c
index 80016596ac27a8212964f165deaa0c485a5f64e4..861a446f85b37094861c28734d8f7516a3c8f813 100644 (file)
--- a/hadaq/tclAppInit.c
+++ b/hadaq/tclAppInit.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/tclAppInit.c,v 6.5 2003-03-02 16:25:00 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/tclAppInit.c,v 6.6 2003-05-14 13:54:45 muench Exp $";
 
 
 /*

diff --git a/hadaq/tcldaq.c b/hadaq/tcldaq.c
index d6e32c3d2e43fa425641aaa67f6e897d5393cc57..778096feb1ee90d87114973c646a80c6db726a27 100644 (file)
--- a/hadaq/tcldaq.c
+++ b/hadaq/tcldaq.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/tcldaq.c,v 6.13 2003-03-02 16:25:00 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/tcldaq.c,v 6.14 2003-05-14 13:54:45 muench Exp $";
 
 #define _GNU_SOURCE
 #include <unistd.h>

diff --git a/hadaq/tkAppInit.c b/hadaq/tkAppInit.c
index 8bbadba7e849a5d334010fd78285ffea8a93a977..7a791cf2719c6c527e2a9ecc98f602699e207b16 100644 (file)
--- a/hadaq/tkAppInit.c
+++ b/hadaq/tkAppInit.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/tkAppInit.c,v 6.5 2003-03-02 16:25:00 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/tkAppInit.c,v 6.6 2003-05-14 13:54:46 muench Exp $";
 
 
 /*

diff --git a/hadaq/tof_defs.h b/hadaq/tof_defs.h
index 20c4e08d0af4b8b9f0ea0e461db898552be9bbcb..501156c29987d1283c7d2151341ec445927ce7ab 100644 (file)
--- a/hadaq/tof_defs.h
+++ b/hadaq/tof_defs.h
@@ -2,7 +2,7 @@
 /****  Headerfile for TOF-IPU registers */
 /****  created: E.Lins 13-Jan-2000 */
 
-/* $Id: tof_defs.h,v 1.5 2003-03-02 16:25:00 hadaq Exp $ */
+/* $Id: tof_defs.h,v 1.6 2003-05-14 13:54:46 muench Exp $ */
 /* $Source: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/tof_defs.h,v $ */
 
 

diff --git a/hadaq/worker.c b/hadaq/worker.c
index 279377efe7480dcb76e8ce4a6b979a703977419a..eb67e3856fb5449fbbfbfac48fc02d5da29314e8 100644 (file)
--- a/hadaq/worker.c
+++ b/hadaq/worker.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/worker.c,v 6.19 2003-03-02 16:25:00 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/worker.c,v 6.20 2003-05-14 13:54:46 muench Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>