From 7ed37b2e3f6f847b732aca207d1bd736f10e3479 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Mon, 20 Feb 2012 13:46:41 +0000
Subject: [PATCH] moving digital test bit in configuremac function to the
 digital test function

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@125 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../gotthardDetectorServer/firmware_funcs.h   |  2 ++
 .../gotthardDetectorServer/mcb_funcs.h        |  2 --
 .../gotthardDetectorServer/server_funcs.c     | 32 +++++++++++++------
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.h b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.h
index 9a4de9b59..72cb72922 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.h
+++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.h
@@ -61,6 +61,8 @@ u_int32_t testFifos(void);
 u_int32_t testFpga(void);
 u_int32_t testRAM(void);
 int testBus(void);
+int setDigitalTestBit(int ival);
+
 int64_t set64BitReg(int64_t value, int aLSB, int aMSB);
 int64_t get64BitReg(int aLSB, int aMSB);
 
diff --git a/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.h b/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.h
index a93f76200..2c49bb6c8 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.h
+++ b/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.h
@@ -16,8 +16,6 @@
 #define DEFAULTGAIN {11.66,9.32,14.99}
 #define DEFAULTOFFSET {817.5,828.6,804.2}
 
-
-
 // DAC definitions
 enum dacsVal{VREF_DS, VCASCN_PB, VCASCP_PB, VOUT_CM, VCASC_OUT, VIN_CM, VREF_COMP, IB_TESTC,HIGH_VOLTAGE, CONFGAIN};
 
diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
index 6a3cb55a2..48ae92fe3 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
@@ -39,7 +39,7 @@ char *dataretval=NULL;
 int nframes, iframes, dataret;
 char mess[1000]; 
 
-
+int digitalTestBit = 0;
 
    
 
@@ -625,6 +625,7 @@ int digital_test(int file_des) {
   int n=0;
   int ibit=0;
   int ow;
+  int ival;
   enum digitalTestMode arg; 
   
   sprintf(mess,"Can't send digital test\n");
@@ -709,6 +710,23 @@ int digital_test(int file_des) {
   case DETECTOR_SOFTWARE_TEST:
     retval=testFpga();
     break;
+  case DIGITAL_BIT_TEST:
+	  n = receiveDataOnly(file_des,&ival,sizeof(ival));
+	  if (n < 0) {
+		  sprintf(mess,"Error reading from socket\n");
+		  retval=FAIL;
+	  }
+#ifdef VERBOSE
+	  printf("with value %d\n", ival);
+#endif
+	  if (differentClients==1 && lockStatus==1) {
+		  ret=FAIL;
+		  sprintf(mess,"Detector locked by %s\n",lastClientIP);
+		  break;
+	  }
+	  digitalTestBit = ival;
+	  retval=digitalTestBit;
+	  break;
   default:
     printf("Unknown digital test required %d\n",arg);
     ret=FAIL;
@@ -2705,7 +2723,7 @@ int configure_mac(int file_des) {
   int retval;
   int ret=OK;
   char arg[3][50];
-  int n,i,ival;
+  int n,i;
 
   int imod=0;//should be in future sent from client as -1, arg[2]
   int ipad;
@@ -2720,18 +2738,12 @@ int configure_mac(int file_des) {
     sprintf(mess,"Error reading from socket\n");
     ret=FAIL;
   }
-  n = receiveDataOnly(file_des,&ival,sizeof(ival));
-  if (n < 0) {
-    sprintf(mess,"Error reading from socket\n");
-    ret=FAIL;
-  }
-
 
   sscanf(arg[0], "%x", &ipad); 
   sscanf(arg[1], "%llx", &imacadd);
   sscanf(arg[2], "%llx", &iservermacadd);
 #ifdef VERBOSE
-  printf("\nival %d\t",ival); 
+  printf("\ndigital_test_bit in server %d\t",digitalTestBit);
   printf("\nipadd %x\t",ipad); 
   printf("destination ip is %d.%d.%d.%d = 0x%x \n",(ipad>>24)&0xff,(ipad>>16)&0xff,(ipad>>8)&0xff,(ipad)&0xff,ipad);
   printf("macad:%llx\n",imacadd);
@@ -2753,7 +2765,7 @@ int configure_mac(int file_des) {
 #endif
 #ifdef MCB_FUNCS
   if (ret==OK) {
-    retval=configureMAC(ipad,imacadd,iservermacadd,ival);
+    retval=configureMAC(ipad,imacadd,iservermacadd,digitalTestBit);
     if(retval==-1) ret=FAIL;
   }
 #endif