detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 10:07:59 +02:00
Code Issues Actions Packages Releases Activity

wipg

Browse Source
This commit is contained in:
maliakal_d
2021-08-18 19:05:05 +02:00
parent d9f969ae6f
commit f8d8fcf48a
13 changed files with 405 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -25,7 +25,7 @@
// Global variable from slsDetectorServer_funcs
extern int debugflag;
extern int updateFlag;
extern udpStruct udpDetails;
extern udpStruct udpDetails[MAX_UDP_DESTINATION];
extern const enum detectorType myDetectorType;
// Global variable from UDPPacketHeaderGenerator
@ -480,6 +480,7 @@ void setupDetector() {
sharedMemory_setStatus(IDLE);
initializePatternWord();
#endif
setupUDPCommParameters();
ALTERA_PLL_ResetPLLAndReconfiguration();
resetCore();
@ -1544,7 +1545,7 @@ int configureMAC() {
LOG(logINFOBLUE, ("\t1G MAC\n"));
if (updateDatabytesandAllocateRAM() == FAIL)
return -1;
if (setUDPDestinationDetails(0, dst_ip, dstport) == FAIL) {
if (setUDPDestinationDetails(0, 0, dst_ip, dstport) == FAIL) {
LOG(logERROR, ("could not set udp 1G destination IP and port\n"));
return FAIL;
}
@ -2023,7 +2024,7 @@ void *start_timer(void *arg) {
imageData + srcOffset, dataSize);
srcOffset += dataSize;
sendUDPPacket(0, packetData, packetSize);
sendUDPPacket(0, 0, packetData, packetSize);
}
LOG(logINFO, ("Sent frame: %d [%lld]\n", frameNr,
(long long unsigned int)virtual_currentFrameNumber));
@ -2140,10 +2141,10 @@ void readandSendUDPFrames(int *ret, char *mess) {
LOG(logDEBUG1, ("Reading from 1G UDP\n"));
// validate udp socket
if (getUdPSocketDescriptor(0) <= 0) {
if (getUdPSocketDescriptor(0, 0) <= 0) {
*ret = FAIL;
sprintf(mess, "UDP Socket not created. sockfd:%d\n",
getUdPSocketDescriptor(0));
getUdPSocketDescriptor(0, 0));
LOG(logERROR, (mess));
return;
}
@ -2152,7 +2153,7 @@ void readandSendUDPFrames(int *ret, char *mess) {
while (readFrameFromFifo() == OK) {
int bytesToSend = 0, n = 0;
while ((bytesToSend = fillUDPPacket(udpPacketData))) {
n += sendUDPPacket(0, udpPacketData, bytesToSend);
n += sendUDPPacket(0, 0, udpPacketData, bytesToSend);
}
if (n >= dataBytes) {
LOG(logINFO, (" Frame %lld sent (%d packets, %d databytes, n:%d "