detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-28 09:10:01 +02:00
Code Issues Actions Packages Releases Activity

updated m3 kernel version

Browse Source
This commit is contained in:
maliakal_d 2021-11-02 17:07:55 +01:00
parent 3f517420af
commit 340d708b12
7 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

4
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -188,9 +188,7 @@ int checkKernelVersion() {
#ifdef VIRTUAL #ifdef VIRTUAL
return OK; return OK;
#endif #endif
char version[255]={0}; return validateKernelVersion(KERNEL_DATE_VRSN);
strcpy(version, KERNEL_DATE_VRSN);
return validateKernelVersion(version, sizeof(version));
} }
int checkType() { int checkType() {

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

2
slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h
View File

@ -4,7 +4,7 @@
#include "sls/sls_detector_defs.h" #include "sls/sls_detector_defs.h"
#define REQRD_FRMWRE_VRSN (0x210910) #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 ID_FILE "detid_mythen3.txt"
#define LINKED_SERVER_NAME "mythen3DetectorServer" #define LINKED_SERVER_NAME "mythen3DetectorServer"

4
slsDetectorServers/slsDetectorServer/include/common.h
View File

@ -26,9 +26,9 @@ int ConvertToDifferentRange(int inputMin, int inputMax, int outputMin,
int getAbsPath(char *buf, size_t bufSize, char *fname); 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, void validate(int *ret, char *mess, int arg, int retval, char *modename,
enum numberMode nummode); enum numberMode nummode);

8
slsDetectorServers/slsDetectorServer/src/common.c
View File

@ -65,7 +65,7 @@ int getAbsPath(char *buf, size_t bufSize, char *fname) {
return OK; 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 // remove timezone as strptime cannot validate timezone despite
// documentation (for blackfin) // documentation (for blackfin)
LOG(logDEBUG, ("buf for time %s\n", buf)); LOG(logDEBUG, ("buf for time %s\n", buf));
@ -95,7 +95,7 @@ int getTimeFromString(char *buf, size_t len, time_t *result) {
return OK; return OK;
} }
int validateKernelVersion(char *expectedVersion, size_t len) { int validateKernelVersion(char *expectedVersion) {
// extract kernel date string // extract kernel date string
struct utsname buf = {0}; struct utsname buf = {0};
if (uname(&buf) == -1) { if (uname(&buf) == -1) {
@ -115,14 +115,14 @@ int validateKernelVersion(char *expectedVersion, size_t len) {
// convert kernel date string into time // convert kernel date string into time
time_t kernelDate; 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)); LOG(logERROR, ("Could not parse retrieved kernel date, %s\n", output));
return FAIL; return FAIL;
} }
// convert expected date into time // convert expected date into time
time_t expDate; time_t expDate;
if (getTimeFromString(expectedVersion, len, &expDate) == FAIL) { if (getTimeFromString(expectedVersion, &expDate) == FAIL) {
LOG(logERROR, LOG(logERROR,
("Could not parse expected kernel date, %s\n", expectedVersion)); ("Could not parse expected kernel date, %s\n", expectedVersion));
return FAIL; return FAIL;

2
slsSupportLib/include/sls/versionAPI.h
View File

@ -8,8 +8,8 @@
#define APIGUI 0x211021 #define APIGUI 0x211021
#define APIEIGER 0x211027 #define APIEIGER 0x211027
#define APIGOTTHARD 0x211029 #define APIGOTTHARD 0x211029
#define APIMYTHEN3 0x211029
#define APIJUNGFRAU 0x211102 #define APIJUNGFRAU 0x211102
#define APIMOENCH 0x211029 #define APIMOENCH 0x211029
#define APICTB 0x211102 #define APICTB 0x211102
#define APIMYTHEN3 0x211102
#define APIGOTTHARD2 0x211102 #define APIGOTTHARD2 0x211102