*** empty log message ***

diff --git a/hadaq/Makefile b/hadaq/Makefile
index 04c6eeb608175b1cc6121b2ff0cef17b1c841122..a020140c9e16f2ad5204c07091be9e7905db3727 100644 (file)
--- a/hadaq/Makefile
+++ b/hadaq/Makefile
@@ -1,16 +1,16 @@
 # UNIX
-CC = c89
-RPCGEN = rpcgen
-LOADLIBES = -L/usr/local/lib/ -lhadesstd -L/usr/fore/lib -latm -lrt -ltk -lX11 -ltcl -lm
-INCLUDES = -I/usr/local/include -I/usr/fore/include
-DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT
-
-# UNIX w/o ATM
 #CC = c89
 #RPCGEN = rpcgen
-#LOADLIBES = -L/usr/local/lib/ -lhadesstd -llvme -lrt -ltk -lX11 -ltcl -lm
+#LOADLIBES = -L/usr/local/lib/ -lhadesstd -L/usr/fore/lib -latm -lrt -ltk -lX11 -ltcl -lm
 #INCLUDES = -I/usr/local/include -I/usr/fore/include
-#DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM
+#DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT
+
+# UNIX w/o ATM
+CC = c89
+RPCGEN = rpcgen
+LOADLIBES = -L/usr/local/lib/ -lhadesstd -llvme -lrt -ltk -lX11 -ltcl -lm
+INCLUDES = -I/usr/local/include -I/usr/fore/include
+DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM
 
 # Linux
 #CC = gcc
@@ -35,9 +35,9 @@ DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT
 
 CFLAGS = -g $(INCLUDES) $(DEFINES)
 
-HW_OBJS = hwtof.o hwv775.o hwv878.o hwv488.o hwdtu.o hwsis3801.o
+#HW_OBJS = hwtof.o hwv775.o hwv878.o hwv488.o hwdtu.o hwsis3801.o
 #HW_OBJS = hwrich.o hwrace.o rc.o
-#HW_OBJS = hwsoft.o
+HW_OBJS = hwsoft.o
 
 
 DAQ_XMANAGE_OBJS = tcldaq.o tkAppInit.o \

diff --git a/hadaq/hardware.h b/hadaq/hardware.h
index 07eeb13dd69663aded8febf05a587cbbe1074ce8..672d42ef949149acdc623505c47feca7a4192263 100644 (file)
--- a/hadaq/hardware.h
+++ b/hadaq/hardware.h
@@ -7,7 +7,7 @@ Hardware *newHardware(void);
 void deleteHardware(Hardware * my);
 int Hardware_inSpill(const Hardware * my);
 size_t Hardware_maxSubEvtSize(const Hardware * my);
-void Hardware_waitForTrigger(const Hardware * my, void *subEvt);
-void Hardware_readout(const Hardware * my, void *subEvt);
+void Hardware_waitForTrigger(Hardware * my, void *subEvt);
+void Hardware_readout(Hardware * my, void *subEvt);
 
 #endif

diff --git a/hadaq/hwsoft.c b/hadaq/hwsoft.c
index e317522d405b96f4f0bd8f8a6a7c25dfa2c8cfa0..4ff9623b03af2d7925f7b644a2ac1210d06faefa 100644 (file)
--- a/hadaq/hwsoft.c
+++ b/hadaq/hwsoft.c
@@ -45,7 +45,7 @@ void deleteHardware(Hardware *my)
        freeMem(my);
 }
 
-void Hardware_waitForTrigger(const Hardware *my, void *subEvt)
+void Hardware_waitForTrigger(Hardware *my, void *subEvt)
 {
        static int nextId = SubEvtId_trigCode;
        struct timespec tS, *t = &tS;
@@ -81,7 +81,7 @@ void Hardware_waitForTrigger(const Hardware *my, void *subEvt)
        }
 }
 
-void Hardware_readout(const Hardware *my, void *subEvt)
+void Hardware_readout(Hardware *my, void *subEvt)
 {
        UInt4 *data = SubEvt_data(subEvt);
        UInt4 *first = data;