diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index 295b307be..9abd3acbe 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 90d3a183e..7046f4a16 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c @@ -188,9 +188,7 @@ int checkKernelVersion() { #ifdef VIRTUAL return OK; #endif - char version[255]={0}; - strcpy(version, KERNEL_DATE_VRSN); - return validateKernelVersion(version, sizeof(version)); + return validateKernelVersion(KERNEL_DATE_VRSN); } int checkType() { diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index 7b5a400c8..e61489ea9 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h index 06ee3b36b..1c821786c 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h @@ -4,7 +4,7 @@ #include "sls/sls_detector_defs.h" #define REQRD_FRMWRE_VRSN (0x210910) -#define KERNEL_DATE_VRSN "Wed May 20 13:58:38 CEST 2020" +#define KERNEL_DATE_VRSN "Mon May 10 18:00:21 CEST 2021" #define ID_FILE "detid_mythen3.txt" #define LINKED_SERVER_NAME "mythen3DetectorServer" diff --git a/slsDetectorServers/slsDetectorServer/include/common.h b/slsDetectorServers/slsDetectorServer/include/common.h index f69772087..0435c7df2 100644 --- a/slsDetectorServers/slsDetectorServer/include/common.h +++ b/slsDetectorServers/slsDetectorServer/include/common.h @@ -26,9 +26,9 @@ int ConvertToDifferentRange(int inputMin, int inputMax, int outputMin, int getAbsPath(char *buf, size_t bufSize, char *fname); -int getTimeFromString(char *buf, size_t len, time_t *result); +int getTimeFromString(char *buf, time_t *result); -int validateKernelVersion(char *expectedVersion, size_t len); +int validateKernelVersion(char *expectedVersion); void validate(int *ret, char *mess, int arg, int retval, char *modename, enum numberMode nummode); diff --git a/slsDetectorServers/slsDetectorServer/src/common.c b/slsDetectorServers/slsDetectorServer/src/common.c index ff9ce3c93..6e191ef13 100644 --- a/slsDetectorServers/slsDetectorServer/src/common.c +++ b/slsDetectorServers/slsDetectorServer/src/common.c @@ -65,7 +65,7 @@ int getAbsPath(char *buf, size_t bufSize, char *fname) { return OK; } -int getTimeFromString(char *buf, size_t len, time_t *result) { +int getTimeFromString(char *buf, time_t *result) { // remove timezone as strptime cannot validate timezone despite // documentation (for blackfin) LOG(logDEBUG, ("buf for time %s\n", buf)); @@ -95,7 +95,7 @@ int getTimeFromString(char *buf, size_t len, time_t *result) { return OK; } -int validateKernelVersion(char *expectedVersion, size_t len) { +int validateKernelVersion(char *expectedVersion) { // extract kernel date string struct utsname buf = {0}; if (uname(&buf) == -1) { @@ -115,14 +115,14 @@ int validateKernelVersion(char *expectedVersion, size_t len) { // convert kernel date string into time time_t kernelDate; - if (getTimeFromString(output, sizeof(output), &kernelDate) == FAIL) { + if (getTimeFromString(output, &kernelDate) == FAIL) { LOG(logERROR, ("Could not parse retrieved kernel date, %s\n", output)); return FAIL; } // convert expected date into time time_t expDate; - if (getTimeFromString(expectedVersion, len, &expDate) == FAIL) { + if (getTimeFromString(expectedVersion, &expDate) == FAIL) { LOG(logERROR, ("Could not parse expected kernel date, %s\n", expectedVersion)); return FAIL; diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index c774ada78..3b996257f 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -8,8 +8,8 @@ #define APIGUI 0x211021 #define APIEIGER 0x211027 #define APIGOTTHARD 0x211029 -#define APIMYTHEN3 0x211029 #define APIJUNGFRAU 0x211102 #define APIMOENCH 0x211029 #define APICTB 0x211102 +#define APIMYTHEN3 0x211102 #define APIGOTTHARD2 0x211102