From d5271ecb46bc4d5fa1c640612b1624053051adfc Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Fri, 6 Jan 2012 14:06:34 +0000
Subject: [PATCH] added the phase shift at power on part

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

diff --git a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
index cd8f20248..958567ebf 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
@@ -167,36 +167,46 @@ int setDAQRegister()
       result=FAIL;
   }
 #ifdef VERBOSE
-  printf("DAQ reg:20916770:%d\n",reg);
+  printf("DAQ reg:20916770:%d",reg);
 #endif
   return result;
 }
 
 
+
 int setPhaseShiftOnce(){
-  u_int32_t addr, reg, val;
-  int result=OK, i,off;
+  u_int32_t addr, reg;
+  int result=OK, i,val,powerOn=0;
   addr=MULTI_PURPOSE_REG;
-  //off=15;
-  // mask=((0x1)<<off);
+  reg=bus_r(addr);
+#ifdef VERBOSE
+  printf("Multipurpose reg:%d\n",reg);
+#endif
+
+  //Checking if it is power on(negative number)
+  if(((reg&0xFFFF0000)>>16)>0){
+    bus_w(addr,0x0);   //clear the reg
+#ifdef VERBOSE
+    printf("Implementing Phase Shift-Reg:%d\n",bus_r(addr));
+#endif
+    //phase shift
+    for (i=1;i<PHASE_SHIFT;i++) {
+      bus_w(addr,(INT_RSTN_BIT|ENET_RESETN_BIT|SW1_BIT|PHASE_STEP_BIT));//0x2821
+      bus_w(addr,(INT_RSTN_BIT|ENET_RESETN_BIT|SW1_BIT&~PHASE_STEP_BIT));//0x2820
+     }
+    //confirming phase change by setting CHANGE_AT_POWER_ON_BIT(for later uses)
+    bus_w(addr,(CHANGE_AT_POWER_ON_BIT|
+		INT_RSTN_BIT|ENET_RESETN_BIT|SW1_BIT&~PHASE_STEP_BIT));
+  }
 
   reg=bus_r(addr);
-  if(reg
-  reg|=((0x1)<<off);
-  
-  // if(reg&
-  for (i=1;i<PHASE_SHIFT;i++) {
-    bus_w(addr,0x2821);
-    bus_w(addr,0x2820);
-  }
-  reg=bus_r(addr);
-  
-  //  bus_w(addr, 1<<
+  printf("\nREG:%d\n",reg);
 
   return result;
 }
 
 
+
 //aldos function volatile (not needed) 
 u_int16_t bus_w16(u_int32_t offset, u_int16_t data) {
   u_int16_t *ptr1;
diff --git a/slsDetectorSoftware/gotthardDetectorServer/registers_g.h b/slsDetectorSoftware/gotthardDetectorServer/registers_g.h
index 4bb5d1ce8..a2bb70263 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/registers_g.h
+++ b/slsDetectorSoftware/gotthardDetectorServer/registers_g.h
@@ -189,5 +189,29 @@
 #define OUTBUF_OFF 0
 #define OUTBUF_MASK 1
 
+
+/* multi purpose register */
+#define PHASE_STEP_BIT               0x00000001
+#define PHASE_STEP_OFFSET            0
+
+#define READOUT_BUSY_BIT             0x00000002
+#define FIFOTEST_BUSY_BIT            0x00000004 
+#define WAITING_FOR_TRIGGER_BIT      0x00000008
+#define DELAYBEFORE_BIT              0x00000010
+
+#define SW1_BIT                      0x00000020
+#define SW1_OFFSET                   5
+
+
+#define ENET_RESETN_BIT              0x00000800
+#define ENET_RESETN_OFFSET           11
+
+#define INT_RSTN_BIT                 0x00002000
+#define INT_RSTN_OFFSET              13
+
+#define CHANGE_AT_POWER_ON_BIT       0x00008000
+#define CHANGE_AT_POWER_ON_OFFSET    15
+
+
 #endif
 
diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
index 5d336cb7e..0d7ddd53d 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
@@ -68,7 +68,7 @@ int init_detector( int b) {
     initDetector();
     printf("\ninitdetector done! \n");
     setDummyRegister();
-    // setPhaseShiftOnce();
+    setPhaseShiftOnce();
     setDAQRegister();
     setSettings(GET_SETTINGS);