Make getCards public available -- mm

diff --git a/hadaq/hardware.h b/hadaq/hardware.h
index 374d52313ffbd6cbabeace23d8c71b32e6a8e991..250f3fb981f63338ec5036e1cc96b4de8da3e32d 100644 (file)
--- a/hadaq/hardware.h
+++ b/hadaq/hardware.h
@@ -10,4 +10,51 @@ size_t Hardware_maxSubEvtSize(const Hardware * my);
 void Hardware_waitForTrigger(Hardware * my, void *subEvt);
 void Hardware_readout(Hardware * my, void *subEvt);
 
+static int getCards(Param *param, const char *subsystem, const char *cardtype, int *nCards, char **cards) {
+       int getCardsR;
+       int i;
+       char unitsS[PARAM_MAX_ARRAY_LEN][PARAM_MAX_VALUE_LEN];
+       char *units[PARAM_MAX_ARRAY_LEN];
+       int r;
+
+       for (i = 0; i < PARAM_MAX_ARRAY_LEN; i++) {
+               units[i] = unitsS[i];
+       }
+
+       if (0 > Param_getStringArray(param, subsystem, "unit", PARAM_MAX_ARRAY_LEN, &r, units) || r == 0) {
+               getCardsR = -1;
+               syslog(LOG_ERR, "Parameter %s(unit) not found, unknown list of VME modules", subsystem);
+       } else {
+               int unit;
+               int card;
+
+               getCardsR = 0;
+               card = 0;
+               for (unit = 0; unit < r; unit++) {
+                       char ct[PARAM_MAX_VALUE_LEN];
+                       int r;
+               
+                       if (Param_getString(param, units[unit], "cardtype", &r, ct) || r == 0) {
+                               syslog(LOG_ERR, "Parameter %s(cardtype) not found", units[unit]);
+                               getCardsR = -1;
+                       } else {
+                               if (strcmp(cardtype, ct) == 0) {
+                                       strcpy(cards[card++], units[unit]);
+                               }
+                       }
+               }
+               *nCards = card;
+       }
+
+       if (0 == getCardsR) {
+               int card;
+
+               syslog(LOG_INFO, "List of matching cards for subsystem %s, cardtype %s", subsystem, cardtype);
+               for (card = 0; card < *nCards; card++) {
+                       syslog(LOG_INFO, "%s", cards[card]);
+               }
+       }
+       return getCardsR;
+}
+
 #endif

diff --git a/hadaq/hwrich.c b/hadaq/hwrich.c
index 67ee53b3e7933551c95b2430bb9ee434833a4286..d50fcc6d9ccc6c4fa7b0fda1c6cd114a8cd68f24 100644 (file)
--- 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.25 2002-10-09 15:38:46 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.26 2002-10-15 12:40:23 hadaq Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -34,53 +34,6 @@ int Hardware_inSpill(const Hardware *my)
        return 0;
 }
 
-static int getCards(Param *param, const char *subsystem, const char *cardtype, int *nCards, char **cards) {
-       int getCardsR;
-       int i;
-       char unitsS[PARAM_MAX_ARRAY_LEN][PARAM_MAX_VALUE_LEN];
-       char *units[PARAM_MAX_ARRAY_LEN];
-       int r;
-
-       for (i = 0; i < PARAM_MAX_ARRAY_LEN; i++) {
-               units[i] = unitsS[i];
-       }
-
-       if (0 > Param_getStringArray(param, subsystem, "unit", PARAM_MAX_ARRAY_LEN, &r, units) || r == 0) {
-               getCardsR = -1;
-               syslog(LOG_ERR, "Parameter %s(unit) not found, unknown list of VME modules", subsystem);
-       } else {
-               int unit;
-               int card;
-
-               getCardsR = 0;
-               card = 0;
-               for (unit = 0; unit < r; unit++) {
-                       char ct[PARAM_MAX_VALUE_LEN];
-                       int r;
-               
-                       if (Param_getString(param, units[unit], "cardtype", &r, ct) || r == 0) {
-                               syslog(LOG_ERR, "Parameter %s(cardtype) not found", units[unit]);
-                               getCardsR = -1;
-                       } else {
-                               if (strcmp(cardtype, ct) == 0) {
-                                       strcpy(cards[card++], units[unit]);
-                               }
-                       }
-               }
-               *nCards = card;
-       }
-
-       if (0 == getCardsR) {
-               int card;
-
-               syslog(LOG_DEBUG, "List of matching cards for subsystem %s, cardtype %s", subsystem, cardtype);
-               for (card = 0; card < *nCards; card++) {
-                       syslog(LOG_DEBUG, "%s", cards[card]);
-               }
-       }
-       return getCardsR;
-}
-
 Hardware *newHardware(const char *subsystem)
 {
        Hardware *my;

diff --git a/hadaq/param.tcl b/hadaq/param.tcl
index 776fbfbca289d28483f0c15d3dc76f9495cd89c6..027c8cb940acd440f603b42ec51b222de3737363 100644 (file)
--- a/hadaq/param.tcl
+++ b/hadaq/param.tcl
@@ -37,6 +37,32 @@ set soft(size) 1024
 
 set dtu(cardbase) 0x44100000
 
+set show(unit0) ipc0
+set show(unit1) ipc1
+set show(unit2) ipc2
+set show(unit3) ipc3
+set show(unit4) ipc4
+set show(unit5) ipc5
+set show(unit6) ipc6
+set show(unit7) ipc7
+set show(unit8) ipc8
+set show(unit9) ipc9
+set show(unit10) ipc10
+set show(unit11) ipc11
+
+set ipc0(cardtype) ipc
+set ipc1(cardtype) ipc
+set ipc2(cardtype) ipc
+set ipc3(cardtype) ipc
+set ipc4(cardtype) ipc
+set ipc5(cardtype) ipc
+set ipc6(cardtype) ipc
+set ipc7(cardtype) ipc
+set ipc8(cardtype) ipc
+set ipc9(cardtype) ipc
+set ipc10(cardtype) ipc
+set ipc11(cardtype) ipc
+
 set ipc0(cardbase) 0x100000
 set ipc1(cardbase) 0x200000
 set ipc2(cardbase) 0x300000