diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 6c28780e4..bf5f1142c 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index a0bbfa4b7..d19380b44 100755 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -31,9 +31,9 @@ extern udpStruct udpDetails; extern uint64_t udpFrameNumber; extern uint32_t udpPacketNumber; -int firmware_compatibility = OK; -int firmware_check_done = 0; -char firmware_message[MAX_STR_LENGTH]; +int initError = OK; +int initCheckDone = 0; +char initErrorMessage[MAX_STR_LENGTH]; #ifdef VIRTUAL pthread_t pthread_virtual_tid; @@ -66,51 +66,51 @@ int naSamples = 1; int ndSamples = 1; int detPos[2] = {0, 0}; -int isFirmwareCheckDone() { - return firmware_check_done; +int isInitCheckDone() { + return initCheckDone; } -int getFirmwareCheckResult(char** mess) { - *mess = firmware_message; - return firmware_compatibility; +int getInitResult(char** mess) { + *mess = initErrorMessage; + return initError; } void basictests() { - firmware_compatibility = OK; - firmware_check_done = 0; - memset(firmware_message, 0, MAX_STR_LENGTH); + initError = OK; + initCheckDone = 0; + memset(initErrorMessage, 0, MAX_STR_LENGTH); #ifdef VIRTUAL FILE_LOG(logINFOBLUE, ("******** Chip Test Board Virtual Server *****************\n")); if (mapCSP0() == FAIL) { - strcpy(firmware_message, + strcpy(initErrorMessage, "Could not map to memory. Dangerous to continue.\n"); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } - firmware_check_done = 1; + initCheckDone = 1; return; #else defineGPIOpins(); resetFPGA(); if (mapCSP0() == FAIL) { - strcpy(firmware_message, + strcpy(initErrorMessage, "Could not map to memory. Dangerous to continue.\n"); - FILE_LOG(logERROR, ("%s\n\n", firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, ("%s\n\n", initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } // does check only if flag is 0 (by default), set by command line if ((!debugflag) && ((checkType() == FAIL) || (testFpga() == FAIL) || (testBus() == FAIL))) { - strcpy(firmware_message, + strcpy(initErrorMessage, "Could not pass basic tests of FPGA and bus. Dangerous to continue.\n"); - FILE_LOG(logERROR, ("%s\n\n", firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, ("%s\n\n", initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } @@ -151,7 +151,7 @@ void basictests() { // return if flag is not zero, debug mode if (debugflag) { - firmware_check_done = 1; + initCheckDone = 1; return; } @@ -159,41 +159,41 @@ void basictests() { //cant read versions FILE_LOG(logINFO, ("Testing Firmware-software compatibility:\n")); if(!fwversion || !sw_fw_apiversion){ - strcpy(firmware_message, + strcpy(initErrorMessage, "Cant read versions from FPGA. Please update firmware.\n"); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } //check for API compatibility - old server if(sw_fw_apiversion > REQRD_FRMWR_VRSN){ - sprintf(firmware_message, + sprintf(initErrorMessage, "This detector software software version (0x%llx) is incompatible.\n" "Please update detector software (min. 0x%llx) to be compatible with this firmware.\n", (long long int)sw_fw_apiversion, (long long int)REQRD_FRMWR_VRSN); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } //check for firmware compatibility - old firmware if( REQRD_FRMWR_VRSN > fwversion) { - sprintf(firmware_message, + sprintf(initErrorMessage, "This firmware version (0x%llx) is incompatible.\n" "Please update firmware (min. 0x%llx) to be compatible with this server.\n", (long long int)fwversion, (long long int)REQRD_FRMWR_VRSN); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } FILE_LOG(logINFO, ("\tCompatibility - success\n")); - firmware_check_done = 1; + initCheckDone = 1; #endif } diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer index 23dce501c..7916d3871 100755 Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c index a5c7a4aa2..3baf36dec 100755 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c @@ -25,9 +25,9 @@ extern int isControlServer; extern void getMacAddressinString(char* cmac, int size, uint64_t mac); extern void getIpAddressinString(char* cip, uint32_t ip); -int firmware_compatibility = OK; -int firmware_check_done = 0; -char firmware_message[MAX_STR_LENGTH]; +int initError = OK; +int initCheckDone = 0; +char initErrorMessage[MAX_STR_LENGTH]; const char* dac_names[16] = {"SvP","Vtr","Vrf","Vrs","SvN","Vtgstv","Vcmp_ll","Vcmp_lr","cal","Vcmp_rl","rxb_rb","rxb_lb","Vcmp_rr","Vcp","Vcn","Vis"}; @@ -92,19 +92,19 @@ int eiger_virtual_detPos[2] = {0, 0}; -int isFirmwareCheckDone() { - return firmware_check_done; +int isInitCheckDone() { + return initCheckDone; } -int getFirmwareCheckResult(char** mess) { - *mess = firmware_message; - return firmware_compatibility; +int getInitResult(char** mess) { + *mess = initErrorMessage; + return initError; } void basictests() { - firmware_compatibility = OK; - firmware_check_done = 0; - memset(firmware_message, 0, MAX_STR_LENGTH); + initError = OK; + initCheckDone = 0; + memset(initErrorMessage, 0, MAX_STR_LENGTH); #ifdef VIRTUAL FILE_LOG(logINFOBLUE, ("************ EIGER Virtual Server *****************\n\n")); #endif @@ -139,49 +139,49 @@ void basictests() { udpDetails.srcmac = macadd; #ifdef VIRTUAL - firmware_check_done = 1; + initCheckDone = 1; return; #endif // return if debugflag is not zero, debug mode if (debugflag) { - firmware_check_done = 1; + initCheckDone = 1; return; } //cant read versions if (!fwversion || !sw_fw_apiversion) { - strcpy(firmware_message, "Cant read versions from FPGA. Please update firmware.\n"); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + strcpy(initErrorMessage, "Cant read versions from FPGA. Please update firmware.\n"); + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } //check for API compatibility - old server if (sw_fw_apiversion > REQUIRED_FIRMWARE_VERSION) { - sprintf(firmware_message, "This detector software software version (%lld) is incompatible.\n" + sprintf(initErrorMessage, "This detector software software version (%lld) is incompatible.\n" "Please update detector software (min. %lld) to be compatible with this firmware.\n", (long long int)sw_fw_apiversion, (long long int)REQUIRED_FIRMWARE_VERSION); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } //check for firmware compatibility - old firmware if ( REQUIRED_FIRMWARE_VERSION > fwversion) { - sprintf(firmware_message, "This firmware version (%lld) is incompatible.\n" + sprintf(initErrorMessage, "This firmware version (%lld) is incompatible.\n" "Please update firmware (min. %lld) to be compatible with this server.\n", (long long int)fwversion, (long long int)REQUIRED_FIRMWARE_VERSION); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } FILE_LOG(logINFO, ("Compatibility - success\n")); - firmware_check_done = 1; + initCheckDone = 1; } diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index d2994ade6..00eac1073 100755 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer differ diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c index 5d255bb49..007cb23fb 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c @@ -24,9 +24,9 @@ extern int debugflag; extern udpStruct udpDetails; -int firmware_compatibility = OK; -int firmware_check_done = 0; -char firmware_message[MAX_STR_LENGTH]; +int initError = OK; +int initCheckDone = 0; +char initErrorMessage[MAX_STR_LENGTH]; #ifdef VIRTUAL pthread_t pthread_virtual_tid; @@ -41,47 +41,47 @@ int dacValues[NDAC] = {0}; int onChipdacValues[ONCHIP_NDAC][NCHIP + 1] = {0}; int detPos[2] = {0, 0}; -int isFirmwareCheckDone() { - return firmware_check_done; +int isInitCheckDone() { + return initCheckDone; } -int getFirmwareCheckResult(char** mess) { - *mess = firmware_message; - return firmware_compatibility; +int getInitResult(char** mess) { + *mess = initErrorMessage; + return initError; } void basictests() { - firmware_compatibility = OK; - firmware_check_done = 0; - memset(firmware_message, 0, MAX_STR_LENGTH); + initError = OK; + initCheckDone = 0; + memset(initErrorMessage, 0, MAX_STR_LENGTH); #ifdef VIRTUAL FILE_LOG(logINFOBLUE, ("******** Gotthard2 Virtual Server *****************\n")); if (mapCSP0() == FAIL) { - strcpy(firmware_message, + strcpy(initErrorMessage, "Could not map to memory. Dangerous to continue.\n"); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } - firmware_check_done = 1; + initCheckDone = 1; return; #else if (mapCSP0() == FAIL) { - strcpy(firmware_message, + strcpy(initErrorMessage, "Could not map to memory. Dangerous to continue.\n"); - FILE_LOG(logERROR, ("%s\n\n", firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, ("%s\n\n", initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } // does check only if flag is 0 (by default), set by command line if ((!debugflag) && ((testFpga() == FAIL) || (testBus() == FAIL))) { - sprintf(firmware_message, + sprintf(initErrorMessage, "Could not pass basic tests of FPGA and bus. Dangerous to continue. (Firmware version:0x%llx) \n", getFirmwareVersion()); - FILE_LOG(logERROR, ("%s\n\n", firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, ("%s\n\n", initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } @@ -118,48 +118,48 @@ void basictests() { // return if flag is not zero, debug mode if (debugflag) { - firmware_check_done = 1; + initCheckDone = 1; return; } //cant read versions FILE_LOG(logINFO, ("Testing Firmware-software compatibility:\n")); if(!fwversion || !sw_fw_apiversion){ - strcpy(firmware_message, + strcpy(initErrorMessage, "Cant read versions from FPGA. Please update firmware.\n"); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } //check for API compatibility - old server if(sw_fw_apiversion > requiredFirmwareVersion){ - sprintf(firmware_message, + sprintf(initErrorMessage, "This detector software software version (0x%llx) is incompatible.\n" "Please update detector software (min. 0x%llx) to be compatible with this firmware.\n", (long long int)sw_fw_apiversion, (long long int)requiredFirmwareVersion); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } //check for firmware compatibility - old firmware if( requiredFirmwareVersion > fwversion) { - sprintf(firmware_message, + sprintf(initErrorMessage, "This firmware version (0x%llx) is incompatible.\n" "Please update firmware (min. 0x%llx) to be compatible with this server.\n", (long long int)fwversion, (long long int)requiredFirmwareVersion); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } FILE_LOG(logINFO, ("Compatibility - success\n")); - firmware_check_done = 1; + initCheckDone = 1; #endif } diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer index 72561bfce..92a446064 100755 Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer differ diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c index ee3e88f6e..49b2337e7 100755 --- a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c @@ -20,9 +20,9 @@ extern udpStruct udpDetails; // Variables that will be exported int phaseShift = DEFAULT_PHASE_SHIFT; -int firmware_compatibility = OK; -int firmware_check_done = 0; -char firmware_message[MAX_STR_LENGTH]; +int initError = OK; +int initCheckDone = 0; +char initErrorMessage[MAX_STR_LENGTH]; #ifdef VIRTUAL pthread_t pthread_virtual_tid; @@ -53,48 +53,48 @@ int slaveadcphase = 0; int rsttosw1delay = 2; int startacqdelay = 1; -int isFirmwareCheckDone() { - return firmware_check_done; +int isInitCheckDone() { + return initCheckDone; } -int getFirmwareCheckResult(char** mess) { - *mess = firmware_message; - return firmware_compatibility; +int getInitResult(char** mess) { + *mess = initErrorMessage; + return initError; } void basictests() { - firmware_compatibility = OK; - firmware_check_done = 0; - memset(firmware_message, 0, MAX_STR_LENGTH); + initError = OK; + initCheckDone = 0; + memset(initErrorMessage, 0, MAX_STR_LENGTH); #ifdef VIRTUAL FILE_LOG(logINFOBLUE, ("******** Gotthard Virtual Server *****************\n")); if (mapCSP0() == FAIL) { - strcpy(firmware_message, + strcpy(initErrorMessage, "Could not map to memory. Dangerous to continue.\n"); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } - firmware_check_done = 1; + initCheckDone = 1; return; #else if (mapCSP0() == FAIL) { - strcpy(firmware_message, + strcpy(initErrorMessage, "Could not map to memory. Dangerous to continue.\n"); - FILE_LOG(logERROR, ("%s\n\n", firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, ("%s\n\n", initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } // does check only if flag is 0 (by default), set by command line if (((checkType() == FAIL) || (testFpga() == FAIL) || (testBus() == FAIL))) { - strcpy(firmware_message, + strcpy(initErrorMessage, "Could not pass basic tests of FPGA and bus. Dangerous to continue.\n"); - FILE_LOG(logERROR, ("%s\n\n", firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, ("%s\n\n", initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } @@ -126,7 +126,7 @@ void basictests() { )); FILE_LOG(logINFO, ("Basic Tests - success\n")); - firmware_check_done = 1; + initCheckDone = 1; #endif } diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 67bd647dc..eddf4703a 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c index 5993d1596..c02eb3579 100755 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -25,9 +25,9 @@ extern int debugflag; extern udpStruct udpDetails; -int firmware_compatibility = OK; -int firmware_check_done = 0; -char firmware_message[MAX_STR_LENGTH]; +int initError = OK; +int initCheckDone = 0; +char initErrorMessage[MAX_STR_LENGTH]; #ifdef VIRTUAL pthread_t pthread_virtual_tid; @@ -43,51 +43,51 @@ int detPos[4] = {0, 0, 0, 0}; int numUDPInterfaces = 1; -int isFirmwareCheckDone() { - return firmware_check_done; +int isInitCheckDone() { + return initCheckDone; } -int getFirmwareCheckResult(char** mess) { - *mess = firmware_message; - return firmware_compatibility; +int getInitResult(char** mess) { + *mess = initErrorMessage; + return initError; } void basictests() { - firmware_compatibility = OK; - firmware_check_done = 0; - memset(firmware_message, 0, MAX_STR_LENGTH); + initError = OK; + initCheckDone = 0; + memset(initErrorMessage, 0, MAX_STR_LENGTH); #ifdef VIRTUAL FILE_LOG(logINFOBLUE, ("******** Jungfrau Virtual Server *****************\n")); if (mapCSP0() == FAIL) { - strcpy(firmware_message, + strcpy(initErrorMessage, "Could not map to memory. Dangerous to continue.\n"); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } - firmware_check_done = 1; + initCheckDone = 1; return; #else defineGPIOpins(); resetFPGA(); if (mapCSP0() == FAIL) { - strcpy(firmware_message, + strcpy(initErrorMessage, "Could not map to memory. Dangerous to continue.\n"); - FILE_LOG(logERROR, ("%s\n\n", firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, ("%s\n\n", initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } // does check only if flag is 0 (by default), set by command line if ((!debugflag) && ((checkType() == FAIL) || (testFpga() == FAIL) || (testBus() == FAIL))) { - strcpy(firmware_message, + strcpy(initErrorMessage, "Could not pass basic tests of FPGA and bus. Dangerous to continue.\n"); - FILE_LOG(logERROR, ("%s\n\n", firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, ("%s\n\n", initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } @@ -129,7 +129,7 @@ void basictests() { // return if flag is not zero, debug mode if (debugflag) { - firmware_check_done = 1; + initCheckDone = 1; return; } @@ -137,41 +137,41 @@ void basictests() { //cant read versions FILE_LOG(logINFO, ("Testing Firmware-software compatibility:\n")); if(!fwversion || !sw_fw_apiversion){ - strcpy(firmware_message, + strcpy(initErrorMessage, "Cant read versions from FPGA. Please update firmware.\n"); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } //check for API compatibility - old server if(sw_fw_apiversion > requiredFirmwareVersion){ - sprintf(firmware_message, + sprintf(initErrorMessage, "This detector software software version (0x%llx) is incompatible.\n" "Please update detector software (min. 0x%llx) to be compatible with this firmware.\n", (long long int)sw_fw_apiversion, (long long int)requiredFirmwareVersion); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } //check for firmware compatibility - old firmware if( requiredFirmwareVersion > fwversion) { - sprintf(firmware_message, + sprintf(initErrorMessage, "This firmware version (0x%llx) is incompatible.\n" "Please update firmware (min. 0x%llx) to be compatible with this server.\n", (long long int)fwversion, (long long int)requiredFirmwareVersion); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } FILE_LOG(logINFO, ("Compatibility - success\n")); - firmware_check_done = 1; + initCheckDone = 1; #endif } diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index c9ab60226..476e96cae 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c index 2a3efb317..bc8dfbb78 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c @@ -23,9 +23,9 @@ extern int debugflag; extern udpStruct udpDetails; -int firmware_compatibility = OK; -int firmware_check_done = 0; -char firmware_message[MAX_STR_LENGTH]; +int initError = OK; +int initCheckDone = 0; +char initErrorMessage[MAX_STR_LENGTH]; #ifdef VIRTUAL pthread_t pthread_virtual_tid; @@ -40,48 +40,48 @@ int highvoltage = 0; int dacValues[NDAC] = {0}; int detPos[2] = {0, 0}; -int isFirmwareCheckDone() { - return firmware_check_done; +int isInitCheckDone() { + return initCheckDone; } -int getFirmwareCheckResult(char** mess) { - *mess = firmware_message; - return firmware_compatibility; +int getInitResult(char** mess) { + *mess = initErrorMessage; + return initError; } void basictests() { - firmware_compatibility = OK; - firmware_check_done = 0; - memset(firmware_message, 0, MAX_STR_LENGTH); + initError = OK; + initCheckDone = 0; + memset(initErrorMessage, 0, MAX_STR_LENGTH); #ifdef VIRTUAL FILE_LOG(logINFOBLUE, ("******** Mythen3 Virtual Server *****************\n")); if (mapCSP0() == FAIL) { - strcpy(firmware_message, + strcpy(initErrorMessage, "Could not map to memory. Dangerous to continue.\n"); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } - firmware_check_done = 1; + initCheckDone = 1; return; #else FILE_LOG(logINFOBLUE, ("******** Mythen3 Server: do the checks *****************\n")); if (mapCSP0() == FAIL) { - strcpy(firmware_message, + strcpy(initErrorMessage, "Could not map to memory. Dangerous to continue.\n"); - FILE_LOG(logERROR, ("%s\n\n", firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, ("%s\n\n", initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } // does check only if flag is 0 (by default), set by command line if ((!debugflag) && ((testFpga() == FAIL)|| (testBus() == FAIL))) { - strcpy(firmware_message, + strcpy(initErrorMessage, "Could not pass basic tests of FPGA and bus. Dangerous to continue.\n"); - FILE_LOG(logERROR, ("%s\n\n", firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, ("%s\n\n", initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } uint16_t hversion = getHardwareVersionNumber(); @@ -120,7 +120,7 @@ void basictests() { // return if flag is not zero, debug mode if (debugflag) { - firmware_check_done = 1; + initCheckDone = 1; return; } @@ -128,41 +128,41 @@ void basictests() { //cant read versions FILE_LOG(logINFO, ("Testing Firmware-software compatibility:\n")); if(!fwversion || !sw_fw_apiversion){ - strcpy(firmware_message, + strcpy(initErrorMessage, "Cant read versions from FPGA. Please update firmware.\n"); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } //check for API compatibility - old server if(sw_fw_apiversion > requiredFirmwareVersion){ - sprintf(firmware_message, + sprintf(initErrorMessage, "This detector software software version (0x%llx) is incompatible.\n" "Please update detector software (min. 0x%llx) to be compatible with this firmware.\n", (long long int)sw_fw_apiversion, (long long int)requiredFirmwareVersion); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } //check for firmware compatibility - old firmware if( requiredFirmwareVersion > fwversion) { - sprintf(firmware_message, + sprintf(initErrorMessage, "This firmware version (0x%llx) is incompatible.\n" "Please update firmware (min. 0x%llx) to be compatible with this server.\n", (long long int)fwversion, (long long int)requiredFirmwareVersion); - FILE_LOG(logERROR, (firmware_message)); - firmware_compatibility = FAIL; - firmware_check_done = 1; + FILE_LOG(logERROR, (initErrorMessage)); + initError = FAIL; + initCheckDone = 1; return; } FILE_LOG(logINFO, ("Compatibility - success\n")); - firmware_check_done = 1; + initCheckDone = 1; #endif } diff --git a/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h b/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h index fcdc77e10..cf4047f5a 100755 --- a/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h +++ b/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h @@ -31,8 +31,8 @@ typedef struct udpStruct_s { // basic tests -int isFirmwareCheckDone(); -int getFirmwareCheckResult(char** mess); +int isInitCheckDone(); +int getInitResult(char** mess); void basictests(); #if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD) || defined(MYTHEN3D) || defined(GOTTHARD2D) int checkType(); diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index 04cb49875..832400826 100755 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -3991,9 +3991,9 @@ int check_version(int file_des) { FILE_LOG(logDEBUG1, ("Checking software-firmware compatibility and basic test result\n")); // check if firmware check is done - if (!isFirmwareCheckDone()) { + if (!isInitCheckDone()) { usleep(3 * 1000 * 1000); - if (!isFirmwareCheckDone()) { + if (!isInitCheckDone()) { ret = FAIL; strcpy(mess,"Firmware Software Compatibility Check (Server Initialization) " "still not done done in server. Unexpected.\n"); @@ -4003,7 +4003,7 @@ int check_version(int file_des) { // check firmware check result if (ret == OK) { char* firmware_message = NULL; - if (getFirmwareCheckResult(&firmware_message) == FAIL) { + if (getInitResult(&firmware_message) == FAIL) { ret = FAIL; strcpy(mess, firmware_message); FILE_LOG(logERROR,(mess)); diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index ad06b4102..52cc25f1c 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -4,9 +4,9 @@ #define APIRECEIVER 0x190722 #define APIGUI 0x190723 #define APIMOENCH 0x190820 -#define APIGOTTHARD 0x191106 -#define APICTB 0x191106 -#define APIJUNGFRAU 0x191106 -#define APIEIGER 0x191106 -#define APIGOTTHARD2 0x191108 +#define APICTB 0x191111 +#define APIGOTTHARD 0x191111 +#define APIGOTTHARD2 0x191111 #define APIMYTHEN3 0x191111 +#define APIJUNGFRAU 0x191111 +#define APIEIGER 0x191111