From c5b3f10669cbf6224f861787712764929c602f38 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Thu, 11 Apr 2013 12:32:26 +0000 Subject: [PATCH] changed gotthard server type to be defined in makefile and not in mcb git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@508 951219d9-93cf-4727-9268-0efd64621fa3 --- .../gotthardDetectorServer/Makefile | 2 +- .../gotthardDetectorServer/Makefile.virtual | 2 +- .../gotthardDetectorServer/mcb_funcs.c | 1 - .../gotthardDetectorServer/server_funcs.c | 17 +++++++++++++---- .../gotthardDetectorServer/svnInfoGotthard.h | 8 ++++---- .../moenchDetectorServer/svnInfoMoench.h | 11 +++++++++++ .../mythenDetectorServer/svnInfoMythen.h | 8 ++++---- slsDetectorSoftware/slsDetector/svnInfoLib.h | 4 ++-- .../slsReceiver/svnInfoReceiver.h | 4 ++-- 9 files changed, 38 insertions(+), 19 deletions(-) diff --git a/slsDetectorSoftware/gotthardDetectorServer/Makefile b/slsDetectorSoftware/gotthardDetectorServer/Makefile index 75d6800cd..98f39145e 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/Makefile +++ b/slsDetectorSoftware/gotthardDetectorServer/Makefile @@ -6,7 +6,7 @@ CROSS = bfin-uclinux- CC = $(CROSS)gcc -CFLAGS += -Wall -DMCB_FUNCS -DDACS_INT -DDEBUG #-DVERBOSE #-DVERYVERBOSE #-DVIRTUAL #-DDACS_INT_CSERVER +CFLAGS += -Wall -DGOTTHARDD -DMCB_FUNCS -DDACS_INT -DDEBUG #-DVERBOSE #-DVERYVERBOSE #-DVIRTUAL #-DDACS_INT_CSERVER PROGS= gotthardDetectorServer diff --git a/slsDetectorSoftware/gotthardDetectorServer/Makefile.virtual b/slsDetectorSoftware/gotthardDetectorServer/Makefile.virtual index 9eef2f616..4f563e2a0 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/Makefile.virtual +++ b/slsDetectorSoftware/gotthardDetectorServer/Makefile.virtual @@ -2,7 +2,7 @@ DESTDIR ?= ./ CC = gcc -CFLAGS += -Wall -DMCB_FUNCS -DDACS_INT -DDEBUG -DVIRTUAL +CFLAGS += -Wall -DGOTTHARDD -DMCB_FUNCS -DDACS_INT -DDEBUG -DVIRTUAL PROGS= $(DESTDIR)/gotthardVirtualServer diff --git a/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.c index e9352359f..d05db2a71 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.c +++ b/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.c @@ -26,7 +26,6 @@ const int nChans=NCHAN; const int nChips=NCHIP; const int nDacs=NDAC; const int nAdcs=NADC; -const enum detectorType myDetectorType=GOTTHARD; enum detectorSettings thisSettings; int sChan, sChip, sMod, sDac, sAdc; diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c index bba9c94e3..4a01e2d1d 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c +++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c @@ -17,12 +17,21 @@ int (*flist[256])(int); -#ifdef MCB_FUNCS -extern const enum detectorType myDetectorType; -#endif -#ifndef MCB_FUNCS +//defined in the detector specific file +#ifdef MYTHEND +const enum detectorType myDetectorType=MYTHEN; +#elif GOTTHARDD const enum detectorType myDetectorType=GOTTHARD; +#elif EIGERD +const enum detectorType myDetectorType=EIGER; +#elif PICASSOD +const enum detectorType myDetectorType=PICASSO; +#else +const enum detectorType myDetectorType=GENERIC; #endif + + + extern int nModX; extern int nModY; extern int dataBytes; diff --git a/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h b/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h index 6c9842ea9..18bc30a77 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h +++ b/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer" //#define SVNREPPATH "" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x504 +//#define SVNREV 0x507 //#define SVNKIND "" //#define SVNSCHED "" -#define SVNAUTH "bergamaschi" -#define SVNREV 0x504 -#define SVNDATE 0x20130408 +#define SVNAUTH "l_maliakal_d" +#define SVNREV 0x507 +#define SVNDATE 0x20130411 // diff --git a/slsDetectorSoftware/moenchDetectorServer/svnInfoMoench.h b/slsDetectorSoftware/moenchDetectorServer/svnInfoMoench.h index e69de29bb..92045ddc4 100644 --- a/slsDetectorSoftware/moenchDetectorServer/svnInfoMoench.h +++ b/slsDetectorSoftware/moenchDetectorServer/svnInfoMoench.h @@ -0,0 +1,11 @@ +//#define SVNPATH "" +#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/moenchDetectorServer" +//#define SVNREPPATH "" +#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" +//#define SVNREV 0x507 +//#define SVNKIND "" +//#define SVNSCHED "" +#define SVNAUTH "l_maliakal_d" +#define SVNREV 0x507 +#define SVNDATE 0x20130411 +// diff --git a/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h b/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h index e71fc46de..bbd516427 100644 --- a/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h +++ b/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer" //#define SVNREPPATH "" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x504 +//#define SVNREV 0x507 //#define SVNKIND "" //#define SVNSCHED "" -#define SVNAUTH "bergamaschi" -#define SVNREV 0x504 -#define SVNDATE 0x20130408 +#define SVNAUTH "l_maliakal_d" +#define SVNREV 0x507 +#define SVNDATE 0x20130411 // diff --git a/slsDetectorSoftware/slsDetector/svnInfoLib.h b/slsDetectorSoftware/slsDetector/svnInfoLib.h index 94dfac30b..33ea91e26 100644 --- a/slsDetectorSoftware/slsDetector/svnInfoLib.h +++ b/slsDetectorSoftware/slsDetector/svnInfoLib.h @@ -2,10 +2,10 @@ #define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware" //#define SVNREPPATH "" #define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x506 +//#define SVNREV 0x507 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTHLIB "l_maliakal_d" -#define SVNREVLIB 0x506 +#define SVNREVLIB 0x507 #define SVNDATELIB 0x20130411 // diff --git a/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h b/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h index 38ccb75bb..f3e7d6100 100644 --- a/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h +++ b/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver" //#define SVNREPPATH "" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x506 +//#define SVNREV 0x507 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "l_maliakal_d" -#define SVNREV 0x506 +#define SVNREV 0x507 #define SVNDATE 0x20130411 //