From 55ab200dbd338e9358f8444787a31a9a87a9dedd Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Wed, 9 Nov 2011 14:49:05 +0000
Subject: [PATCH] Added 100 read writes to test fpga

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@45 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../gotthardDetectorServer/firmware_funcs.c   | 74 +++++++++++--------
 .../gotthardDetectorServer/registers_g.h      |  2 +-
 2 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
index 13e97ae69..dec2b9eda 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
@@ -131,42 +131,52 @@ int setDummyRegister() {
 	valw=((valw&(~(0x1<<ddx)))+(((codata>>(24-i))&0x1)<<ddx));bus_w(offw,valw);//write data (i)
 	//	printf("%d ", ((codata>>(24-i))&0x1));
 	valw=((valw&(~(0x1<<cdx)))+(0x1<<cdx));bus_w(offw,valw);//clkup
-      }
-      valw=((valw&(~(0x1<<csdx)))+(0x1<<csdx));bus_w(offw,valw); //csup
-      valw=(valw&(~(0x1<<cdx)));bus_w(offw,valw); //cldwn
-      valw=0xffff; bus_w(offw,(valw)); // stop point =start point of course 
-      printf("Writing %d in DAC(0-7) %d \n",dacvalue,dacnum);
-    }
-*/
+	}
+	valw=((valw&(~(0x1<<csdx)))+(0x1<<csdx));bus_w(offw,valw); //csup
+	valw=(valw&(~(0x1<<cdx)));bus_w(offw,valw); //cldwn
+	valw=0xffff; bus_w(offw,(valw)); // stop point =start point of course 
+	printf("Writing %d in DAC(0-7) %d \n",dacvalue,dacnum);
+	}
+  */
   u_int32_t val,addr;
 
   addr = DUMMY_REG;
   // (else use bs_w16)
-
-
- //dummy register
-  val=45;
-  bus_w(addr, val);
-  val=bus_r(addr);
-  if (val==45) {
-    printf("FPGA dummy register ok!! %x\n",val);
-  } else {
-    printf("FPGA dummy register wrong!! %x instead of 0xF0F0F0F0 \n",val);
-    result=FAIL;
-    //    return FAIL;
-  }
-  //dummy register
-  val=0x0F0F0F0F;
-  bus_w(addr, val);
-  val=bus_r(addr);
-  if (val==0x0F0F0F0F) {
-    printf("FPGA dummy register ok!! %x\n",val);
-  } else {
-    printf("FPGA dummy register wrong!! %x instead of 0x0F0F0F0F \n",val);
-    result=FAIL;
-    //    return FAIL;
-  }
-    
+  int i;
+  for(i=0;i<100;i++)
+    if(result==OK)
+      {
+	//dummy register
+	val=45;
+	bus_w(addr, val);
+	val=bus_r(addr);
+	if (val!=45) {
+	  printf("ATTEMPT:%d:\tFPGA dummy register wrong!! %x instead of 0xF0F0F0F0 \n",i,val);
+	  result=FAIL;
+	}
+	//dummy register
+	val=0x0F0F0F0F;
+	bus_w(addr, val);
+	val=bus_r(addr);
+	if (val!=0x0F0F0F0F) {
+	  printf("ATTEMPT:%d:\tFPGA dummy register wrong!! %x instead of 0x0F0F0F0F \n",i,val);
+	  result=FAIL;
+	}
+	//dummy register
+	val=0xF0F0F0F0;
+	bus_w(DUMMY_REG, val);
+	val=bus_r(DUMMY_REG);
+	if (val!=0xF0F0F0F0)  {
+	  printf("ATTEMPT:%d:\tFPGA dummy register wrong!! %x instead of 0xF0F0F0F0 \n",i,val);
+	  result=FAIL;
+	}
+      }
+  if(result==OK)
+    {
+      printf("\n\n----------------------------------------------------------------------------------------------");
+      printf("\nATTEMPT 100: FPGA DUMMY REGISTER OK!!\n");
+      printf("----------------------------------------------------------------------------------------------\n\n");
+    }
   return result;
 }
 
diff --git a/slsDetectorSoftware/gotthardDetectorServer/registers_g.h b/slsDetectorSoftware/gotthardDetectorServer/registers_g.h
index ae7a2d84a..b0861bdb7 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/registers_g.h
+++ b/slsDetectorSoftware/gotthardDetectorServer/registers_g.h
@@ -97,7 +97,7 @@
 #define STOP_EXPOSURE_BIT   0x00000080  
 #define START_TRAIN_BIT     0x00000100  
 #define STOP_TRAIN_BIT      0x00000200  
-#define SYNC_RESET          0x80000000
+#define SYNC_RESET          0x00000400
 
 /* for status register */
 #define RUN_BUSY_BIT             0x00000001