From: hades <hades>
Date: Thu, 12 Apr 2001 09:56:23 +0000 (+0000)
Subject: Some careful cleanup, mostly for reasons of consistency
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=4e3f8d303a1d3e3156558d2d95d5c8f4da535df9;p=daqdata.git

Some careful cleanup, mostly for reasons of consistency
---

diff --git a/hadaq/hwmdc.c b/hadaq/hwmdc.c
index d5ebfde..9cea401 100644
--- a/hadaq/hwmdc.c
+++ b/hadaq/hwmdc.c
@@ -1,9 +1,10 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwmdc.c,v 6.10 2001-03-07 16:02:44 hades Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwmdc.c,v 6.11 2001-04-12 09:56:23 hades Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
 
+#include <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h> 
@@ -133,4 +134,9 @@ void Hardware_readout(Hardware *my, void *partEvt)
     SubEvt_setTrigNr(partEvt, trigNr << 8 | trigTag);
 	SubEvt_setSize(partEvt, (char *)subEvt - (char *)partEvt);
     trigNr++;
+
+	assert(SubEvt_size(partEvt) <= my->maxSubEvtSize);
+#ifndef NDEBUG
+	msglog(LOG_DEBUG, "partEvt: %s\n", SubEvt_2charP(partEvt));
+#endif
 }
diff --git a/hadaq/hwrace.c b/hadaq/hwrace.c
index 07f8d2a..b3a354f 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.13 2001-04-10 15:00:21 hades Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrace.c,v 6.14 2001-04-12 09:56:23 hades Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -122,9 +122,6 @@ int HwRace_readSubEvt(HwRace *my, void *subEvt)
 	int size;
 
 	size = Rc_readMem(my->rc, my->currAddr);
-#ifndef NDEBUG
-	msglog(LOG_DEBUG, "size: %x, currAddr: %x\n", size, my->currAddr);
-#endif
 
 	/* copy one sub evt from RC to memory */
 	for (firstAddr = my->currAddr; my->currAddr - firstAddr < size; my->currAddr += 4) {
@@ -135,5 +132,8 @@ int HwRace_readSubEvt(HwRace *my, void *subEvt)
 	if ((my->currAddr & 0xff) != 0) {
 		my->currAddr = (my->currAddr / RCPAGESIZE + 1) * RCPAGESIZE;
 	}
+#ifndef NDEBUG
+	msglog(LOG_DEBUG, "subEvt: %s\n", SubEvt_2charP(subEvt));
+#endif
 	return 0;
 }
diff --git a/hadaq/hwrich.c b/hadaq/hwrich.c
index 4ba55d6..712caa5 100644
--- a/hadaq/hwrich.c
+++ b/hadaq/hwrich.c
@@ -1,9 +1,10 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.16 2001-04-10 15:00:21 hades Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.17 2001-04-12 09:56:24 hades Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
 
+#include <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
@@ -127,6 +128,8 @@ void Hardware_readout(Hardware *my, void *partEvt)
     SubEvt_setTrigNr(partEvt, trigNr << 8 | trigTag);
 	SubEvt_setSize(partEvt, (char *)subEvt - (char *)partEvt);
     trigNr++;
+
+	assert(SubEvt_size(partEvt) <= my->maxSubEvtSize);
 #ifndef NDEBUG
 	msglog(LOG_DEBUG, "partEvt: %s\n", SubEvt_2charP(partEvt));
 #endif
diff --git a/hadaq/hwship.c b/hadaq/hwship.c
index 2f88f9a..a25dba2 100644
--- a/hadaq/hwship.c
+++ b/hadaq/hwship.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwship.c,v 6.13 2001-03-07 16:02:44 hades Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwship.c,v 6.14 2001-04-12 09:56:24 hades Exp $";
 
 #include <assert.h>
 #include <string.h>
@@ -175,7 +175,6 @@ int HwShip_readSubEvt(HwShip *my, void *subEvt) {
   UInt4 *data = (UInt4 *)subEvt;
   int firstAddr;
   size_t size;
-  UInt1 trigTag;
 
   size = LVme_getL(my->lvme, my->currAddr);
 
@@ -184,17 +183,8 @@ int HwShip_readSubEvt(HwShip *my, void *subEvt) {
   	*data++ = LVme_getL(my->lvme, my->currAddr);
   }
 
-  trigTag = SubEvt_trigNr(subEvt) & 0xff;
-
-#if 0
-  if ((my->trigNr & 0xff) != trigTag) {
-    msglog(LOG_ERR,
-	"%s trigTag consistency: 0x%02x != 0x%02x offset: 0x%08x\n", my->name, my->trigNr, trigTag, my->currAddr);
-  }
+#ifndef NDEBUG
+	msglog(LOG_DEBUG, "subEvt: %s\n", SubEvt_2charP(subEvt));
 #endif
-	/* normal extension of trigger tag */
-	SubEvt_setTrigNr(subEvt, my->trigNr << 8 | trigTag);
-	my->trigNr++;
-
   return 0;
 }