diff --git a/RELEASE.txt b/RELEASE.txt index 984491a90..b8cb9459b 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -29,6 +29,7 @@ This document describes the differences between vx.x.x and v6.0.0. - setting rx_hostname to none threw an exception. fixed. - rx id in config file was not taken into account. fixed. - programming firmware failure for blackfin, fixed but requires new kernel. +- nios kernel check updated (ensuring right kernel) 3. Known Issues =============== diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index fe51b43bd..5650deb8a 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index 9abd3acbe..1289163e5 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 7046f4a16..7d8bdb5ba 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c @@ -188,7 +188,9 @@ int checkKernelVersion() { #ifdef VIRTUAL return OK; #endif - return validateKernelVersion(KERNEL_DATE_VRSN); + char buf[255] = {0}; + strcpy(buf, KERNEL_DATE_VRSN); + return validateKernelVersion(buf); } int checkType() { diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer index 30e92eca0..e7b3ee9e5 100755 Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer differ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index b2e8d925b..2b0824c45 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer index f4719542f..34e4abcec 100755 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index e61489ea9..a219abecd 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 496126a91..516d8ddc6 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c @@ -181,7 +181,9 @@ int checkKernelVersion() { #ifdef VIRTUAL return OK; #endif - return validateKernelVersion(KERNEL_DATE_VRSN); + char buf[255] = {0}; + strcpy(buf, KERNEL_DATE_VRSN); + return validateKernelVersion(buf); } int checkType() { diff --git a/slsDetectorServers/slsDetectorServer/src/common.c b/slsDetectorServers/slsDetectorServer/src/common.c index 6e191ef13..b00dcb330 100644 --- a/slsDetectorServers/slsDetectorServer/src/common.c +++ b/slsDetectorServers/slsDetectorServer/src/common.c @@ -81,6 +81,7 @@ int getTimeFromString(char *buf, time_t *result) { } buf[cestPos] = '\0'; } + LOG(logDEBUG, ("buf after removing CEST %s\n", buf)); // convert to time structure struct tm t; diff --git a/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c b/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c index 4fa232cb6..1f14adf47 100644 --- a/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c +++ b/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c @@ -32,9 +32,7 @@ void defineGPIOpins() { return; #endif if (latestKernelVerified == -1) { - char version[255]={0}; - strcpy(version, KERNEL_DATE_VRSN_3GPIO); - if (FAIL == validateKernelVersion(version, sizeof(version))) { + if (FAIL == validateKernelVersion(KERNEL_DATE_VRSN_3GPIO)) { latestKernelVerified = 0; LOG(logWARNING, ("Kernel too old to use gpio 3 pins. Not the end " diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 3b996257f..026e13fab 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -7,9 +7,9 @@ #define APIRECEIVER 0x211020 #define APIGUI 0x211021 #define APIEIGER 0x211027 -#define APIGOTTHARD 0x211029 -#define APIJUNGFRAU 0x211102 -#define APIMOENCH 0x211029 -#define APICTB 0x211102 -#define APIMYTHEN3 0x211102 -#define APIGOTTHARD2 0x211102 +#define APICTB 0x211103 +#define APIGOTTHARD 0x211103 +#define APIGOTTHARD2 0x211103 +#define APIJUNGFRAU 0x211103 +#define APIMYTHEN3 0x211103 +#define APIMOENCH 0x211103