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

removed virtual server warnings

Browse Source
This commit is contained in:
maliakal_d
2020-03-10 15:15:09 +01:00
parent ee799b540a
commit 5192dae9c5
11 changed files with 143 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -575,7 +575,7 @@ int copyModule(sls_detector_module *destMod, sls_detector_module *srcMod);
int calculateDataBytes();
int getTotalNumberOfChannels();
#if defined(MOENCHD) || defined(CHIPTESTBOARDD)
int getNumberOfChannels(int* nchanx, int* nchany);
void getNumberOfChannels(int* nchanx, int* nchany);
#endif
int getNumberOfChips();
int getNumberOfDACs();

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

@ -21,7 +21,7 @@
// Global variables from errno.h
extern int errno;
//extern int errno;
// Variables that will be exported
int lockStatus = 0;

50
slsDetectorServers/slsDetectorServer/src/readDefaultPattern.c
View File

@ -63,7 +63,11 @@ int loadDefaultPattern(char* fname) {
uint64_t word = 0;
// cannot scan values
#ifdef VIRTUAL
if (sscanf(line, "%s 0x%x 0x%lx", command, &addr, &word) != 3) {
#else
if (sscanf(line, "%s 0x%x 0x%llx", command, &addr, &word) != 3) {
#endif
sprintf(initErrorMessage, "Could not scan patword arguments from default "
"pattern file. Line:[%s].\n", line);
break;
@ -79,7 +83,11 @@ int loadDefaultPattern(char* fname) {
uint64_t arg = 0;
// cannot scan values
#ifdef VIRTUAL
if (sscanf(line, "%s 0x%lx", command, &arg) != 2) {
#else
if (sscanf(line, "%s 0x%llx", command, &arg) != 2) {
#endif
sprintf(initErrorMessage, "Could not scan patioctrl arguments from default "
"pattern file. Line:[%s].\n", line);
break;
@ -95,7 +103,11 @@ int loadDefaultPattern(char* fname) {
uint64_t arg = 0;
// cannot scan values
#ifdef VIRTUAL
if (sscanf(line, "%s 0x%lx", command, &arg) != 2) {
#else
if (sscanf(line, "%s 0x%llx", command, &arg) != 2) {
#endif
sprintf(initErrorMessage, "Could not scan patclkctrl arguments from default "
"pattern file. Line:[%s].\n", line);
break;
@ -226,7 +238,11 @@ int loadDefaultPattern(char* fname) {
uint64_t waittime = 0;
// cannot scan values
#ifdef VIRTUAL
if (sscanf(line, "%s %ld", command, &waittime) != 2) {
#else
if (sscanf(line, "%s %lld", command, &waittime) != 2) {
#endif
sprintf(initErrorMessage, "Could not scan patwaittime%d arguments from default "
"pattern file. Line:[%s].\n", level, line);
break;
@ -253,7 +269,7 @@ int loadDefaultPattern(char* fname) {
int default_writePatternWord(char* line, uint32_t addr, uint64_t word) {
//validations
if (addr < 0 || addr >= MAX_PATTERN_LENGTH) {
if ((int32_t)addr < 0 || addr >= MAX_PATTERN_LENGTH) {
sprintf(initErrorMessage, "Cannot set pattern word from default "
"pattern file. Addr must be between 0 and 0x%x. Line:[%s]\n",
MAX_PATTERN_LENGTH, line);
@ -267,8 +283,13 @@ int default_writePatternWord(char* line, uint32_t addr, uint64_t word) {
int default_writePatternIOControl(char* line, uint64_t arg) {
uint64_t retval = writePatternIOControl(arg);
if (retval != arg) {
#ifdef VIRTUAL
sprintf(initErrorMessage, "Could not set patioctrl from default pattern "
"file. Set 0x%lx, read 0x%lx. Line:[%s]\n", arg, retval, line);
#else
sprintf(initErrorMessage, "Could not set patioctrl from default pattern "
"file. Set 0x%llx, read 0x%llx. Line:[%s]\n", arg, retval, line);
#endif
return FAIL;
}
return OK;
@ -278,8 +299,13 @@ int default_writePatternIOControl(char* line, uint64_t arg) {
int default_writePatternClkControl(char* line, uint64_t arg) {
uint64_t retval = writePatternClkControl(arg);
if (retval != arg) {
#ifdef VIRTUAL
sprintf(initErrorMessage, "Could not set patclkctrl from default pattern "
"file. Set 0x%lx, read 0x%lx. Line:[%s]\n", arg, retval, line);
#else
sprintf(initErrorMessage, "Could not set patclkctrl from default pattern "
"file. Set 0x%llx, read 0x%llx. Line:[%s]\n", arg, retval, line);
#endif
return FAIL;
}
return OK;
@ -287,8 +313,8 @@ int default_writePatternClkControl(char* line, uint64_t arg) {
int default_setPatternLoopLimits(char* line, uint32_t startAddr, uint32_t stopAddr) {
//validations
if (startAddr < 0 || startAddr >= MAX_PATTERN_LENGTH ||
stopAddr < 0 || stopAddr >= MAX_PATTERN_LENGTH) {
if ((int32_t)startAddr < 0 || startAddr >= MAX_PATTERN_LENGTH ||
(int32_t)stopAddr < 0 || stopAddr >= MAX_PATTERN_LENGTH) {
sprintf(initErrorMessage, "Cannot set patlimits from default "
"pattern file. Addr must be between 0 and 0x%x. Line:[%s]\n",
MAX_PATTERN_LENGTH, line);
@ -299,7 +325,7 @@ int default_setPatternLoopLimits(char* line, uint32_t startAddr, uint32_t stopAd
setPatternLoop(-1, &r_startAddr, &r_stopAddr, &numLoops);
// validate
if (r_startAddr != startAddr || r_stopAddr != stopAddr) {
if (r_startAddr != (int)startAddr || r_stopAddr != (int)stopAddr) {
sprintf(initErrorMessage, "Could not set patlimits from default pattern "
"file. Read start addr:0x%x, stop addr: 0x%x. Line:[%s]\n",
r_startAddr, r_stopAddr, line);
@ -316,8 +342,8 @@ int default_setPatternLoopAddresses(char* line, int level, uint32_t startAddr, u
line);
return FAIL;
}
if (startAddr < 0 || startAddr >= MAX_PATTERN_LENGTH ||
stopAddr < 0 || stopAddr >= MAX_PATTERN_LENGTH) {
if ((int32_t)startAddr < 0 || startAddr >= MAX_PATTERN_LENGTH ||
(int32_t)stopAddr < 0 || stopAddr >= MAX_PATTERN_LENGTH) {
sprintf(initErrorMessage, "Cannot set patloop (level: %d) from default "
"pattern file. Addr must be between 0 and 0x%x. Line:[%s]\n",
level, MAX_PATTERN_LENGTH, line);
@ -328,7 +354,7 @@ int default_setPatternLoopAddresses(char* line, int level, uint32_t startAddr, u
setPatternLoop(level, &r_startAddr, &r_stopAddr, &numLoops);
// validate
if (r_startAddr != startAddr || r_stopAddr != stopAddr) {
if (r_startAddr != (int)startAddr || r_stopAddr != (int)stopAddr) {
sprintf(initErrorMessage, "Could not set patloop (level: %d) from default "
"pattern file. Read start addr:0x%x, stop addr: 0x%x. Line:[%s]\n",
level, r_startAddr, r_stopAddr, line);
@ -374,14 +400,14 @@ int default_setPatternWaitAddresses(char* line, int level, uint32_t addr) {
line);
return FAIL;
}
if (addr < 0 || addr >= MAX_PATTERN_LENGTH) {
if ((int32_t)addr < 0 || addr >= MAX_PATTERN_LENGTH) {
sprintf(initErrorMessage, "Cannot set patwait address (level: %d) from default "
"pattern file. Addr must be between 0 and 0x%x. Line:[%s]\n",
level, MAX_PATTERN_LENGTH, line);
return FAIL;
}
int retval = setPatternWaitAddress(level, addr);
uint32_t retval = setPatternWaitAddress(level, addr);
// validate
if (retval != addr) {
@ -405,9 +431,15 @@ int default_setPatternWaitTime(char* line, int level, uint64_t waittime) {
// validate
if (retval != waittime) {
#ifdef VIRTUAL
sprintf(initErrorMessage, "Could not set patwaittime (level: %d) from default "
"pattern file. Read %ld wait time. Line:[%s]\n",
level, retval, line);
#else
sprintf(initErrorMessage, "Could not set patwaittime (level: %d) from default "
"pattern file. Read %lld wait time. Line:[%s]\n",
level, retval, line);
#endif
return FAIL;
}
return OK;

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

@ -1377,14 +1377,35 @@ int get_adc(int file_des) {
case I_POWER_IO:
serverAdcIndex = I_PWR_IO;
break;
case SLOW_ADC0:
serverAdcIndex = S_ADC0;
break;
case SLOW_ADC1:
serverAdcIndex = S_ADC1;
break;
case SLOW_ADC2:
serverAdcIndex = S_ADC2;
break;
case SLOW_ADC3:
serverAdcIndex = S_ADC3;
break;
case SLOW_ADC4:
serverAdcIndex = S_ADC4;
break;
case SLOW_ADC5:
serverAdcIndex = S_ADC5;
break;
case SLOW_ADC6:
serverAdcIndex = S_ADC6;
break;
case SLOW_ADC7:
serverAdcIndex = S_ADC7;
break;
case SLOW_ADC_TEMP:
serverAdcIndex = S_TMP;
break;
#endif
default:
#ifdef CHIPTESTBOARDD
if (ind >= SLOW_ADC0 && ind <= SLOW_ADC_TEMP) {
serverAdcIndex = ind;
break;
}
#endif
modeNotImplemented("Adc Index", (int)ind);
break;
}
@ -1535,7 +1556,7 @@ int set_module(int file_des) {
module.reg, module.nchan, module.nchip,
module.ndac, module.iodelay, module.tau, module.eV));
// should at least have a dac
if (ts <= sizeof(sls_detector_module)) {
if (ts <= (int)sizeof(sls_detector_module)) {
ret = FAIL;
sprintf(mess, "Cannot set module. Received incorrect number of dacs or channels\n");
FILE_LOG(logERROR,(mess));
@ -2992,7 +3013,7 @@ int set_pattern_io_control(int file_des) {
functionNotImplemented();
#else
FILE_LOG(logDEBUG1, ("Setting Pattern IO Control to 0x%llx\n", (long long int)arg));
if ((arg == -1) || (Server_VerifyLock() == OK)) {
if (((int64_t)arg == -1) || (Server_VerifyLock() == OK)) {
retval = writePatternIOControl(arg);
FILE_LOG(logDEBUG1, ("Pattern IO Control retval: 0x%llx\n", (long long int) retval));
validate64(arg, retval, "Pattern IO Control", HEX);
@ -3018,7 +3039,7 @@ int set_pattern_clock_control(int file_des) {
functionNotImplemented();
#else
FILE_LOG(logDEBUG1, ("Setting Pattern Clock Control to 0x%llx\n", (long long int)arg));
if ((arg == -1) || (Server_VerifyLock() == OK)) {
if (((int64_t)arg == -1) || (Server_VerifyLock() == OK)) {
retval = writePatternClkControl(arg);
FILE_LOG(logDEBUG1, ("Pattern Clock Control retval: 0x%llx\n", (long long int) retval));
validate64(arg, retval, "Pattern Clock Control", HEX);
@ -3204,7 +3225,7 @@ int set_pattern_wait_time(int file_des) {
int loopLevel = (int)args[0];
uint64_t timeval = args[1];
FILE_LOG(logDEBUG1, ("Setting Pattern wait time (loopLevel:%d timeval:0x%llx)\n", loopLevel, (long long int)timeval));
if ((timeval == -1) || (Server_VerifyLock() == OK)) {
if (((int64_t)timeval == -1) || (Server_VerifyLock() == OK)) {
// valid loop level 0-2
if (loopLevel < 0 || loopLevel > 2) {
ret = FAIL;
@ -4608,7 +4629,11 @@ int set_starting_frame_number(int file_des) {
#ifdef EIGERD
else if (arg > UDP_HEADER_MAX_FRAME_VALUE) {
ret = FAIL;
#ifdef VIRTUAL
sprintf(mess, "Could not set starting frame number. Must be less then %ld (0x%lx)\n", UDP_HEADER_MAX_FRAME_VALUE, UDP_HEADER_MAX_FRAME_VALUE);
#else
sprintf(mess, "Could not set starting frame number. Must be less then %lld (0x%llx)\n", UDP_HEADER_MAX_FRAME_VALUE, UDP_HEADER_MAX_FRAME_VALUE);
#endif
FILE_LOG(logERROR,(mess));
}
#endif
@ -4630,7 +4655,11 @@ int set_starting_frame_number(int file_des) {
} else {
if (arg != retval) {
ret = FAIL;
#ifdef VIRTUAL
sprintf(mess, "Could not set starting frame number. Set 0x%lx, but read 0x%lx\n", arg, retval);
#else
sprintf(mess, "Could not set starting frame number. Set 0x%llx, but read 0x%llx\n", arg, retval);
#endif
FILE_LOG(logERROR,(mess));
}
}