diff --git a/serverBin/ctbDetectorServerv6.1.0 b/serverBin/ctbDetectorServerv6.1.0 deleted file mode 120000 index a3e856888..000000000 --- a/serverBin/ctbDetectorServerv6.1.0 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv6.1.0 \ No newline at end of file diff --git a/serverBin/eigerDetectorServerv6.1.0 b/serverBin/eigerDetectorServerv6.1.0 deleted file mode 120000 index 70dc2c5ff..000000000 --- a/serverBin/eigerDetectorServerv6.1.0 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv6.1.0 \ No newline at end of file diff --git a/serverBin/jungfrauDetectorServerv6.1.1 b/serverBin/jungfrauDetectorServerv6.1.1 deleted file mode 120000 index 274a8c0c3..000000000 --- a/serverBin/jungfrauDetectorServerv6.1.1 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv6.1.1 \ No newline at end of file diff --git a/serverBin/moenchDetectorServerv6.1.0 b/serverBin/moenchDetectorServerv6.1.0 deleted file mode 120000 index 1ca884421..000000000 --- a/serverBin/moenchDetectorServerv6.1.0 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv6.1.0 \ No newline at end of file diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv6.1.0 b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv6.1.0 deleted file mode 100755 index b9c337470..000000000 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv6.1.0 and /dev/null differ diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv6.1.2 b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv6.1.2 new file mode 100755 index 000000000..a87a0d442 Binary files /dev/null and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv6.1.2 differ diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv6.1.2 b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv6.1.2 index 4b5dbf375..e91c4c65a 100755 Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv6.1.2 and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv6.1.2 differ diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv6.1.0 b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv6.1.0 index 36770afb4..aedbd8fdd 100755 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv6.1.0 and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv6.1.0 differ diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv6.1.0 b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv6.1.0 index 1c29c3c82..66173f69f 100755 Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv6.1.0 and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv6.1.0 differ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv6.1.1 b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv6.1.1 deleted file mode 100755 index 2489757da..000000000 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv6.1.1 and /dev/null differ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv6.1.2 b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv6.1.2 new file mode 100755 index 000000000..c4ee7a019 Binary files /dev/null and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv6.1.2 differ diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv6.1.0 b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv6.1.0 deleted file mode 100755 index 5be4f4fb3..000000000 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv6.1.0 and /dev/null differ diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv6.1.2 b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv6.1.2 new file mode 100755 index 000000000..80da9c69b Binary files /dev/null and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv6.1.2 differ diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv6.1.0 b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv6.1.0 index 7cc0626ef..af093d7dc 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv6.1.0 and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv6.1.0 differ diff --git a/slsDetectorServers/slsDetectorServer/include/programViaBlackfin.h b/slsDetectorServers/slsDetectorServer/include/programViaBlackfin.h index e87d5b19a..91210007e 100644 --- a/slsDetectorServers/slsDetectorServer/include/programViaBlackfin.h +++ b/slsDetectorServers/slsDetectorServer/include/programViaBlackfin.h @@ -16,7 +16,6 @@ int FPGATouchFlash(char *mess, int programming); int resetFPGA(char *mess); int emptyTempFolder(char *mess); -int allowUpdate(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 900c9ffb5..621055299 100644 --- a/slsDetectorServers/slsDetectorServer/src/programViaBlackfin.c +++ b/slsDetectorServers/slsDetectorServer/src/programViaBlackfin.c @@ -254,41 +254,6 @@ int emptyTempFolder(char *mess) { #endif } -int allowUpdate(char *mess, char *functionType) { - LOG(logINFO, ("\tVerifying %s allowed...\n", functionType)); - -#ifdef VIRTUAL - return OK; -#endif - char retvals[MAX_STR_LENGTH] = {0}; - if (executeCommand(CMD_GET_AMD_FLASH, retvals, logDEBUG1) == FAIL) { - // no amd found - if (strstr(retvals, "No result") != NULL) { - LOG(logINFO, ("\tNot Amd Flash\n")); - return OK; - } - // could not figure out if amd - snprintf( - mess, MAX_STR_LENGTH, - "Could not update %s. (Could not figure out if Amd flash: %s)\n", - functionType, retvals); - LOG(logERROR, (mess)); - return FAIL; - } - // amd, only current kernel works with amd flash - if (validateKernelVersion(KERNEL_DATE_VRSN_3GPIO) == FAIL) { - getKernelVersion(retvals); - snprintf(mess, MAX_STR_LENGTH, - "Could not update %s. Kernel version %s is too old to " - "update the Amd flash/ root directory. Most likely, blackfin needs rescue or replacement. Please contact us.\n", - functionType, retvals); - LOG(logERROR, (mess)); - return FAIL; - } - LOG(logINFO, ("\tAmd flash with compatible kernel version\n")); - return OK; -} - int preparetoCopyProgram(char *mess, char *functionType, FILE **fd, uint64_t fsize) { diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index 36f7b2737..f0f7ea95b 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -4143,28 +4143,21 @@ int copy_detector_server(int file_des) { LOG(logINFOBLUE, ("Copying server %s from host %s\n", sname, hostname)); char cmd[MAX_STR_LENGTH] = {0}; -#ifdef BLACKFIN_DEFINED - // check update is allowed (Non Amd OR AMD + current kernel) - ret = allowUpdate(mess, "copy detector server"); -#endif - // tftp server - if (ret == OK) { - if (snprintf(cmd, MAX_STR_LENGTH, "tftp %s -r %s -g", hostname, - sname) >= MAX_STR_LENGTH) { - ret = FAIL; - strcpy(mess, "Could not copy detector server. Command to copy " - "server too long\n"); - LOG(logERROR, (mess)); - } else if (executeCommand(cmd, retvals, logDEBUG1) == FAIL) { - ret = FAIL; - snprintf(mess, MAX_STR_LENGTH, - "Could not copy detector server (tftp). %s\n", - retvals); - // LOG(logERROR, (mess)); already printed in executecommand - } else { - LOG(logINFO, ("\tServer copied\n")); - } + if (snprintf(cmd, MAX_STR_LENGTH, "tftp %s -r %s -g", hostname, + sname) >= MAX_STR_LENGTH) { + ret = FAIL; + strcpy(mess, "Could not copy detector server. Command to copy " + "server too long\n"); + LOG(logERROR, (mess)); + } else if (executeCommand(cmd, retvals, logDEBUG1) == FAIL) { + ret = FAIL; + snprintf(mess, MAX_STR_LENGTH, + "Could not copy detector server (tftp). %s\n", + retvals); + // LOG(logERROR, (mess)); already printed in executecommand + } else { + LOG(logINFO, ("\tServer copied\n")); } if (ret == OK) { @@ -9403,16 +9396,6 @@ void receive_program_via_blackfin(int file_des, enum PROGRAM_INDEX index, functionType); LOG(logERROR, (mess)); #else - // only when writing to kernel flash or root directory - if (index != PROGRAM_FPGA) { - // check update is allowed (Non Amd OR AMD + current kernel) - ret = allowUpdate(mess, functionType); - if (ret == FAIL) { - Server_SendResult(file_des, INT32, NULL, 0); - return; - } - } - // open file and allocate memory for part program FILE *fd = NULL; ret = preparetoCopyProgram(mess, functionType, &fd, filesize); @@ -9632,25 +9615,18 @@ int set_update_mode(int file_des) { return printSocketReadError(); LOG(logDEBUG1, ("Setting update mode to \n", arg)); -#ifdef BLACKFIN_DEFINED - // check update is allowed (Non Amd OR AMD + current kernel) - ret = allowUpdate(mess, "set/unset update mode"); -#endif - - if (ret == OK) { - switch (arg) { - case 0: - ret = deleteFile(mess, UPDATE_FILE, "unset update mode"); - break; - case 1: - ret = createEmptyFile(mess, UPDATE_FILE, "set update mode"); - break; - default: - ret = FAIL; - sprintf(mess, "Could not set updatemode. Options: 0 or 1\n"); - LOG(logERROR, (mess)); - break; - } + switch (arg) { + case 0: + ret = deleteFile(mess, UPDATE_FILE, "unset update mode"); + break; + case 1: + ret = createEmptyFile(mess, UPDATE_FILE, "set update mode"); + break; + default: + ret = FAIL; + sprintf(mess, "Could not set updatemode. Options: 0 or 1\n"); + LOG(logERROR, (mess)); + break; } return Server_SendResult(file_des, INT32, NULL, 0);