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

print error

Browse Source
This commit is contained in:
maliakal_d 2021-11-23 15:45:01 +01:00
parent 74348afcf6
commit ed2e6e4e28
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/slsDetectorServer/include/programViaBlackfin.h
View File

@ -14,7 +14,7 @@ int FPGATouchFlash(char *mess);
int resetFPGA(char *mess); int resetFPGA(char *mess);
int emptyTempFolder(char *mess); int emptyTempFolder(char *mess);
int allowKernelUpdate(char *mess); int allowKernelUpdate(char *mess, char *functionType);
/** /**
* deletes old file * deletes old file
* verify memory available to copy * verify memory available to copy

6
slsDetectorServers/slsDetectorServer/src/programViaBlackfin.c
View File

@ -248,7 +248,7 @@ int emptyTempFolder(char *mess) {
#endif #endif
} }
int allowKernelUpdate(char *mess) { int allowKernelUpdate(char *mess, char *functionType) {
LOG(logINFO, ("\tVerifying kernel update allowed...\n")); LOG(logINFO, ("\tVerifying kernel update allowed...\n"));
#ifdef VIRTUAL #ifdef VIRTUAL
@ -265,7 +265,7 @@ int allowKernelUpdate(char *mess) {
snprintf( snprintf(
mess, MAX_STR_LENGTH, mess, MAX_STR_LENGTH,
"Could not update %s. (Could not figure out if Amd flash: %s)\n", "Could not update %s. (Could not figure out if Amd flash: %s)\n",
messageType, retvals); functionType, retvals);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
return FAIL; return FAIL;
} }
@ -275,7 +275,7 @@ int allowKernelUpdate(char *mess) {
snprintf(mess, MAX_STR_LENGTH, snprintf(mess, MAX_STR_LENGTH,
"Could not update %s. Kernel version %s is too old to " "Could not update %s. Kernel version %s is too old to "
"update the Amd flash\n", "update the Amd flash\n",
messageType, retvals); functionType, retvals);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
return FAIL; return FAIL;
} }

2
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -9374,7 +9374,7 @@ void receive_program_via_blackfin(int file_des, enum PROGRAM_INDEX index,
LOG(logERROR, (mess)); LOG(logERROR, (mess));
#else #else
// check kernel update is allowed (Non Amd OR AMD + current kernel) // check kernel update is allowed (Non Amd OR AMD + current kernel)
ret = allowKernelUpdate(mess); ret = allowKernelUpdate(mess, functionType);
if (ret == FAIL) { if (ret == FAIL) {
Server_SendResult(file_des, INT32, NULL, 0); Server_SendResult(file_des, INT32, NULL, 0);
return; return;