From 5ac4860c6eab316d871d8019dd01b8ec4b55da23 Mon Sep 17 00:00:00 2001 From: hades Date: Tue, 21 Nov 2000 12:09:17 +0000 Subject: [PATCH] *** empty log message *** --- hadaq/hwrace.c | 6 ++++-- hadaq/hwrich.c | 10 ++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/hadaq/hwrace.c b/hadaq/hwrace.c index bf5b85f..56d5dac 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.9 2000-11-08 07:53:23 hades Exp $"; +static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrace.c,v 6.10 2000-11-21 12:09:17 hades Exp $"; #define _POSIX_C_SOURCE 199309L #include @@ -57,7 +57,7 @@ int conHwRace(HwRace *my, const char *name, const Param *param) my->rc = allocMem(sizeof(Rc)); if (0 > conRc(my->rc, "rc", cardBase)) { - msglog(LOG_DEBUG, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + msglog(LOG_ERR, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); return -1; } @@ -134,7 +134,9 @@ int HwRace_readSubEvt(HwRace *my, void *subEvt) nanosleep(t, NULL); } #endif +#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) { diff --git a/hadaq/hwrich.c b/hadaq/hwrich.c index f1deaa0..e60c420 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.11 2000-11-11 13:19:41 hades Exp $"; +static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.12 2000-11-21 12:09:17 hades Exp $"; #define _POSIX_C_SOURCE 199309L #include @@ -21,7 +21,7 @@ static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/had #include "hwrace.h" /* Set number of RCs here */ -#define NRACES 2 +#define NRACES 4 struct HardwareS { size_t maxSubEvtSize; @@ -58,7 +58,7 @@ Hardware *newHardware(void) #endif if (0 > conParam(param)) { - msglog(LOG_DEBUG, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + msglog(LOG_ERR, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); return NULL; } my = allocMem(sizeof(Hardware)); @@ -72,7 +72,7 @@ Hardware *newHardware(void) my->race[i] = allocMem(sizeof(HwRace)); sprintf(buf, "race%d", i); if (0 > conHwRace(my->race[i], buf, param)) { - msglog(LOG_DEBUG, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + msglog(LOG_ERR, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); return NULL; } } @@ -167,5 +167,7 @@ void Hardware_readout(Hardware *my, void *partEvt) SubEvt_setSize(partEvt, (char *)subEvt - (char *)partEvt); SubEvt_setId(partEvt, 0); +#ifndef NDEBUG msglog(LOG_DEBUG, "partEvt: %s\n", SubEvt_2charP(partEvt)); +#endif } -- 2.43.0