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

fix

Browse Source
This commit is contained in:
maliakal_d
2020-06-23 13:56:45 +02:00
parent 4cbe354396
commit 692ade6c17
3 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2894,9 +2894,9 @@ int set_pattern_word(int file_des) {
#else
int addr = (int)args[0];
uint64_t word = args[1];
if (word != (int64_t)-1) {
if (word != (uint64_t)-1) {
LOG(logINFO, ("Setting Pattern Word (addr:0x%x, word:0x%llx\n", addr,
(long long int)word));
(long long int)word));
}
if (Server_VerifyLock() == OK) {
// valid address
@ -7340,7 +7340,7 @@ int set_veto(int file_des) {
int set_pattern(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
uint64_t* patwords = malloc(sizeof(uint64_t) * MAX_PATTERN_LENGTH);
uint64_t *patwords = malloc(sizeof(uint64_t) * MAX_PATTERN_LENGTH);
memset(patwords, 0, sizeof(uint64_t) * MAX_PATTERN_LENGTH);
uint64_t patioctrl = 0;
int patlimits[2] = {0, 0};
@ -7348,7 +7348,8 @@ int set_pattern(int file_des) {
int patnloop[3] = {0, 0, 0};
int patwait[3] = {0, 0, 0};
uint64_t patwaittime[3] = {0, 0, 0};
if (receiveData(file_des, patwords, sizeof(uint64_t) * MAX_PATTERN_LENGTH, INT64) < 0)
if (receiveData(file_des, patwords, sizeof(uint64_t) * MAX_PATTERN_LENGTH,
INT64) < 0)
return printSocketReadError();
if (receiveData(file_des, &patioctrl, sizeof(patioctrl), INT64) < 0)
return printSocketReadError();
@ -7368,12 +7369,12 @@ int set_pattern(int file_des) {
#else
if (Server_VerifyLock() == OK) {
LOG(logINFO, ("Setting Pattern from file\n"));
LOG(logINFO, ("Setting Pattern Word (printing every 10 words that are not 0\n"));
LOG(logINFO,
("Setting Pattern Word (printing every 10 words that are not 0\n"));
for (int i = 0; i < MAX_PATTERN_LENGTH; ++i) {
if ((i%10 == 0) && patwords[i] != 0) {
LOG(logINFO,
("Setting Pattern Word (addr:0x%x, word:0x%llx)\n", i,
(long long int)patwords[i]));
if ((i % 10 == 0) && patwords[i] != 0) {
LOG(logINFO, ("Setting Pattern Word (addr:0x%x, word:0x%llx)\n",
i, (long long int)patwords[i]));
}
writePatternWord(i, patwords[i]);
}