From 78d2fa5bc6b0fd54fd3e14119ffd81af97ac8d13 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Fri, 13 Sep 2013 09:22:06 +0000
Subject: [PATCH] the right mapping for pc and moving includes below the c
 includes

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@667 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../eigerDetectorServer/Makefile              |  4 +--
 .../slsDetectorFunctionList.c                 | 29 ++++++++++++++-----
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/slsDetectorSoftware/eigerDetectorServer/Makefile b/slsDetectorSoftware/eigerDetectorServer/Makefile
index 8cac0da20..7cd3e24a3 100644
--- a/slsDetectorSoftware/eigerDetectorServer/Makefile
+++ b/slsDetectorSoftware/eigerDetectorServer/Makefile
@@ -21,10 +21,8 @@ boot: $(OBJS) $(OBJS2)
 $(PROGS): 
 	echo $(OBJS) $(OBJS2)
 	mkdir -p $(DESTDIR) 
-#	$(CC) $(SRC_CLNT) $(CLAGS) $(LDLIBS) -o $@   
+	#if you use g++ for pc, uncomment swapData in SendData() and ReceiveData() in communication_funcs.c
 	$(CCX)  -o $@  $(SRC_CLNT) $(SRC_CLNT2) $(CFLAGS) $(LDLIBS) 
-#	$(CCX)  -c   $(SRC_CLNT) $(CLAGS) $(LDLIBS)
-#	$(CCX) -o $@    slsDetectorServer.o slsDetectorServer_funcs.o communication_funcs.o slsDetectorFunctionList.o 
 	mv $(PROGS) $(DESTDIR)
 
 clean:
diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
index b804903b5..349a3eeb8 100644
--- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
@@ -1,8 +1,5 @@
 #ifdef SLS_DETECTOR_FUNCTION_LIST
 
-#include "slsDetectorFunctionList.h"
-#include "Eiger.h"
-#include "svnInfoEiger.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -11,7 +8,9 @@
 #include <sys/mman.h>		//PROT_READ,PROT_WRITE,MAP_FILE,MAP_SHARED,MAP_FAILED
 #include <fcntl.h>			//O_RDWR
 
-
+#include "slsDetectorFunctionList.h"
+#include "svnInfoEiger.h"
+#include "Eiger.h"
 
 const int nChans=NCHAN;
 const int nChips=NCHIP;
@@ -53,7 +52,14 @@ int64_t period=(int64_t)1e9;
 int64_t delay=0;
 int64_t gates=0;
 
-/** temporary
+
+
+//Eiger* eiger;
+
+
+
+
+/** temporary*/
 u_int32_t CSP0BASE;
 int mapCSP0(void) {
 	CSP0BASE = (u_int32_t)malloc(0xFFFFFFF);
@@ -62,7 +68,7 @@ int mapCSP0(void) {
 	printf("CSPOBASE=from %08x to %x\n",CSP0BASE,CSP0BASE+0xFFFFFFF);
 	return OK;
 }
-*/
+/*
 #define CSP0 				  	0xC4100000		//XPAR_PLB_LL_FIFO_AURORA_DUAL_CTRL_FEB_LEFT_BASEADDR
 #define MEM_SIZE 			  	0xFFFFFFF
 
@@ -90,7 +96,7 @@ int mapCSP0(void) {
 
 	return OK;
 }
-
+*/
 
 
 int initializeDetectorStructure(){
@@ -144,6 +150,13 @@ int initializeDetectorStructure(){
 
 
 int setupDetector(){
+	//eiger = new Eiger();
+	//eiger->Init();
+	//ReadSetUpFileToAddModules(std::string file_name);
+	//ReadSetUpFile(unsigned int module_num, std::string file_name);
+	//eiger->CheckSetup();
+
+
 	//testFpga();
 	//testRAM();
 
@@ -286,6 +299,8 @@ int setDAC(enum detDacIndex ind, int val, int imod){
 	if (val >= 0)
 		dacvalues[(int)ind] = val;
 
+	//eiger->SetDac()
+
 	//template initDACbyIndexDACU from mcb_funcs.c
 
 	//check that slsDetectorServer_funcs.c set_dac() has all the specific dac enums