detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-27 00:30:03 +02:00
Code Issues Actions Packages Releases Activity

wip

Browse Source
This commit is contained in:
maliakal_d 2021-06-23 08:34:15 +02:00
parent 755738a42e
commit 04645dfae2
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -2080,7 +2080,7 @@ int getDataStream(int left, int *retval) {
} else { } else {
*retval = eiger_virtual_right_datastream; *retval = eiger_virtual_right_datastream;
} }
#endif #else
if (!Beb_GetDataStream(left, retval)) { if (!Beb_GetDataStream(left, retval)) {
return FAIL; return FAIL;
} }

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

@ -8219,7 +8219,7 @@ int get_datastream(int file_des) {
int arg = -1; int arg = -1;
int retval = -1; int retval = -1;
if (receiveData(file_des, args, sizeof(args), INT32) < 0) if (receiveData(file_des, &arg, sizeof(arg), INT32) < 0)
return printSocketReadError(); return printSocketReadError();
LOG(logDEBUG1, ("Getting data stream enable [left:%d]\n", arg)); LOG(logDEBUG1, ("Getting data stream enable [left:%d]\n", arg));
@ -8237,9 +8237,9 @@ int get_datastream(int file_des) {
leftFpga); leftFpga);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
} else { } else {
retval = getDataStream(leftFpga, adcIndex); retval = getDataStream(leftFpga, &retval);
LOG(logDEBUG1, ("datastream (%s) retval: %u\n", LOG(logDEBUG1, ("datastream (%s) retval: %u\n",
(left ? "left" : "right"), retval)); (leftFpga ? "left" : "right"), retval));
} }
#endif #endif
return Server_SendResult(file_des, INT32, &retval, sizeof(retval)); return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
@ -8283,9 +8283,8 @@ int set_datastream(int file_des) {
sprintf(mess, "Could not %s\n", msg); sprintf(mess, "Could not %s\n", msg);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
} else { } else {
int retval = getDataStream(leftFpga); int retval = getDataStream(leftFpga, &retval);
LOG(logDEBUG1, ("%s retval: %u\n", LOG(logDEBUG1, ("%s retval: %u\n", msg, retval));
msg, retval));
validate(&ret, mess, enable, retval, msg, DEC); validate(&ret, mess, enable, retval, msg, DEC);
} }
} }