From 1770045bcec6bd8a1f13209538ec9afca7264809 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Fri, 6 Jan 2012 10:02:55 +0000
Subject: [PATCH] Modified upto DAQ reg

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@75 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../gotthardDetectorServer/firmware_funcs.c   | 74 ++++++++++++-------
 .../gotthardDetectorServer/firmware_funcs.h   |  3 +
 .../gotthardDetectorServer/mcb_funcs.c        |  1 +
 .../gotthardDetectorServer/mcb_funcs.h        |  2 +-
 .../gotthardDetectorServer/registers_g.h      |  1 +
 .../gotthardDetectorServer/server_defs.h      |  2 +
 .../gotthardDetectorServer/server_funcs.c     |  5 +-
 7 files changed, 58 insertions(+), 30 deletions(-)

diff --git a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
index 6887e45ec..cd8f20248 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
@@ -111,33 +111,6 @@ int mapCSP0(void) {
 
 int setDummyRegister() {
   int result = OK;
-  /*
-  //to check if the dac really works with aldos code
-  int dacnum,dacvalue=700;
-  u_int32_t offw,codata;
-  u_int16_t valw; 
-  int iru,i,ddx,csdx,cdx;
-  offw=0x37;
-  for(dacnum=0;dacnum<8;dacnum++)
-    {
-      ddx=2; csdx=0; cdx=1;
-      codata=((((0x2)<<4)+((dacnum)&0xf))<<16)+((dacvalue<<4)&0xfff0);  
-  
-      valw=0xffff; bus_w(offw,(valw)); // start point
-      valw=((valw&(~(0x1<<csdx))));bus_w(offw,valw); //chip sel bar down
-      for (i=1;i<25;i++) {
-
-      valw=(valw&(~(0x1<<cdx)));bus_w(offw,valw); //cldwn	
-      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);
-      }
-  */
   volatile u_int32_t val,addr;
   addr = DUMMY_REG;
   int i;
@@ -173,12 +146,57 @@ int setDummyRegister() {
     {
       printf("\n\n----------------------------------------------------------------------------------------------");
       printf("\nATTEMPT 100: FPGA DUMMY REGISTER OK!!\n");
-      printf("----------------------------------------------------------------------------------------------\n\n");
+      printf("----------------------------------------------------------------------------------------------\n");
     }
   return result;
 }
 
 
+int setDAQRegister()
+{
+  u_int32_t addr, reg, val;
+  int result=OK;
+  addr=DAQ_REG;
+  val=34+(42<<8)+(319<<16);
+  reg=bus_r(addr);
+  //write to daqreg if not valid
+  if(reg!=val){
+    bus_w(addr,val);
+    reg=bus_r(addr);
+    if(reg!=val)
+      result=FAIL;
+  }
+#ifdef VERBOSE
+  printf("DAQ reg:20916770:%d\n",reg);
+#endif
+  return result;
+}
+
+
+int setPhaseShiftOnce(){
+  u_int32_t addr, reg, val;
+  int result=OK, i,off;
+  addr=MULTI_PURPOSE_REG;
+  //off=15;
+  // mask=((0x1)<<off);
+
+  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<<
+
+  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/firmware_funcs.h b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.h
index ce95334c2..ca183e2ab 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.h
+++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.h
@@ -20,6 +20,9 @@
 
 int mapCSP0(void);
 int setDummyRegister();
+int setDAQRegister();
+int setPhaseShiftOnce();
+
 u_int16_t bus_w16(u_int32_t offset, u_int16_t data);//aldos function
 u_int32_t bus_w(u_int32_t offset, u_int32_t data);
 u_int32_t bus_r(u_int32_t offset);
diff --git a/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.c
index f21ed60f4..b2a1db1de 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.c
@@ -89,6 +89,7 @@ int initDetector() {
   sDac=noneSelected;
   sAdc=noneSelected;
   
+
   /*
   setCSregister(ALLMOD); //commented out by dhanya
   setSSregister(ALLMOD);
diff --git a/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.h b/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.h
index b855cae6c..e785d49fc 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.h
+++ b/slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.h
@@ -18,7 +18,7 @@
 #define VINCM_VALS    {0,0,300,400,500,600,700}
 #define VREFCOMP_VALS {0,0,320,420,520,620,720}
 #define IBTESTC_VALS  {0,0,340,440,540,640,740}
-#define CONF_GAIN     {0,0,  0,  1,  6,  2,  1}//dynamic gain confgain yet to be figured out
+#define CONF_GAIN     {0,0,  0,  1,  6,  2,  1}//dynamic gain confgain yet to be figured out-probably 8 or 16
  
 
 #define DEFAULTGAIN {11.66,9.32,14.99}
diff --git a/slsDetectorSoftware/gotthardDetectorServer/registers_g.h b/slsDetectorSoftware/gotthardDetectorServer/registers_g.h
index 0141e2a16..4bb5d1ce8 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/registers_g.h
+++ b/slsDetectorSoftware/gotthardDetectorServer/registers_g.h
@@ -10,6 +10,7 @@
 /* registers defined in FPGA */
 #define GAIN_REG         0x10<<11
 #define DAQ_REG          0x1b<<11
+#define MULTI_PURPOSE_REG 0x94<<11
 
 #define DUMMY_REG        0x13<<11
 #define FIX_PATT_REG     0x45<<11
diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_defs.h b/slsDetectorSoftware/gotthardDetectorServer/server_defs.h
index 2d3bf6365..92e6b0e18 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/server_defs.h
+++ b/slsDetectorSoftware/gotthardDetectorServer/server_defs.h
@@ -27,6 +27,8 @@
 #define TRIM_DR (((int)pow(2,NTRIMBITS))-1)
 #define COUNT_DR (((int)pow(2,NCOUNTBITS))-1)
 
+#define PHASE_SHIFT 120
+
 
 #define ALLMOD 0xffff
 #define ALLFIFO 0xffff
diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
index 8804b70d3..5d336cb7e 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
@@ -67,9 +67,12 @@ int init_detector( int b) {
   if (b) {
     initDetector();
     printf("\ninitdetector done! \n");
-    setDummyRegister(); 
+    setDummyRegister();
+    // setPhaseShiftOnce();
+    setDAQRegister();
     setSettings(GET_SETTINGS);
 
+
     //testRAM();
   }
   #endif