From 6ace6f279abd0eee2af7ee62497c01f23826eb21 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Wed, 29 May 2013 08:24:38 +0000
Subject: [PATCH] some basic changes

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@583 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../eigerDetectorServer/Makefile              |  6 +-
 .../slsDetectorFunctionList.c                 | 94 +++++--------------
 .../slsDetectorServer_defs.h                  |  2 +-
 3 files changed, 28 insertions(+), 74 deletions(-)

diff --git a/slsDetectorSoftware/eigerDetectorServer/Makefile b/slsDetectorSoftware/eigerDetectorServer/Makefile
index 388f2f801..2a4838959 100644
--- a/slsDetectorSoftware/eigerDetectorServer/Makefile
+++ b/slsDetectorSoftware/eigerDetectorServer/Makefile
@@ -1,12 +1,12 @@
-CC			=	g++#powerpc-4xx-softfloat-g++
-CLAGS		+=  -Wall -DDACS_INT   -DEIGERD  #-DSLS_DETECTOR_FUNCTION_LIST  #-DVIRTUAL
+CC			=	gcc#powerpc-4xx-softfloat-g++
+CLAGS		+=  -Wall -DDACS_INT   -DEIGERD  -DSLS_DETECTOR_FUNCTION_LIST  #-DVIRTUAL
 LDLIBS		+= 	-lm  -lstdc++ 
 
 PROGS		= 	eigerDetectorServer 
 DESTDIR		?= 	bin
 INSTMODE	= 	0777
 
-SRC_CLNT	=	slsDetectorServer.c slsDetectorServer_funcs.c communication_funcs.c #slsDetectorFunctionList.c 
+SRC_CLNT	=	slsDetectorServer.c slsDetectorServer_funcs.c communication_funcs.c slsDetectorFunctionList.c 
 OBJS 		= 	$(SRC_CLNT:.cpp=.o) 
 
 
diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
index ec8817edc..1faf31007 100644
--- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
@@ -7,37 +7,39 @@
 #include <string.h>
 
 
-
-
-extern int nModX;
-extern int nModBoard;
-extern int dataBytes;
-extern int dynamicRange;
 const int nChans=NCHAN;
 const int nChips=NCHIP;
 const int nDacs=NDAC;
 const int nAdcs=NADC;
-enum detectorSettings thisSettings;
-
-int sChan, sChip, sMod, sDac, sAdc;
 const int allSelected=-2;
 const int noneSelected=-1;
 
-
 sls_detector_module *detectorModules=NULL;
 int *detectorChips=NULL;
 int *detectorChans=NULL;
 dacs_t *detectorDacs=NULL;
 dacs_t *detectorAdcs=NULL;
 
+int nModY		=	NMAXMOD;
+int nModX		=	NMAXMOD;
+int dynamicRange=	DYNAMIC_RANGE;
+int dataBytes	=	NMAXMOD*NCHIP*NCHAN*2;
+int masterMode	=	NO_MASTER;
+int syncMode	=	NO_SYNCHRONIZATION;
+int timingMode	=	AUTO_TIMING;
+
+
+
+enum detectorSettings thisSettings;
+int sChan, sChip, sMod, sDac, sAdc;
+int nModBoard;
+extern int dataBytes;
+
 
 int initializeDetector(){
 
 	int imod;
-
 	int n=getNModBoard(X)*getNModBoard(Y);
-	/*nModX=n;*/
-
 #ifdef VERBOSE
 	printf("Board is for %d modules\n",n);
 #endif
@@ -166,32 +168,6 @@ double getADC(enum dacIndex ind,  int imod){
 
 
 
-
-int setChannel(sls_detector_channel myChan){
-	//template initChannelByNumber() from mcb_funcs.c
-
-	return myChan.reg;
-}
-
-
-int getChannel(sls_detector_channel *myChan){
-	//template getChannelbyNumber() from mcb_funcs.c
-	return FAIL;
-}
-
-
-
-int setChip(sls_detector_chip myChip){
-	//template initChipbyNumber() from mcb_funcs.c
-	return myChip.reg;
-}
-
-
-int getChip(sls_detector_chip *myChip){
-	//template getChipbyNumber() from mcb_funcs.c
-	return FAIL;
-}
-
 int setModule(sls_detector_module myChan){
 	//template initModulebyNumber() from mcb_funcs.c
 	return OK;
@@ -299,16 +275,22 @@ int setDynamicRange(int dr){
 	return 0;
 }
 
-int setROI(int mask){ //////?????????????????
-	return FAIL;
+
+
+enum readOutFlags setReadOutFlags(enum readOutFlags val){
+	//template setStoreInRAM from firmware_funcs.c
+	return -1;
 }
 
 
-int getROI(int *mask){ //////////?????????????????????
+
+
+int setROI(int n, ROI arg[], int *retvalsize, int *ret){
 	return FAIL;
 }
 
 
+
 int setSpeed(enum speedVariable arg, int val){
 	//template setClockDivider() from firmware_funcs.c
 	//CLOCK_DIVIDER
@@ -322,11 +304,6 @@ int setSpeed(enum speedVariable arg, int val){
 }
 
 
-enum readOutFlags setReadOutFlags(enum readOutFlags val){
-	//template setStoreInRAM from firmware_funcs.c
-	return -1;
-}
-
 
 int executeTrimming(enum trimMode mode, int par1, int par2, int imod){
 	// template  trim_with_noise from trimming_funcs.c
@@ -335,29 +312,6 @@ int executeTrimming(enum trimMode mode, int par1, int par2, int imod){
 
 
 
-
-int configureMAC(int ipad, long long int imacadd, long long int iservermacadd, int dtb){
-	//detector specific.
-	return FAIL;
-}
-
-
-int loadImage(enum imageType index, char *imageVals){
-	//detector specific.
-	return FAIL;
-}
-
-
-int readCounterBlock(int startACQ, char *counterVals){
-	//detector specific.
-	return FAIL;
-}
-
-int resetCounterBlock(int startACQ){
-	//detector specific.
-	return FAIL;
-}
-
 int calculateDataBytes(){
 	return 0;
 }
diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h b/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h
index 543f305e5..220c85513 100644
--- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h
@@ -25,7 +25,7 @@
 #define NCHANS 			NCHAN*NCHIP*NMAXMOD
 #define NDACS 			NDAC*NMAXMOD
 
-
+#define DYNAMIC_RANGE	16
 
 
 #endif /* SLSDETECTORSERVER_DEFS_H_ */