detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 04:29:22 +01: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

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;