Changes regarding Version 0.4.1 of "runctrl"-document. BS.

diff --git a/hadaq/daq_lib.c b/hadaq/daq_lib.c
index 3dd6feeb6d4fb9c5c1948669adf31cc2f50a36a4..e76eee4bfda0cf8961a0b429d2f6b70bb48d0852 100644 (file)
--- a/hadaq/daq_lib.c
+++ b/hadaq/daq_lib.c
@@ -1,12 +1,14 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/daq_lib.c,v 6.10 2001-11-18 11:56:20 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/daq_lib.c,v 6.11 2002-01-24 13:03:24 hadaq Exp $";
 
+#define _POSIX_C_SOURCE 199309L
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <lvme.h>
+
 #include <allParam.h>
 #include "worker.h"
+
 #include "daq_lib.h"
 
 static void exportSetup(const Param *p) {
@@ -21,17 +23,20 @@ static void exportSetup(const Param *p) {
 int Daq_reset(const char *n, const Param *p)
 {
        exportSetup(p);
-       Daq_stop(n, p);
 
+       return Daq_stop(n, p);
+}
+
+int Daq_loadThresholds(const char *n, const Param *p)
+{
        return 0;
 }
 
 int Daq_init(const char *n, const Param *p)
 {
        exportSetup(p);
-       Daq_reset(n, p);
 
-       return 0;
+       return Daq_reset(n, p);
 }
 
 int Daq_start(const char *n, const Param *p)
@@ -51,13 +56,58 @@ int Daq_start(const char *n, const Param *p)
 int Daq_stop(const char *n, const Param *p)
 {
        exportSetup(p);
+
        Worker_stop(n, 15);
        return 0;
 }
 
+int Daq_initialized(const char *n, const Param *p)
+{
+       return -1;
+}
+
+int Daq_running(const char *n, const Param *p)
+{
+       return -1;
+}
+
+int Daq_lvl1Busy(const char *n, const Param *p)
+{
+       return 0;
+}
+
+int Daq_lvl2Busy(const char *n, const Param *p)
+{
+       return 0;
+}
+
+int Daq_error(const char *n, const Param *p)
+{
+       return 0;
+}
+
+int Daq_statusString(const char *n, const Param *p, const char *stat, char *stri
+ng)
+{
+       strcpy(string, "Dummy status string.\n");
+       return 0;
+}
+unsigned long int Daq_statusRegister(const char *n, const Param *p, const char *
+stat)
+{
+       unsigned long int retVal;
+       if (Worker_getStatistic(n, stat, retVal)) {
+               return 0;
+       }
+       return retVal;
+}
+
+#ifndef EPICS_RUNCTRL
 int Daq_status(const char *n, const Param *p)
 {
        exportSetup(p);
+
        puts(Worker_status(n));
        return 0;
 }
+#endif

diff --git a/hadaq/daq_lib.h b/hadaq/daq_lib.h
index 900e17454773a627c93ac1aca6e4daf46ecd183b..45e7d2e476f917f6f3708a37e10ad7c58d0713c9 100644 (file)
--- a/hadaq/daq_lib.h
+++ b/hadaq/daq_lib.h
@@ -3,10 +3,20 @@
 
 #include <allParam.h>
 
-int Daq_init(const char *name, const Param *param);
-int Daq_reset(const char *name, const Param *param);
-int Daq_start(const char *name, const Param *param);
-int Daq_stop(const char *name, const Param *param);
-int Daq_status(const char *name, const Param *param);
+int Daq_init(const char *, const Param *);
+int Daq_loadThresholds(const char *, const Param *);
+int Daq_reset(const char *, const Param *);
+int Daq_start(const char *, const Param *);
+int Daq_stop(const char *, const Param *);
+int Daq_initialized(const char *, const Param *);
+int Daq_running(const char *, const Param *);
+int Daq_lvl1Busy(const char *, const Param *);
+int Daq_lvl2Busy(const char *, const Param *);
+int Daq_error(const char *, const Param *);
+int Daq_statusString(const char *, const Param *, const char *, char *);
+unsigned long int Daq_statusRegister(const char *, const Param *, const char *);
+#ifndef EPICS_RUNCTRL
+int Daq_status(const char *, const Param *);
+#endif
 
 #endif