diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index c3376a566..f41f4d075 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 b6d88758b..7a4431dbb 100755 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer differ diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer index d9eb9567c..203022a49 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 614697738..0087a5941 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 689983ff1..9069872eb 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 06de46a65..49deef72d 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ diff --git a/slsDetectorServers/slsDetectorServer/src/programViaBlackfin.c b/slsDetectorServers/slsDetectorServer/src/programViaBlackfin.c index 4cdd9ee14..483b5773c 100644 --- a/slsDetectorServers/slsDetectorServer/src/programViaBlackfin.c +++ b/slsDetectorServers/slsDetectorServer/src/programViaBlackfin.c @@ -486,8 +486,8 @@ int checkNormalFile(char *mess, enum PROGRAM_INDEX index, int forceDeleteNormalF LOG(logERROR, (mess)); return FAIL; } - // zero = normal file (not block special file) - if (S_ISBLK(buf.st_mode)) { + // zero = normal file (not char special drive file) + if (!S_ISCHR(buf.st_mode)) { // kernel memory is not permanent if (index != PROGRAM_FPGA) { sprintf(mess, diff --git a/slsDetectorServers/slsDetectorServer/src/programViaNios.c b/slsDetectorServers/slsDetectorServer/src/programViaNios.c index a1408338c..eeff442a3 100644 --- a/slsDetectorServers/slsDetectorServer/src/programViaNios.c +++ b/slsDetectorServers/slsDetectorServer/src/programViaNios.c @@ -158,8 +158,8 @@ int openFileForFlash(char *mess, FILE **flashfd) { LOG(logERROR, (mess)); return FAIL; } - // zero = normal file (not block special file) - if (S_ISBLK(buf.st_mode)) { + // zero = normal file (not char drive special file) + if (!S_ISCHR(buf.st_mode)) { // memory is not permanent sprintf(mess, "Could not %s. The flash drive found is a normal file. " diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 278993a66..eb0a392f1 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -7,9 +7,9 @@ #define APIGUI 0x211124 #define APIEIGER 0x220324 -#define APICTB 0x220324 -#define APIGOTTHARD 0x220324 -#define APIGOTTHARD2 0x220324 -#define APIJUNGFRAU 0x220324 -#define APIMYTHEN3 0x220324 -#define APIMOENCH 0x220324 +#define APICTB 0x220328 +#define APIGOTTHARD 0x220328 +#define APIGOTTHARD2 0x220328 +#define APIMYTHEN3 0x220328 +#define APIMOENCH 0x220328 +#define APIJUNGFRAU 0x220328