From: muench <muench>
Date: Thu, 3 Feb 2000 10:11:08 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=a97a487bf1005ba9c9bd3dbbd33e16cbfbe9baff;p=daqdata.git

*** empty log message ***
---

diff --git a/hadaq/hwmdc.c b/hadaq/hwmdc.c
index f623cb0..0bbdbcf 100644
--- a/hadaq/hwmdc.c
+++ b/hadaq/hwmdc.c
@@ -1,4 +1,4 @@
-static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwmdc.c,v 6.2 1999-10-06 17:02:06 muench Exp $";
+static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwmdc.c,v 6.3 2000-02-03 10:11:08 muench Stab $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -84,7 +84,7 @@ void Hardware_waitForTrigger(Hardware *my, void *subEvt)
 	if (HwSam_isEmpty(my->sam[my->samToRead])) {
 		HwSam_requestBuffer(my->sam[my->samToRead]);
 		while (HwSam_isBusy(my->sam[my->samToRead])) {
-#if 1
+#if 0
 			struct timespec tS, *t = &tS;
 			t->tv_sec = 0;
 			t->tv_nsec = 020000000;
diff --git a/hadaq/hwsam.c b/hadaq/hwsam.c
index 098823a..75eee01 100644
--- a/hadaq/hwsam.c
+++ b/hadaq/hwsam.c
@@ -109,7 +109,7 @@ void *HwSam_readSubEvt(HwSam *my, void *subEvt) {
   msglog(LOG_DEBUG, "readSubEvt currAddr: 0x%08x\n", my->currAddr);
 
   if (my->currAddr + size > endOfData(my)) {
-    msglog(LOG_EMERG,"subEvt throw away\n");
+    msglog(LOG_EMERG,"subEvt throw away : %d, %d\n", size, endOfData(my) - my->currAddr);
     /* create impossible subEvt */
     SubEvt_setSize(subEvt, SubEvt_hdrSize());
     SubEvt_setDecoding(subEvt, SubEvtDecoding_16bitData);
@@ -126,11 +126,10 @@ void *HwSam_readSubEvt(HwSam *my, void *subEvt) {
 
     /* normal extension of trigger tag */
     trigTag = SubEvt_trigNr(subEvt);
-    trigTag--; /* BUGBUG Workaround for wrong Tag from HW */
   
     /* BUGBUG if soft & hardware trigNr differ, HW gets precedence */
     if (trigTag != (my->trigNr & 0xff)) {
-      msglog(LOG_EMERG,"readSubEvt trigTag differ\n");
+      msglog(LOG_EMERG,"readSubEvt trigTag differ : 0x%08x, 0x%02x\n",my->trigNr, trigTag);
     }
     if (trigTag < (my->trigNr & 0xff)) {
       my->trigNr += 0x100;
diff --git a/hadaq/makeenv b/hadaq/makeenv
index edece92..d513879 100644
--- a/hadaq/makeenv
+++ b/hadaq/makeenv
@@ -47,6 +47,9 @@ export HW_OBJS="hwtof.o hwv775.o hwv878.o hwv488.o hwdtu.o hwsis3801.o"
 elif test $HW_CONF = "RICH"
 then
 export HW_OBJS="hwrich.o hwrace.o rc.o"
+elif test $HW_CONF = "MDC"
+then
+export HW_OBJS="hwmdc.o hwsam.o"
 elif test $HW_CONF = "TBUS"
 then
 export HW_OBJS="hwtbus.o hwdtu.o"