UHRIX Callback function

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@476 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
maliakal_d
2013-02-26 16:31:55 +00:00
parent 3c26cac591
commit bb07b6db7d
4 changed files with 13 additions and 3 deletions

View File

@ -1,9 +1,9 @@
CC = g++ CC = g++
CLAGS += -DSLS_RECEIVER_FUNCTION_LIST -DGOTTHARDD #-DTESTWRITE CLAGS += -DSLS_RECEIVER_FUNCTION_LIST -DGOTTHARDD -UHRIXCALLBACK #-DTESTWRITE
LDLIBS += -lm -lstdc++ -lpthread LDLIBS += -lm -lstdc++ -lpthread
INCLUDES = -I ../MySocketTCP -I ../commonFiles -I ../usersFunctions -I ../slsDetectorAnalysis -I . INCLUDES = -I ../MySocketTCP -I ../commonFiles -I ../usersFunctions -I ../slsDetectorAnalysis -I .
SRC_CLNT = slsReceiver.cpp ../MySocketTCP/MySocketTCP.cpp slsReceiver_funcs.cpp slsReceiverFunctionList.cpp ../usersFunctions/usersFunctions.cpp SRC_CLNT = slsReceiver.cpp ../MySocketTCP/MySocketTCP.cpp slsReceiver_funcs.cpp UHRIXCallback.cpp slsReceiverFunctionList.cpp ../usersFunctions/usersFunctions.cpp
PROGS = slsReceiver PROGS = slsReceiver
DESTDIR ?= bin DESTDIR ?= bin

View File

@ -1,4 +1,6 @@
#include "UHRIXCallback.h"
int UHRIXCallbackDataFunc(char* d, int np, FILE* fd, void* p){ int UHRIXCallbackDataFunc(char* d, int np, FILE* fd, void* p){
//#ifdef VERBOSE //#ifdef VERBOSE

View File

@ -1,3 +1,3 @@
#include <iostream>
int UHRIXCallbackDataFunc(char* d, int np, FILE* fd, void* p); int UHRIXCallbackDataFunc(char* d, int np, FILE* fd, void* p);

View File

@ -11,6 +11,10 @@
#include "usersFunctions.h" #include "usersFunctions.h"
#endif #endif
#ifdef UHRIXCALLBACK
#include "UHRIXCallback.h"
#endif
#include <signal.h> // SIGINT #include <signal.h> // SIGINT
#include <sys/stat.h> // stat #include <sys/stat.h> // stat
#include <sys/socket.h> // socket(), bind(), listen(), accept(), shut down #include <sys/socket.h> // socket(), bind(), listen(), accept(), shut down
@ -84,6 +88,10 @@ slsReceiverFunctionList::slsReceiverFunctionList(bool shortfname):
//to test write receiver data call back //to test write receiver data call back
registerWriteReceiverDataCallback(&defaultWriteReceiverDataFunc, NULL); registerWriteReceiverDataCallback(&defaultWriteReceiverDataFunc, NULL);
#endif #endif
#ifdef UHRIXCALLBACK
registerWriteReceiverDataCallback(&UHRIXCallbackDataFunc, latestData);
#endif
} }