detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 23:10:02 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -1360,19 +1360,19 @@ int getADC(enum ADCINDEX ind){
return INA226_ReadCurrent(I2C_POWER_VIO_DEVICE_ID + (int)(ind - I_PWR_IO));
// slow adcs
case SLOW_ADC_TEMP:
case S_TMP:
FILE_LOG(logDEBUG1, ("Reading Slow ADC Temperature\n"));
return AD7689_GetTemperature();
case SLOW_ADC0:
case SLOW_ADC1:
case SLOW_ADC2:
case SLOW_ADC3:
case SLOW_ADC4:
case SLOW_ADC5:
case SLOW_ADC6:
case SLOW_ADC7:
FILE_LOG(logDEBUG1, ("Reading Slow ADC Channel %d\n", (int)ind - SLOW_ADC0));
return AD7689_GetChannel((int)ind - SLOW_ADC0);
case S_ADC0:
case S_ADC1:
case S_ADC2:
case S_ADC3:
case S_ADC4:
case S_ADC5:
case S_ADC6:
case S_ADC7:
FILE_LOG(logDEBUG1, ("Reading Slow ADC Channel %d\n", (int)ind - S_ADC0));
return AD7689_GetChannel((int)ind - S_ADC0);
default:
FILE_LOG(logERROR, ("Adc Index %d not defined \n", (int)ind));
return -1;
@ -1844,7 +1844,7 @@ int getPipeline(enum CLKINDEX ind) {
// patterns
uint64_t writePatternIOControl(uint64_t word) {
if (word != -1) {
if ((int64_t)word != -1) {
FILE_LOG(logINFO, ("Setting Pattern I/O Control: 0x%llx\n", (long long int) word));
set64BitReg(word, PATTERN_IO_CNTRL_LSB_REG, PATTERN_IO_CNTRL_MSB_REG);
}
@ -1854,7 +1854,7 @@ uint64_t writePatternIOControl(uint64_t word) {
}
uint64_t writePatternClkControl(uint64_t word) {
if (word != -1) {
if ((int64_t)word != -1) {
FILE_LOG(logINFO, ("Setting Pattern Clock Control: 0x%llx\n", (long long int) word));
set64BitReg(word, PATTERN_IO_CLK_CNTRL_LSB_REG, PATTERN_IO_CLK_CNTRL_MSB_REG);
}
@ -1893,7 +1893,7 @@ uint64_t readPatternWord(int addr) {
uint64_t writePatternWord(int addr, uint64_t word) {
// get
if (word == -1)
if ((int64_t)word == -1)
return readPatternWord(addr);
// error (handled in tcp)
@ -1994,7 +1994,7 @@ uint64_t setPatternWaitTime(int level, uint64_t t) {
}
// set
if (t >= 0) {
if ((int64_t)t >= 0) {
FILE_LOG(logINFO, ("Setting Pattern Wait Time (level:%d, t:%lld)\n", level, (long long int)t));
set64BitReg(t, regl, regm);
}
@ -2558,7 +2558,7 @@ int getTotalNumberOfChannels() {
return nchanx * nchany;
}
int getNumberOfChannels(int* nchanx, int* nchany) {
void getNumberOfChannels(int* nchanx, int* nchany) {
int nachans = 0, ndchans = 0;
// analog channels (normal, analog/digital readout)
if (analogEnable) {

2
slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h
View File

@ -36,7 +36,7 @@ typedef struct udp_header_struct {
#define UDP_IP_HEADER_LENGTH_BYTES (28)
/* Enums */
enum ADCINDEX {V_PWR_IO, V_PWR_A, V_PWR_B, V_PWR_C, V_PWR_D, I_PWR_IO, I_PWR_A, I_PWR_B, I_PWR_C, I_PWR_D};
enum ADCINDEX {V_PWR_IO, V_PWR_A, V_PWR_B, V_PWR_C, V_PWR_D, I_PWR_IO, I_PWR_A, I_PWR_B, I_PWR_C, I_PWR_D, S_ADC0, S_ADC1, S_ADC2, S_ADC3, S_ADC4, S_ADC5, S_ADC6, S_ADC7, S_TMP};
enum DACINDEX {D0, D1, D2, D3, D4, D5, D6, D7, D8, D9,
D10, D11, D12, D13, D14, D15, D16, D17,
D_PWR_D, D_PWR_CHIP, D_PWR_C, D_PWR_B, D_PWR_A, D_PWR_IO};

47
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -11,6 +11,7 @@
#include <unistd.h> //to gethostname
#include <string.h>
#ifdef VIRTUAL
#include <netinet/in.h>
#include "communication_funcs_UDP.h"
#include <pthread.h>
#include <time.h>
@ -241,7 +242,11 @@ u_int64_t getDetectorMAC() {
strcat(mac,pch);
pch = strtok (NULL, ":");
}
#ifdef VIRTUAL
sscanf(mac,"%lx",&res);
#else
sscanf(mac, "%llx", &res);
#endif
//increment by 1 for 10g
if (send_to_ten_gig)
res++;
@ -1161,6 +1166,25 @@ int configureMAC() {
int destport = udpDetails.dstport;
int destport2 = udpDetails.dstport2;
FILE_LOG(logINFO, ("Configuring MAC\n"));
char src_mac[50], src_ip[INET_ADDRSTRLEN],dst_mac[50], dst_ip[INET_ADDRSTRLEN];
getMacAddressinString(src_mac, 50, sourcemac);
getMacAddressinString(dst_mac, 50, destmac);
getIpAddressinString(src_ip, sourceip);
getIpAddressinString(dst_ip, destip);
FILE_LOG(logINFO, (
"\tSource IP : %s\n"
"\tSource MAC : %s\n"
"\tSource Port : %d\n"
"\tDest IP : %s\n"
"\tDest MAC : %s\n"
"\tDest Port : %d\n"
"\tDest Port2 : %d\n",
src_ip, src_mac, src_port,
dst_ip, dst_mac, destport, destport2));
#ifdef VIRTUAL
char cDestIp[MAX_STR_LENGTH];
memset(cDestIp, 0, MAX_STR_LENGTH);
@ -1176,23 +1200,6 @@ int configureMAC() {
}
return OK;
#else
FILE_LOG(logINFO, ("Configuring MAC\n"));
char src_mac[50], src_ip[INET_ADDRSTRLEN],dst_mac[50], dst_ip[INET_ADDRSTRLEN];
getMacAddressinString(src_mac, 50, sourcemac);
getMacAddressinString(dst_mac, 50, destmac);
getIpAddressinString(src_ip, sourceip);
getIpAddressinString(dst_ip, destip);
FILE_LOG(logINFO, (
"\tSource IP : %s\n"
"\tSource MAC : %s\n"
"\tSource Port : %d\n"
"\tDest IP : %s\n"
"\tDest MAC : %s\n",
src_ip, src_mac, src_port,
dst_ip, dst_mac));
int beb_num = detid;
int header_number = 0;
@ -1283,8 +1290,8 @@ int setInterruptSubframe(int value) {
if(!Feb_Control_SetInterruptSubframe(value)) {
return FAIL;
}
return OK;
#endif
return OK;
}
int getInterruptSubframe() {
@ -1303,8 +1310,8 @@ int setReadNLines(int value) {
return FAIL;
}
Beb_SetReadNLines(value);
return OK;
#endif
return OK;
}
int getReadNLines() {
@ -1531,7 +1538,7 @@ int64_t getCurrentTau() {
}
void setExternalGating(int enable[]) {
if (enable>=0) {
if (enable[0]>=0 && enable[1]>=0) {
#ifndef VIRTUAL
Feb_Control_SetExternalEnableMode(enable[0], enable[1]);//enable = 0 or 1, polarity = 0 or 1 , where 1 is positive
#endif

4
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -205,8 +205,8 @@ int testBus() {
int ret = OK;
u_int32_t addr = DTA_OFFSET_REG;
int times = 1000 * 1000;
int i = 0;
u_int32_t times = 1000 * 1000;
u_int32_t i = 0;
for (i = 0; i < times; ++i) {
bus_w(addr, i * 100);

10
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -207,8 +207,8 @@ int testBus() {
int ret = OK;
u_int32_t addr = SET_TRIGGER_DELAY_LSB_REG;
int times = 1000 * 1000;
int i = 0;
u_int32_t times = 1000 * 1000;
u_int32_t i = 0;
for (i = 0; i < times; ++i) {
bus_w(addr, i * 100);
@ -1173,8 +1173,8 @@ int configureMAC() {
int setDetectorPosition(int pos[]) {
int ret = OK;
int innerPos[2] = {pos[X], pos[Y]};
int outerPos[2] = {pos[X], pos[Y]};
uint32_t innerPos[2] = {pos[X], pos[Y]};
uint32_t outerPos[2] = {pos[X], pos[Y]};
int selInterface = getPrimaryInterface();
if (getNumberofUDPInterfaces() == 1) {
@ -1514,7 +1514,7 @@ int setThresholdTemperature(int val) {
// conversion
temp = (temp * (625.0/10.0));
float ftemp = (double)temp/1000.00;
double ftemp = (double)temp/1000.00;
FILE_LOG(logDEBUG1, ("Threshold Temperature read %f °C\n",ftemp));
return temp;

10
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@ -1544,7 +1544,7 @@ int getPipeline(enum CLKINDEX ind) {
// patterns
uint64_t writePatternIOControl(uint64_t word) {
if (word != -1) {
if ((int64_t)word != -1) {
FILE_LOG(logINFO, ("Setting Pattern I/O Control: 0x%llx\n", (long long int) word));
set64BitReg(word, PATTERN_IO_CNTRL_LSB_REG, PATTERN_IO_CNTRL_MSB_REG);
}
@ -1554,7 +1554,7 @@ uint64_t writePatternIOControl(uint64_t word) {
}
uint64_t writePatternClkControl(uint64_t word) {
if (word != -1) {
if ((int64_t)word != -1) {
FILE_LOG(logINFO, ("Setting Pattern Clock Control: 0x%llx\n", (long long int) word));
set64BitReg(word, PATTERN_IO_CLK_CNTRL_LSB_REG, PATTERN_IO_CLK_CNTRL_MSB_REG);
}
@ -1593,7 +1593,7 @@ uint64_t readPatternWord(int addr) {
uint64_t writePatternWord(int addr, uint64_t word) {
// get
if (word == -1)
if ((int64_t)word == -1)
return readPatternWord(addr);
// error (handled in tcp)
@ -1694,7 +1694,7 @@ uint64_t setPatternWaitTime(int level, uint64_t t) {
}
// set
if (t >= 0) {
if ((int64_t)t >= 0) {
FILE_LOG(logINFO, ("Setting Pattern Wait Time (level:%d, t:%lld)\n", level, (long long int)t));
set64BitReg(t, regl, regm);
}
@ -2183,7 +2183,7 @@ int getTotalNumberOfChannels() {
return nchanx * nchany;
}
int getNumberOfChannels(int* nchanx, int* nchany) {
void getNumberOfChannels(int* nchanx, int* nchany) {
uint32_t mask = enableTenGigabitEthernet(-1) ? adcEnableMask_10g : adcEnableMask_1g;
// count number of channels in x, each adc has 25 channels each
int nchanTop = __builtin_popcount(mask & 0xF0F0F0F0) * NCHANS_PER_ADC;

8
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -194,8 +194,8 @@ int testBus() {
int ret = OK;
u_int32_t addr = DTA_OFFSET_REG;
int times = 1000 * 1000;
int i = 0;
u_int32_t times = 1000 * 1000;
u_int32_t i = 0;
for (i = 0; i < times; ++i) {
bus_w(addr, i * 100);
@ -911,7 +911,7 @@ uint64_t readPatternWord(int addr) {
uint64_t writePatternWord(int addr, uint64_t word) {
// get
if (word == -1)
if ((int64_t)word == -1)
return readPatternWord(addr);
// error (handled in tcp)
@ -1003,7 +1003,7 @@ uint64_t setPatternWaitTime(int level, uint64_t t) {
}
// set
if (t >= 0) {
if ((int64_t)t >= 0) {
FILE_LOG(logINFO, ("Setting Pattern Wait Time (level:%d, t:%lld)\n", level, (long long int)t));
set64BitReg(t, regl, regm);
}

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));
}
}