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

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

diff --git a/hadaq/hwrace.c b/hadaq/hwrace.c
index 6a56ace..54a5a21 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.2 1999-11-01 08:35:36 muench Exp $";
+static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrace.c,v 6.3 2000-02-03 10:32:40 muench Stab $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -7,6 +7,7 @@ static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/had
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
+#include <time.h>
 
 #include <hadesstd.h>
 #include <lvme.h>
@@ -70,13 +71,6 @@ int conHwRace(HwRace *my, const char *name, const Param *param)
 		msglog(LOG_DEBUG, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno));
 		return -1;
 	}
-	my->lbma = allocMem(sizeof(LBma));
-
-	if (0 > conLBma(my->lbma, cardBase + 0x100000, 512 * 1024, 0x09)) {
-		msglog(LOG_DEBUG, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno));
-		return -1;
-	}
-	my->buf = LBma_getPtrL(my->lbma, 0);
 
 	standbyMode(my);
 	acquireMode(my);
@@ -85,9 +79,6 @@ int conHwRace(HwRace *my, const char *name, const Param *param)
 
 void desHwRace(HwRace *my)
 {
-	desLBma(my->lbma);
-	freeMem(my->lbma);
-
 	standbyMode(my);
 	desRc(my->rc);
 	freeMem(my->rc);
@@ -117,11 +108,14 @@ int HwRace_readSubEvt(HwRace *my, void *subEvt)
 	int size;
 
 	size = Rc_readMem(my->rc, my->currAddr);
-#if 1
+#if 0
+/* This sleep was a quickhack in sep. 99 beamtime to fix a problem
+ * during bank switching.  It is not understood, why it helped.
+*/
 	if ( 1 || my->currAddr == 0) {
 			struct timespec tS, *t = &tS;
 			t->tv_sec = 0;
-			t->tv_nsec = 020000000;
+			t->tv_nsec = 040000000;
 			nanosleep(t, NULL);
 	}
 #endif
diff --git a/hadaq/hwrace.h b/hadaq/hwrace.h
index ae7de41..cb328ee 100644
--- a/hadaq/hwrace.h
+++ b/hadaq/hwrace.h
@@ -9,7 +9,6 @@
 typedef struct HwRaceS {
   char name[16];
   Rc *rc;
-  LBma *lbma;
   LVme_L *buf;
   int currAddr;
   int trigNr;