From 04645dfae2ffe3cd00ab2f039e847340e5922261 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 23 Jun 2021 08:34:15 +0200 Subject: [PATCH] wip --- .../eigerDetectorServer/slsDetectorFunctionList.c | 2 +- .../slsDetectorServer/src/slsDetectorServer_funcs.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c index 2365bb897..2ac082e70 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c @@ -2080,7 +2080,7 @@ int getDataStream(int left, int *retval) { } else { *retval = eiger_virtual_right_datastream; } -#endif +#else if (!Beb_GetDataStream(left, retval)) { return FAIL; } diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index 79c836142..f7acdf3e2 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -8219,7 +8219,7 @@ int get_datastream(int file_des) { int arg = -1; int retval = -1; - if (receiveData(file_des, args, sizeof(args), INT32) < 0) + if (receiveData(file_des, &arg, sizeof(arg), INT32) < 0) return printSocketReadError(); LOG(logDEBUG1, ("Getting data stream enable [left:%d]\n", arg)); @@ -8237,9 +8237,9 @@ int get_datastream(int file_des) { leftFpga); LOG(logERROR, (mess)); } else { - retval = getDataStream(leftFpga, adcIndex); + retval = getDataStream(leftFpga, &retval); LOG(logDEBUG1, ("datastream (%s) retval: %u\n", - (left ? "left" : "right"), retval)); + (leftFpga ? "left" : "right"), retval)); } #endif 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); LOG(logERROR, (mess)); } else { - int retval = getDataStream(leftFpga); - LOG(logDEBUG1, ("%s retval: %u\n", - msg, retval)); + int retval = getDataStream(leftFpga, &retval); + LOG(logDEBUG1, ("%s retval: %u\n", msg, retval)); validate(&ret, mess, enable, retval, msg, DEC); } }