From 2d1353a39f9bc1ce5189f6a8c8c4faea6aefbe5d Mon Sep 17 00:00:00 2001
From: muench <muench>
Date: Wed, 14 May 2003 13:54:42 +0000
Subject: [PATCH] Join with shw-blt branch

---
 hadaq/agent.c      |  2 +-
 hadaq/ansiTape.c   |  2 ++
 hadaq/ctrlctu.c    |  2 +-
 hadaq/evt.c        |  2 +-
 hadaq/evtbuild.c   |  2 +-
 hadaq/hadtu.c      |  2 +-
 hadaq/hadtuqueue.c |  2 +-
 hadaq/hardware.h   |  1 +
 hadaq/hldread.c    |  2 +-
 hadaq/hwrich.c     |  2 +-
 hadaq/hwsam.c      |  2 +-
 hadaq/hwship.c     | 66 ++++++++++++++++++++++++++++++++++-----
 hadaq/hwship.h     | 16 +++++++++-
 hadaq/hwshow.c     | 78 +++++++++++++++++++++++++++++++++++++++++-----
 hadaq/hwsoft.c     |  2 +-
 hadaq/hwtip.c      |  2 +-
 hadaq/hwtrig.c     |  2 +-
 hadaq/indent.pro   |  2 +-
 hadaq/netmem.c     |  2 +-
 hadaq/nettrans.c   |  2 +-
 hadaq/online.c     |  2 +-
 hadaq/rc.c         |  2 +-
 hadaq/readout.c    |  2 +-
 hadaq/shmtrans.c   |  2 +-
 hadaq/showevt.c    |  2 +-
 hadaq/sniff.c      |  2 +-
 hadaq/subevt.c     |  2 +-
 hadaq/tclAppInit.c |  2 +-
 hadaq/tcldaq.c     |  2 +-
 hadaq/tkAppInit.c  |  2 +-
 hadaq/tof_defs.h   |  2 +-
 hadaq/worker.c     |  2 +-
 32 files changed, 174 insertions(+), 43 deletions(-)

diff --git a/hadaq/agent.c b/hadaq/agent.c
index f2640a3..f3f7b54 100644
--- 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 1aa2d47..eec62fb 100644
--- 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 1b41be8..c93a3cd 100644
--- 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 e19ed5b..615b595 100644
--- 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 4a46ea4..cd4dcd7 100644
--- 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 e82c951..e869958 100644
--- 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 2f92a5c..4ea5b9b 100644
--- 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 411c87b..7485cae 100644
--- 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 93e0279..51e108c 100644
--- 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 7e59c22..dd1279c 100644
--- 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 ca62b5d..b43983b 100644
--- 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 7b08995..214e474 100644
--- 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 c20b33f..e72827b 100644
--- 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 6bfce9e..666f09f 100644
--- 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 5108532..c70ef2f 100644
--- 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 888e39d..15008f1 100644
--- 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 d486a94..c1ba0ad 100644
--- 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 c25667f..eadea98 100644
--- 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 52bf1e4..2f841f6 100644
--- 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 989987f..43e533f 100644
--- 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 3cea679..79ab41e 100644
--- 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 89d34ab..672a2b3 100644
--- 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 ee7896d..609893b 100644
--- 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 2974fe0..01c0a04 100644
--- 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 aa4d67b..d67eb86 100644
--- 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 71ff686..08a439d 100644
--- 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 7f6aba3..4895575 100644
--- 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 8001659..861a446 100644
--- 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 d6e32c3..778096f 100644
--- 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 8bbadba..7a791cf 100644
--- 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 20c4e08..501156c 100644
--- 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 279377e..eb67e38 100644
--- 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>
-- 
2.43.0