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

eiger server fix: 10genable stop server does not have send_data struct initialized, not configuring mac or setup header for stop server

Browse Source
This commit is contained in:
maliakal_d 2021-10-13 12:56:03 +02:00
parent c836371b7c
commit 1c13dd95a0
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorServers/eigerDetectorServer/Beb.c
View File

@ -8,8 +8,11 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <unistd.h> #include <unistd.h>
extern int isControlServer;
#define MAX(x, y) (((x) > (y)) ? (x) : (y)) #define MAX(x, y) (((x) > (y)) ? (x) : (y))
struct LocalLinkInterface ll_beb_local, *ll_beb; struct LocalLinkInterface ll_beb_local, *ll_beb;
struct udp_header_type udp_header; struct udp_header_type udp_header;
@ -97,6 +100,9 @@ int Beb_SetUpUDPHeader(unsigned int header_number, int ten_gig,
if (!Beb_activated) if (!Beb_activated)
return 1; return 1;
if (!isControlServer)
return 1;
u_int32_t bram_phy_addr; u_int32_t bram_phy_addr;
u_int32_t *csp0base = 0; u_int32_t *csp0base = 0;
if (ten_gig) if (ten_gig)

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

@ -4969,19 +4969,20 @@ int is_udp_configured() {
} }
void configure_mac() { void configure_mac() {
if (!isControlServer) {
if (is_udp_configured() == OK) { if (is_udp_configured() == OK) {
ret = configureMAC(); ret = configureMAC();
if (ret != OK) { if (ret != OK) {
#if defined(CHIPTESTBOARDD) || defined(MOENCHD) #if defined(CHIPTESTBOARDD) || defined(MOENCHD)
if (ret == -1) { if (ret == -1) {
sprintf(mess, "Could not allocate RAM\n"); sprintf(mess, "Could not allocate RAM\n");
} else { } else {
sprintf(mess, "Could not configure mac because of incorrect " sprintf(mess, "Could not configure mac because of incorrect "
"udp 1G destination IP and port\n"); "udp 1G destination IP and port\n");
} }
#else #else
sprintf(mess, "Configure Mac failed\n"); sprintf(mess, "Configure Mac failed\n");
#endif #endif
strcpy(configureMessage, mess); strcpy(configureMessage, mess);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
} else { } else {
@ -4990,6 +4991,7 @@ void configure_mac() {
return; return;
} }
} }
}
configured = FAIL; configured = FAIL;
LOG(logWARNING, ("Configure FAIL, not all parameters configured yet\n")); LOG(logWARNING, ("Configure FAIL, not all parameters configured yet\n"));
} }