From 0c058cccc94b452e06f210cd4d7bd0e3370c6dd3 Mon Sep 17 00:00:00 2001 From: hades Date: Wed, 8 Sep 1999 13:43:02 +0000 Subject: [PATCH] *** empty log message *** --- hadaq/Makefile | 22 +++++++++++----------- hadaq/hardware.h | 4 ++-- hadaq/hwsoft.c | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/hadaq/Makefile b/hadaq/Makefile index 04c6eeb..a020140 100644 --- 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 07eeb13..672d42e 100644 --- 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 e317522..4ff9623 100644 --- 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; -- 2.43.0