From b3ff825ce85a6624b481893e1d530761d5594bfd Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Tue, 1 Oct 2019 16:26:42 +0200
Subject: [PATCH] updated gotthard2 api etc

---
 .../gotthard2DetectorServer/RegisterDefs.h    |  62 ++++++++++--------
 .../bin/gotthard2DetectorServer_developer     | Bin 92968 -> 92968 bytes
 .../slsDetectorFunctionList.c                 |   7 +-
 .../slsDetectorServer_defs.h                  |   4 +-
 slsSupportLib/include/versionAPI.h            |   2 +-
 5 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/slsDetectorServers/gotthard2DetectorServer/RegisterDefs.h b/slsDetectorServers/gotthard2DetectorServer/RegisterDefs.h
index 54d5111d6..a47e5c92a 100644
--- a/slsDetectorServers/gotthard2DetectorServer/RegisterDefs.h
+++ b/slsDetectorServers/gotthard2DetectorServer/RegisterDefs.h
@@ -1,10 +1,12 @@
-// stuff from Carlos
 #pragma once
 
 /* Definitions for FPGA*/
 #define BASE_CONTROL                    (0x000)
-#define BASE_PATTERN_CONTROL            (0x200)
-#define BASE_PATTERN_RAM                (0x10000)
+#define BASE_ACQUISITION                (0x200)
+#define BASE_UDP_RAM                    (0x1000)
+
+/* Module Control Board Serial Number register */
+#define MCB_SERIAL_NO_REG               (0x00 + BASE_CONTROL)
 
 /* FPGA Version register */
 #define FPGA_VERSION_REG                (0x04 + BASE_CONTROL)
@@ -14,55 +16,57 @@
 #define DETECTOR_TYPE_OFST   			(24)
 #define DETECTOR_TYPE_MSK   			(0x000000FF << DETECTOR_TYPE_OFST)
 
-/* Module Control Board Serial Number register TODO: versionnumber and serial number? */
-#define MCB_SERIAL_NO_REG               (0x00 + BASE_CONTROL)
-
-/* API Version register TODO: MSK and ofst? */
+/* API Version register */
 #define API_VERSION_REG                 (0x08 + BASE_CONTROL)
 
+#define API_VERSION_OFST                (0)
+#define API_VERSION_MSK                 (0x00FFFFFF << API_VERSION_OFST)
+#define API_VERSION_DETECTOR_TYPE_OFST  (24)                                            //Not used in software
+#define API_VERSION_DETECTOR_TYPE_MSK   (0x000000FF << API_VERSION_DETECTOR_TYPE_OFST)  //Not used in software
+
 /* Fix pattern register */
-#define FIX_PATT_REG             	    (0x0C + BASE_CONTROL)
+#define FIX_PATT_REG             	    (0x0D + BASE_CONTROL)
 #define FIX_PATT_VAL                    (0xACDC2019)
 
 /* Status register */
-#define STATUS_REG                      (0x10 + BASE_CONTROL)
+#define STATUS_REG                      (0x12 + BASE_CONTROL)
 
-// TODO: is this bit implemented (else make it ifdef virtual)
+#ifdef VIRTUAL
 #define RUN_BUSY_OFST					(0)
 #define RUN_BUSY_MSK      				(0x00000001 << RUN_BUSY_OFST)
+#endif
 
-/* Look at me register TODO: is this a RW register */
-#define LOOK_AT_ME_REG          		(0x14 + BASE_CONTROL)	//Not used in firmware or software, good to play with
+/* Look at me register */
+#define LOOK_AT_ME_REG          		(0x16 + BASE_CONTROL)	
 
 
 
-/* Pattern Control FPGA registers --------------------------------------------------*/
+/* Pattern Control FPGA registers TODO --------------------------------------------------*/
 
-//TODO: do we really need the get delay and get period?
 /* Cycles left 64bit Register */
-#define GET_CYCLES_LSB_REG              (0x10 + BASE_PATTERN_CONTROL)
-#define GET_CYCLES_MSB_REG              (0x14 + BASE_PATTERN_CONTROL)
+#define GET_CYCLES_LSB_REG              (0x10 + BASE_ACQUISITION)
+#define GET_CYCLES_MSB_REG              (0x14 + BASE_ACQUISITION)
 
 /* Frames left 64bit Register */
-#define GET_FRAMES_LSB_REG              (0x18 + BASE_PATTERN_CONTROL)
-#define GET_FRAMES_MSB_REG              (0x1C + BASE_PATTERN_CONTROL)
+#define GET_FRAMES_LSB_REG              (0x18 + BASE_ACQUISITION)
+#define GET_FRAMES_MSB_REG              (0x1C + BASE_ACQUISITION)
 
 /* Delay 64bit Write-register */
-#define SET_DELAY_LSB_REG               (0x88 + BASE_PATTERN_CONTROL)
-#define SET_DELAY_MSB_REG               (0x8C + BASE_PATTERN_CONTROL)
+#define SET_DELAY_LSB_REG               (0x88 + BASE_ACQUISITION)
+#define SET_DELAY_MSB_REG               (0x8C + BASE_ACQUISITION)
 
 /* Cylces 64bit Write-register */
-#define SET_CYCLES_LSB_REG              (0x90 + BASE_PATTERN_CONTROL)
-#define SET_CYCLES_MSB_REG              (0x94 + BASE_PATTERN_CONTROL)
+#define SET_CYCLES_LSB_REG              (0x90 + BASE_ACQUISITION)
+#define SET_CYCLES_MSB_REG              (0x94 + BASE_ACQUISITION)
 
 /* Frames 64bit Write-register */
-#define SET_FRAMES_LSB_REG              (0x98 + BASE_PATTERN_CONTROL)
-#define SET_FRAMES_MSB_REG              (0x9C + BASE_PATTERN_CONTROL)
+#define SET_FRAMES_LSB_REG              (0x98 + BASE_ACQUISITION)
+#define SET_FRAMES_MSB_REG              (0x9C + BASE_ACQUISITION)
 
 /* Period 64bit Write-register */
-#define SET_PERIOD_LSB_REG              (0xA0 + BASE_PATTERN_CONTROL)
-#define SET_PERIOD_MSB_REG              (0xA4 + BASE_PATTERN_CONTROL)
+#define SET_PERIOD_LSB_REG              (0xA0 + BASE_ACQUISITION)
+#define SET_PERIOD_MSB_REG              (0xA4 + BASE_ACQUISITION)
 
-/* Exptime 64bit Write-register TODO: ?? */
-#define SET_EXPTIME_LSB_REG             (0xA8 + BASE_PATTERN_CONTROL)
-#define SET_EXPTIME_MSB_REG             (0xBC + BASE_PATTERN_CONTROL)
\ No newline at end of file
+/* Exptime 64bit Write-register */
+#define SET_EXPTIME_LSB_REG             (0xA8 + BASE_ACQUISITION)
+#define SET_EXPTIME_MSB_REG             (0xBC + BASE_ACQUISITION)
\ No newline at end of file
diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
index 6393fc83782246c6644883d89ae1f4b011b9fb98..714924ac24da1034ccb162f9177fa8aa0ba1eb28 100755
GIT binary patch
delta 21031
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

delta 21069
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
KDQpxAaQi<x+7FWe

diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
index d59b5bb48..46fe54b8f 100644
--- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
@@ -193,7 +193,7 @@ int testBus() {
 	FILE_LOG(logINFO, ("Testing Bus:\n"));
 
 	int ret = OK;
-	u_int32_t addr = LOOK_AT_ME_REG; //TODO: is this a RW register?
+	u_int32_t addr = LOOK_AT_ME_REG; 
 	int times = 1000 * 1000;
 	int i = 0;
 
@@ -245,7 +245,7 @@ u_int64_t getFirmwareAPIVersion() {
 #ifdef VIRTUAL
     return 0;
 #endif
-    return ((bus_r(API_VERSION_REG)));//TODO: & API_VERSION_MSK) >> API_VERSION_OFST);
+    return ((bus_r(API_VERSION_REG) & API_VERSION_MSK) >> API_VERSION_OFST);
 }
 
 u_int32_t getDetectorNumber(){
@@ -519,7 +519,7 @@ int configureMAC() {
 	FILE_LOG(logINFO, ("\tDest. Port  : %d \t\t\t(0x%08x)\n\n",dstport, dstport));
 
 	// start addr
-	uint32_t addr = BASE_PATTERN_RAM;
+	uint32_t addr = BASE_UDP_RAM;
 	// calculate rxr endpoint offset
 	//addr += (iRxEntry * RXR_ENDPOINT_OFST);//TODO: is there round robin already implemented?
 	// get struct memory
@@ -558,7 +558,6 @@ int configureMAC() {
 	//TODO?
 	//cleanFifos();
 	//resetCore();
-	//alignDeserializer();
 
 	return OK;
 }
diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
index 57babd19b..43f69b4be 100644
--- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "sls_detector_defs.h"
 
-#define REQRD_FRMWRE_VRSN     		(0x190000)//TODO
+#define REQRD_FRMWRE_VRSN     		(0x190000)
 
 #define CTRL_SRVR_INIT_TIME_US      (300 * 1000)
 
@@ -9,7 +9,7 @@
 #define NCHAN 						(128)
 #define NCHIP 						(10)
 #define NDAC 						(16)
-#define DYNAMIC_RANGE               (16) //TODO: correct?
+#define DYNAMIC_RANGE               (16) 
 
 #define HV_SOFT_MAX_VOLTAGE         (200)
 #define HV_HARD_MAX_VOLTAGE         (530)
diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h
index 98b56153c..73c271437 100644
--- a/slsSupportLib/include/versionAPI.h
+++ b/slsSupportLib/include/versionAPI.h
@@ -6,7 +6,7 @@
 #define APIMOENCH 0x190820
 #define APICTB 0x190930
 #define APIGOTTHARD 0x190930
-#define APIGOTTHARD2 0x190930
 #define APIJUNGFRAU 0x190930
 #define APIMYTHEN3 0x190930
 #define APIEIGER 0x190930
+#define APIGOTTHARD2 0x191001