From 2af0e48a5a2e595b570f4ac6127ae19f8274dc80 Mon Sep 17 00:00:00 2001 From: hades Date: Sat, 11 Nov 2000 11:49:27 +0000 Subject: [PATCH] *** empty log message *** --- hadaq/hwship.c | 4 ++-- hadaq/hwshow.c | 6 +++--- hadaq/param.tcl | 17 +++++++++-------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/hadaq/hwship.c b/hadaq/hwship.c index 85dc765..d879354 100644 --- a/hadaq/hwship.c +++ b/hadaq/hwship.c @@ -97,10 +97,10 @@ int conHwShip(HwShip * my, const char *name, const Param *param) strcpy(my->name, name); - Param_getInt(param, my->name, "cardbase", ¶mWasFound, &cardBase); + Param_getInt(param, my->name, "ipc_vmebase", ¶mWasFound, &cardBase); if (!paramWasFound) { msglog(LOG_WARNING, - "Parameter %s(%s) not found, default = 0\n", my->name, "cardbase"); + "Parameter %s(%s) not found, default = 0\n", my->name, "ipc_vmebase"); cardBase = 0; } diff --git a/hadaq/hwshow.c b/hadaq/hwshow.c index 51459c0..46bab49 100644 --- a/hadaq/hwshow.c +++ b/hadaq/hwshow.c @@ -1,4 +1,4 @@ -static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.10 2000-11-08 12:07:42 hades Exp $"; +static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.11 2000-11-11 11:49:27 hades Exp $"; #define _POSIX_C_SOURCE 199309L #include @@ -13,7 +13,7 @@ static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/had #include "hwship.h" /* Set number of RCs here */ -#define NSHIPS 8 +#define NSHIPS 9 struct HardwareS { size_t maxSubEvtSize; @@ -52,7 +52,7 @@ Hardware *newHardware(void) char buf[16]; my->ship[i] = allocMem(sizeof(HwShip)); - sprintf(buf, "ship%d", i); + sprintf(buf, "ipc%d", i); if (0 > conHwShip(my->ship[i], buf, param)) { msglog(LOG_DEBUG, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); return NULL; diff --git a/hadaq/param.tcl b/hadaq/param.tcl index 75af2ec..5c15018 100644 --- a/hadaq/param.tcl +++ b/hadaq/param.tcl @@ -17,14 +17,15 @@ set soft(size) 1024 set dtu(cardbase) 0x44100000 -set ship0(cardbase) 0x100000 -set ship1(cardbase) 0x200000 -set ship2(cardbase) 0x300000 -set ship3(cardbase) 0x400000 -set ship4(cardbase) 0x500000 -set ship5(cardbase) 0x600000 -set ship6(cardbase) 0x700000 -set ship7(cardbase) 0x800000 +set ipc0(ipc_vmebase) 0x100000 +set ipc1(ipc_vmebase) 0x200000 +set ipc2(ipc_vmebase) 0x300000 +set ipc3(ipc_vmebase) 0x400000 +set ipc4(ipc_vmebase) 0x500000 +set ipc5(ipc_vmebase) 0x600000 +set ipc6(ipc_vmebase) 0x700000 +set ipc7(ipc_vmebase) 0x800000 +set ipc8(ipc_vmebase) 0xa00000 set race0(cardbase) 0x00000000 set race1(cardbase) 0x10000000 set race2(cardbase) 0x20000000 -- 2.43.0