From ed2e6e4e28fad963e216a93d89682b43f581b8a5 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 23 Nov 2021 15:45:01 +0100 Subject: [PATCH] print error --- .../slsDetectorServer/include/programViaBlackfin.h | 2 +- .../slsDetectorServer/src/programViaBlackfin.c | 6 +++--- .../slsDetectorServer/src/slsDetectorServer_funcs.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/slsDetectorServers/slsDetectorServer/include/programViaBlackfin.h b/slsDetectorServers/slsDetectorServer/include/programViaBlackfin.h index 384551c30..a2b2759c2 100644 --- a/slsDetectorServers/slsDetectorServer/include/programViaBlackfin.h +++ b/slsDetectorServers/slsDetectorServer/include/programViaBlackfin.h @@ -14,7 +14,7 @@ int FPGATouchFlash(char *mess); int resetFPGA(char *mess); int emptyTempFolder(char *mess); -int allowKernelUpdate(char *mess); +int allowKernelUpdate(char *mess, char *functionType); /** * deletes old file * verify memory available to copy diff --git a/slsDetectorServers/slsDetectorServer/src/programViaBlackfin.c b/slsDetectorServers/slsDetectorServer/src/programViaBlackfin.c index 276f84dfe..58fbd4f40 100644 --- a/slsDetectorServers/slsDetectorServer/src/programViaBlackfin.c +++ b/slsDetectorServers/slsDetectorServer/src/programViaBlackfin.c @@ -248,7 +248,7 @@ int emptyTempFolder(char *mess) { #endif } -int allowKernelUpdate(char *mess) { +int allowKernelUpdate(char *mess, char *functionType) { LOG(logINFO, ("\tVerifying kernel update allowed...\n")); #ifdef VIRTUAL @@ -265,7 +265,7 @@ int allowKernelUpdate(char *mess) { snprintf( mess, MAX_STR_LENGTH, "Could not update %s. (Could not figure out if Amd flash: %s)\n", - messageType, retvals); + functionType, retvals); LOG(logERROR, (mess)); return FAIL; } @@ -275,7 +275,7 @@ int allowKernelUpdate(char *mess) { snprintf(mess, MAX_STR_LENGTH, "Could not update %s. Kernel version %s is too old to " "update the Amd flash\n", - messageType, retvals); + functionType, retvals); LOG(logERROR, (mess)); return FAIL; } diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index 5c82cfb0f..d4ec17874 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -9374,7 +9374,7 @@ void receive_program_via_blackfin(int file_des, enum PROGRAM_INDEX index, LOG(logERROR, (mess)); #else // check kernel update is allowed (Non Amd OR AMD + current kernel) - ret = allowKernelUpdate(mess); + ret = allowKernelUpdate(mess, functionType); if (ret == FAIL) { Server_SendResult(file_des, INT32, NULL, 0); return;