From 8995d3db8d59aaf8a41186aae345e0ab226400e8 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 28 Jan 2022 11:44:12 +0100 Subject: [PATCH] setting next frame number also for udp 1g itnerface --- .../ctbDetectorServer/slsDetectorFunctionList.c | 4 ++++ .../slsDetectorFunctionList.c | 4 ++++ .../include/UDPPacketHeaderGenerator.h | 16 +--------------- .../src/UDPPacketHeaderGenerator.c | 4 ++++ 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index be69d2b25..06999e54d 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -903,6 +903,10 @@ int setNextFrameNumber(uint64_t value) { ("Setting next frame number: %llu\n", (long long unsigned int)value)); setU64BitReg(value, NEXT_FRAME_NUMB_LOCAL_LSB_REG, NEXT_FRAME_NUMB_LOCAL_MSB_REG); +#ifndef VIRTUAL + // for 1g udp interface + setUDPFrameNumber(value); +#endif return OK; } diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c index 883eb231b..dd4b62c0d 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c @@ -805,6 +805,10 @@ int setNextFrameNumber(uint64_t value) { ("Setting next frame number: %llu\n", (long long unsigned int)value)); setU64BitReg(value, NEXT_FRAME_NUMB_LOCAL_LSB_REG, NEXT_FRAME_NUMB_LOCAL_MSB_REG); +#ifndef VIRTUAL + // for 1g udp interface + setUDPFrameNumber(value); +#endif return OK; } diff --git a/slsDetectorServers/slsDetectorServer/include/UDPPacketHeaderGenerator.h b/slsDetectorServers/slsDetectorServer/include/UDPPacketHeaderGenerator.h index 2b401439d..43d011a1b 100644 --- a/slsDetectorServers/slsDetectorServer/include/UDPPacketHeaderGenerator.h +++ b/slsDetectorServers/slsDetectorServer/include/UDPPacketHeaderGenerator.h @@ -4,25 +4,11 @@ #include -/** - * Get current udp packet number - */ uint32_t getUDPPacketNumber(); - -/** - * Get current udp frame number - */ uint64_t getUDPFrameNumber(); - +void setUDPFrameNumber(uint64_t fnum); /** - * Called for each UDP packet header creation - * @param buffer pointer to header * @param id module id */ void createUDPPacketHeader(char *buffer, uint16_t id); - -/** - * fill up the udp packet with data till its full - * @param buffer pointer to memory - */ int fillUDPPacket(char *buffer); diff --git a/slsDetectorServers/slsDetectorServer/src/UDPPacketHeaderGenerator.c b/slsDetectorServers/slsDetectorServer/src/UDPPacketHeaderGenerator.c index df6cbd525..0bc2e6d43 100644 --- a/slsDetectorServers/slsDetectorServer/src/UDPPacketHeaderGenerator.c +++ b/slsDetectorServers/slsDetectorServer/src/UDPPacketHeaderGenerator.c @@ -32,6 +32,10 @@ uint64_t udpFrameNumber = 0; uint32_t getUDPPacketNumber() { return udpPacketNumber; } uint64_t getUDPFrameNumber() { return udpFrameNumber; } +void setUDPFrameNumber(uint64_t fnum) { + LOG(logINFO, ("Setting next frame number also for 1g to %lld\n", fnum)); + udpFrameNumber = fnum; +} void createUDPPacketHeader(char *buffer, uint16_t id) { memset(buffer, 0, sizeof(sls_detector_header));