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

eiger: deactivate at startup, hostname activates, config file for top or master, if none, reset to hardware, no binaries

Browse Source
This commit is contained in:
maliakal_d 2020-05-08 18:11:15 +02:00
parent 13c1f7c2d6
commit 30078d6c1f
8 changed files with 1333 additions and 1202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

274
slsDetectorServers/eigerDetectorServer/Beb.c
View File

@ -298,77 +298,94 @@ int Beb_IsTransmitting(int *retval, int tengiga, int waitForDelay) {
return OK; return OK;
} }
int Beb_SetTop(int val) { int Beb_SetTop(enum TOPINDEX ind) {
if (!Beb_activated) if (!Beb_activated)
return 0; return 0;
// mapping new memory
u_int32_t *csp0base = 0;
u_int32_t value = 0, ret = 1;
// open file pointer u_int32_t *csp0base = 0;
u_int32_t value = 0;
int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_SYS_BASEADDR); int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_SYS_BASEADDR);
if (fd < 0) { if (fd < 0) {
LOG(logERROR, ("Set Top FAIL, could not open fd\n")); LOG(logERROR, ("Set Top FAIL, could not open fd in Beb\n"));
} else { return 0;
value = Beb_Read32(csp0base, BEB_CONFIG_WR_OFST); value = Beb_Read32(csp0base, BEB_CONFIG_WR_OFST);
switch (ind) {
case TOP_HARDWARE:
value &= ~BEB_CONFIG_OW_TOP_MSK;
break;
case OW_TOP:
value |= BEB_CONFIG_OW_TOP_MSK; value |= BEB_CONFIG_OW_TOP_MSK;
if (val) {
value |= BEB_CONFIG_TOP_MSK; value |= BEB_CONFIG_TOP_MSK;
} else { break;
case OW_BOTTOM:
value |= BEB_CONFIG_OW_TOP_MSK;
value &= ~BEB_CONFIG_TOP_MSK; value &= ~BEB_CONFIG_TOP_MSK;
break;
default:
LOG(logERROR, ("Unknown top index in Beb: %d\n", ind));
Beb_close(fd, csp0base);
return 0;
} }
char *top_names[] = {TOP_NAMES};
int newval = Beb_Write32(csp0base, BEB_CONFIG_WR_OFST, value); int newval = Beb_Write32(csp0base, BEB_CONFIG_WR_OFST, value);
if (newval != value) { if (newval != value) {
LOG(logERROR, ("Could not overwrite Top to %d\n", val)); LOG(logERROR,
} else { ("Could not set Top flag to %s in Beb\n", top_names[ind]));
ret = 0;
LOG(logINFOBLUE,
("Overwriting BEB Hardware: %s\n", (val ? "Top" : "Bottom")));
Beb_top = val;
}
}
// close file pointer
if (fd > 0)
Beb_close(fd, csp0base); Beb_close(fd, csp0base);
return 0;
return ret; }
LOG(logINFOBLUE, ("%s Top flag to %s in Beb\n",
(ind == TOP_HARDWARE ? "Resetting" : "Overwriting"),
top_names[ind]));
Beb_close(fd, csp0base);
return 1;
} }
int Beb_SetMaster(int val) { int Beb_SetMaster(enum MASTERINDEX ind) {
if (!Beb_activated) if (!Beb_activated)
return 0; return 0;
// mapping new memory
u_int32_t *csp0base = 0;
u_int32_t value = 0, ret = 1;
// open file pointer u_int32_t *csp0base = 0;
u_int32_t value = 0;
int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_SYS_BASEADDR); int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_SYS_BASEADDR);
if (fd < 0) { if (fd < 0) {
LOG(logERROR, ("Set Master FAIL, could not open fd\n")); LOG(logERROR, ("Set Master FAIL, could not open fd in Beb\n"));
} else { return 0;
value = Beb_Read32(csp0base, BEB_CONFIG_WR_OFST);
value |= BEB_CONFIG_OW_MASTER_MSK;
if (val) {
value |= BEB_CONFIG_MASTER_MSK;
} else {
value &= ~BEB_CONFIG_MASTER_MSK;
} }
value = Beb_Read32(csp0base, BEB_CONFIG_WR_OFST);
switch (ind) {
case MASTER_HARDWARE:
value &= ~BEB_CONFIG_OW_MASTER_MSK;
break;
case OW_MASTER:
value |= BEB_CONFIG_OW_MASTER_MSK;
value |= BEB_CONFIG_MASTER_MSK;
break;
case OW_SLAVE:
value |= BEB_CONFIG_OW_MASTER_MSK;
value &= ~BEB_CONFIG_MASTER_MSK;
break;
default:
LOG(logERROR, ("Unknown master index in Beb: %d\n", ind));
Beb_close(fd, csp0base);
return 0;
}
char *master_names[] = {MASTER_NAMES};
int newval = Beb_Write32(csp0base, BEB_CONFIG_WR_OFST, value); int newval = Beb_Write32(csp0base, BEB_CONFIG_WR_OFST, value);
if (newval != value) { if (newval != value) {
LOG(logERROR, ("Could not overwrite Master to %d\n", val)); LOG(logERROR, ("Could not set Master flag to %s in Beb\n",
} else { master_names[ind]));
ret = 0;
LOG(logINFOBLUE,
("Overwriting BEB Hardware: %s\n", (val ? "Master" : "Slave")));
}
}
// close file pointer
if (fd > 0)
Beb_close(fd, csp0base); Beb_close(fd, csp0base);
return 0;
}
LOG(logINFOBLUE, ("%s Master flag to %s in Beb\n",
(ind == TOP_HARDWARE ? "Resetting" : "Overwriting"),
master_names[ind]));
return ret; Beb_close(fd, csp0base);
return 1;
} }
int Beb_Activate(int enable) { int Beb_Activate(int enable) {
@ -430,7 +447,8 @@ int Beb_Set32bitOverflow(int val) {
// open file pointer // open file pointer
int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_SYS_BASEADDR); int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_SYS_BASEADDR);
if (fd < 0) { if (fd < 0) {
LOG(logERROR, ("Could not read register to set overflow flag in 32 bit " LOG(logERROR,
("Could not read register to set overflow flag in 32 bit "
"mode. FAIL\n")); "mode. FAIL\n"));
return -1; return -1;
} else { } else {
@ -443,7 +461,8 @@ int Beb_Set32bitOverflow(int val) {
// set bit // set bit
valueread = Beb_Read32(csp0base, offset); valueread = Beb_Read32(csp0base, offset);
Beb_Write32(csp0base, offset, Beb_Write32(csp0base, offset,
valueread | ((val << FLOW_REG_OVERFLOW_32_BIT_OFST) & valueread |
((val << FLOW_REG_OVERFLOW_32_BIT_OFST) &
FLOW_REG_OVERFLOW_32_BIT_MSK)); FLOW_REG_OVERFLOW_32_BIT_MSK));
} }
@ -463,8 +482,8 @@ int Beb_GetTenGigaFlowControl() {
u_int32_t *csp0base = 0; u_int32_t *csp0base = 0;
int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_SYS_BASEADDR); int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_SYS_BASEADDR);
if (fd <= 0) { if (fd <= 0) {
LOG(logERROR, LOG(logERROR, ("Could not read register to get ten giga flow "
("Could not read register to get ten giga flow control. FAIL\n")); "control. FAIL\n"));
return -1; return -1;
} else { } else {
u_int32_t retval = Beb_Read32(csp0base, offset); u_int32_t retval = Beb_Read32(csp0base, offset);
@ -483,8 +502,8 @@ int Beb_SetTenGigaFlowControl(int value) {
u_int32_t *csp0base = 0; u_int32_t *csp0base = 0;
int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_SYS_BASEADDR); int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_SYS_BASEADDR);
if (fd <= 0) { if (fd <= 0) {
LOG(logERROR, LOG(logERROR, ("Could not read register to set ten giga flow "
("Could not read register to set ten giga flow control. FAIL\n")); "control. FAIL\n"));
return 0; return 0;
} else { } else {
// reset bit // reset bit
@ -521,7 +540,8 @@ int Beb_GetTransmissionDelayFrame() {
int Beb_SetTransmissionDelayFrame(int value) { int Beb_SetTransmissionDelayFrame(int value) {
LOG(logINFO, ("Setting transmission delay frame to %d\n", value)); LOG(logINFO, ("Setting transmission delay frame to %d\n", value));
if (value < 0) { if (value < 0) {
LOG(logERROR, ("Invalid transmission delay frame value %d\n", value)); LOG(logERROR,
("Invalid transmission delay frame value %d\n", value));
return 0; return 0;
} }
u_int32_t offset = TXM_DELAY_FRAME_OFFSET; u_int32_t offset = TXM_DELAY_FRAME_OFFSET;
@ -543,8 +563,8 @@ int Beb_GetTransmissionDelayLeft() {
u_int32_t *csp0base = 0; u_int32_t *csp0base = 0;
int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_SYS_BASEADDR); int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_SYS_BASEADDR);
if (fd <= 0) { if (fd <= 0) {
LOG(logERROR, LOG(logERROR, ("Could not read register to get transmission delay "
("Could not read register to get transmission delay left. FAIL\n")); "left. FAIL\n"));
return -1; return -1;
} else { } else {
u_int32_t retval = Beb_Read32(csp0base, offset); u_int32_t retval = Beb_Read32(csp0base, offset);
@ -556,15 +576,16 @@ int Beb_GetTransmissionDelayLeft() {
int Beb_SetTransmissionDelayLeft(int value) { int Beb_SetTransmissionDelayLeft(int value) {
LOG(logINFO, ("Setting transmission delay left to %d\n", value)); LOG(logINFO, ("Setting transmission delay left to %d\n", value));
if (value < 0) { if (value < 0) {
LOG(logERROR, ("Invalid transmission delay left value %d\n", value)); LOG(logERROR,
("Invalid transmission delay left value %d\n", value));
return 0; return 0;
} }
u_int32_t offset = TXM_DELAY_LEFT_OFFSET; u_int32_t offset = TXM_DELAY_LEFT_OFFSET;
u_int32_t *csp0base = 0; u_int32_t *csp0base = 0;
int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_SYS_BASEADDR); int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_SYS_BASEADDR);
if (fd <= 0) { if (fd <= 0) {
LOG(logERROR, LOG(logERROR, ("Could not read register to set transmission delay "
("Could not read register to set transmission delay left. FAIL\n")); "left. FAIL\n"));
return 0; return 0;
} else { } else {
Beb_Write32(csp0base, offset, value); Beb_Write32(csp0base, offset, value);
@ -591,7 +612,8 @@ int Beb_GetTransmissionDelayRight() {
int Beb_SetTransmissionDelayRight(int value) { int Beb_SetTransmissionDelayRight(int value) {
LOG(logINFO, ("Setting transmission delay right to %d\n", value)); LOG(logINFO, ("Setting transmission delay right to %d\n", value));
if (value < 0) { if (value < 0) {
LOG(logERROR, ("Invalid transmission delay right value %d\n", value)); LOG(logERROR,
("Invalid transmission delay right value %d\n", value));
return 0; return 0;
} }
u_int32_t offset = TXM_DELAY_RIGHT_OFFSET; u_int32_t offset = TXM_DELAY_RIGHT_OFFSET;
@ -630,7 +652,8 @@ int Beb_SetNetworkParameter(enum NETWORKINDEX mode, int val) {
break; break;
default: default:
LOG(logERROR, ("Unrecognized mode in network parameter: %d\n", mode)); LOG(logERROR,
("Unrecognized mode in network parameter: %d\n", mode));
return -1; return -1;
} }
// open file pointer // open file pointer
@ -666,8 +689,8 @@ u_int32_t Beb_GetFirmwareRevision() {
} else { } else {
value = Beb_Read32(csp0base, FIRMWARE_VERSION_OFFSET); value = Beb_Read32(csp0base, FIRMWARE_VERSION_OFFSET);
if (!value) { if (!value) {
LOG(logERROR, LOG(logERROR, ("Firmware Revision Number does not exist in "
("Firmware Revision Number does not exist in this version\n")); "this version\n"));
} }
} }
@ -690,7 +713,8 @@ u_int32_t Beb_GetFirmwareSoftwareAPIVersion() {
} else { } else {
value = Beb_Read32(csp0base, FIRMWARESOFTWARE_API_OFFSET); value = Beb_Read32(csp0base, FIRMWARESOFTWARE_API_OFFSET);
if (!value) { if (!value) {
LOG(logERROR, ("Firmware Software API Version does not exist in " LOG(logERROR,
("Firmware Software API Version does not exist in "
"this version\n")); "this version\n"));
} }
} }
@ -737,7 +761,8 @@ int Beb_InitBebInfos() { // file name at some point
struct BebInfo b0; struct BebInfo b0;
BebInfo_BebInfo(&b0, 0); BebInfo_BebInfo(&b0, 0);
if (BebInfo_SetSerialAddress( if (BebInfo_SetSerialAddress(
&b0, 0xff)) { // all bebs for reset and possibly get request data? &b0,
0xff)) { // all bebs for reset and possibly get request data?
beb_infos[bebInfoSize] = b0; beb_infos[bebInfoSize] = b0;
bebInfoSize++; bebInfoSize++;
} }
@ -763,8 +788,8 @@ int Beb_InitBebInfos() { // file name at some point
//loop through file to fill vector. //loop through file to fill vector.
BebInfo* b = new BebInfo(26); BebInfo* b = new BebInfo(26);
b->SetSerialAddress(0); //0xc4000000 b->SetSerialAddress(0); //0xc4000000
b->SetHeaderInfo(0,"00:50:c2:46:d9:34","129.129.205.78",42000 + 26); // 1 GbE, b->SetHeaderInfo(0,"00:50:c2:46:d9:34","129.129.205.78",42000 + 26); // 1
ip address can be acquire from the network "arp" GbE, ip address can be acquire from the network "arp"
b->SetHeaderInfo(1,"00:50:c2:46:d9:35","10.0.26.1",52000 + 26); //10 GbE, b->SetHeaderInfo(1,"00:50:c2:46:d9:35","10.0.26.1",52000 + 26); //10 GbE,
everything calculable/setable beb_infos.push_back(b); everything calculable/setable beb_infos.push_back(b);
*/ */
@ -778,10 +803,13 @@ int Beb_SetBebSrcHeaderInfos(unsigned int beb_number, int ten_gig,
// so that the values can be reset externally for now.... // so that the values can be reset externally for now....
unsigned int i = 1; /*Beb_GetBebInfoIndex(beb_number);*/ unsigned int i = 1; /*Beb_GetBebInfoIndex(beb_number);*/
/******* if (!i) return 0;****************************/ // i must be greater /******* if (!i) return 0;****************************/ // i must be
// than 0, zero is // greater than
// the global send // 0, zero is
BebInfo_SetHeaderInfo(&beb_infos[i], ten_gig, src_mac, src_ip, src_port); // the global
// send
BebInfo_SetHeaderInfo(&beb_infos[i], ten_gig, src_mac, src_ip,
src_port);
LOG(logINFO, ("Printing Beb info number (%d) :\n", i)); LOG(logINFO, ("Printing Beb info number (%d) :\n", i));
BebInfo_Print(&beb_infos[i]); BebInfo_Print(&beb_infos[i]);
@ -811,8 +839,8 @@ unsigned int Beb_GetBebInfoIndex(unsigned int beb_numb) {
unsigned int i; unsigned int i;
for (i = 1; i < bebInfoSize; i++) for (i = 1; i < bebInfoSize; i++)
if (beb_numb == BebInfo_GetBebNumber(&beb_infos[i])) { if (beb_numb == BebInfo_GetBebNumber(&beb_infos[i])) {
LOG(logDEBUG1, LOG(logDEBUG1, ("*****found beb index:%d, for beb number:%d\n",
("*****found beb index:%d, for beb number:%d\n", i, beb_numb)); i, beb_numb));
return i; return i;
} }
LOG(logDEBUG1, ("*****Returning 0\n")); LOG(logDEBUG1, ("*****Returning 0\n"));
@ -857,8 +885,8 @@ void Beb_SwapDataFun(int little_endian, unsigned int n, unsigned int *d) {
int Beb_SetByteOrder() { return 1; } int Beb_SetByteOrder() { return 1; }
int Beb_SetUpUDPHeader(unsigned int beb_number, int ten_gig, int Beb_SetUpUDPHeader(unsigned int beb_number, int ten_gig,
unsigned int header_number, char *dst_mac, char *dst_ip, unsigned int header_number, char *dst_mac,
unsigned int dst_port) { char *dst_ip, unsigned int dst_port) {
if (!Beb_activated) if (!Beb_activated)
return 1; return 1;
@ -879,7 +907,8 @@ int Beb_SetUpUDPHeader(unsigned int beb_number, int ten_gig,
LOG(logERROR, ("Set up UDP Header FAIL\n")); LOG(logERROR, ("Set up UDP Header FAIL\n"));
} else { } else {
// read data // read data
memcpy(csp0base + header_number * 16, &udp_header, sizeof(udp_header)); memcpy(csp0base + header_number * 16, &udp_header,
sizeof(udp_header));
// close file pointer // close file pointer
Beb_close(fd, csp0base); Beb_close(fd, csp0base);
} }
@ -1030,10 +1059,10 @@ void Beb_AdjustIPChecksum(struct udp_header_type *ip) {
ip->ip_header_checksum[1] = ip_checksum & 0xff; ip->ip_header_checksum[1] = ip_checksum & 0xff;
} }
int Beb_SendMultiReadRequest(unsigned int beb_number, unsigned int left_right, int Beb_SendMultiReadRequest(
int ten_gig, unsigned int dst_number, unsigned int beb_number, unsigned int left_right, int ten_gig,
unsigned int npackets, unsigned int packet_size, unsigned int dst_number, unsigned int npackets,
int stop_read_when_fifo_empty) { unsigned int packet_size, int stop_read_when_fifo_empty) {
// This is a dead function, will be removed in future // This is a dead function, will be removed in future
// ================================================== // ==================================================
@ -1136,8 +1165,8 @@ int Beb_RequestNImages(unsigned int beb_number, int ten_gig,
unsigned int nl = Beb_readNLines; unsigned int nl = Beb_readNLines;
unsigned int npackets = (nl * maxnp) / maxnl; unsigned int npackets = (nl * maxnp) / maxnl;
if ((nl * maxnp) % maxnl) { if ((nl * maxnp) % maxnl) {
LOG(logERROR, LOG(logERROR, ("Read N Lines is incorrect. Switching to Full Image "
("Read N Lines is incorrect. Switching to Full Image Readout\n")); "Readout\n"));
npackets = maxnp; npackets = maxnp;
} }
int in_two_requests = (npackets > MAX_PACKETS_PER_REQUEST) ? 1 : 0; int in_two_requests = (npackets > MAX_PACKETS_PER_REQUEST) ? 1 : 0;
@ -1148,7 +1177,8 @@ int Beb_RequestNImages(unsigned int beb_number, int ten_gig,
unsigned int packet_size = ten_gig ? 0x200 : 0x80; // 4k or 1k packets unsigned int packet_size = ten_gig ? 0x200 : 0x80; // 4k or 1k packets
LOG(logDEBUG1, ("----Beb_RequestNImages Start----\n")); LOG(logDEBUG1, ("----Beb_RequestNImages Start----\n"));
LOG(logINFO, ("beb_number:%d, ten_gig:%d,dst_number:%d, npackets:%d, " LOG(logINFO,
("beb_number:%d, ten_gig:%d,dst_number:%d, npackets:%d, "
"Beb_bit_mode:%d, header_size:%d, nimages:%d, " "Beb_bit_mode:%d, header_size:%d, nimages:%d, "
"test_just_send_out_packets_no_wait:%d\n", "test_just_send_out_packets_no_wait:%d\n",
beb_number, ten_gig, dst_number, npackets, Beb_bit_mode, beb_number, ten_gig, dst_number, npackets, Beb_bit_mode,
@ -1222,9 +1252,9 @@ int Beb_RequestNImages(unsigned int beb_number, int ten_gig,
{ {
int i; int i;
for (i = 0; i < 10; i++) for (i = 0; i < 10; i++)
LOG(logDEBUG1, LOG(logDEBUG1, ("%X\n", Beb_Read32(csp0base,
("%X\n", Beb_Read32(csp0base, (LEFT_OFFSET +
(LEFT_OFFSET + i * 4)))); //*(ptrl+i)); i * 4)))); //*(ptrl+i));
LOG(logDEBUG1, ("%d\n", in_two_requests)); LOG(logDEBUG1, ("%d\n", in_two_requests));
} }
Beb_close(fd, csp0base); Beb_close(fd, csp0base);
@ -1239,12 +1269,13 @@ int Beb_Test(unsigned int beb_number) {
LOG(logINFO, ("Testing module number: %d\n", beb_number)); LOG(logINFO, ("Testing module number: %d\n", beb_number));
// int SetUpUDPHeader(unsigned int beb_number, int ten_gig, unsigned int // int SetUpUDPHeader(unsigned int beb_number, int ten_gig, unsigned int
// header_number, string dst_mac, string dst_ip, unsigned int dst_port) { // header_number, string dst_mac, string dst_ip, unsigned int dst_port)
// SetUpUDPHeader(26,0,0,"60:fb:42:f4:e3:d2","129.129.205.186",22000); // { SetUpUDPHeader(26,0,0,"60:fb:42:f4:e3:d2","129.129.205.186",22000);
unsigned int index = Beb_GetBebInfoIndex(beb_number); unsigned int index = Beb_GetBebInfoIndex(beb_number);
if (!index) { if (!index) {
LOG(logERROR, ("Error beb number (%d)not in list????\n", beb_number)); LOG(logERROR,
("Error beb number (%d)not in list????\n", beb_number));
return 0; return 0;
} }
@ -1257,11 +1288,13 @@ int Beb_Test(unsigned int beb_number) {
} }
} }
// SendMultiReadRequest(unsigned int beb_number, unsigned int left_right, // SendMultiReadRequest(unsigned int beb_number, unsigned int
// int ten_gig, unsigned int dst_number, unsigned int npackets, unsigned // left_right, int ten_gig, unsigned int dst_number, unsigned int
// int packet_size, int stop_read_when_fifo_empty=1); // npackets, unsigned int packet_size, int
// stop_read_when_fifo_empty=1);
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {
if (!Beb_SendMultiReadRequest(beb_number, i % 3 + 1, 0, i, 1, 0, 1)) { if (!Beb_SendMultiReadRequest(beb_number, i % 3 + 1, 0, i, 1, 0,
1)) {
LOG(logERROR, ("Error requesting data....\n")); LOG(logERROR, ("Error requesting data....\n"));
return 0; return 0;
} }
@ -1284,7 +1317,8 @@ int Beb_GetBebFPGATemp() {
} else { } else {
// read data // read data
ret = Beb_Read32(csp0base, FPGA_TEMP_OFFSET); ret = Beb_Read32(csp0base, FPGA_TEMP_OFFSET);
temperature = ((((float)(ret) / 65536.0f) / 0.00198421639f) - 273.15f) * temperature =
((((float)(ret) / 65536.0f) / 0.00198421639f) - 273.15f) *
1000; // Static conversation, copied from xps sysmon 1000; // Static conversation, copied from xps sysmon
// standalone driver // standalone driver
// close file pointer // close file pointer
@ -1308,9 +1342,9 @@ void Beb_SetDetectorNumber(uint32_t detid) {
} else { } else {
uint32_t value = Beb_Read32(csp0base, UDP_HEADER_A_LEFT_OFST); uint32_t value = Beb_Read32(csp0base, UDP_HEADER_A_LEFT_OFST);
value &= UDP_HEADER_X_MSK; // to keep previous x value value &= UDP_HEADER_X_MSK; // to keep previous x value
Beb_Write32(csp0base, UDP_HEADER_A_LEFT_OFST, Beb_Write32(
value | csp0base, UDP_HEADER_A_LEFT_OFST,
((swapid << UDP_HEADER_ID_OFST) & UDP_HEADER_ID_MSK)); value | ((swapid << UDP_HEADER_ID_OFST) & UDP_HEADER_ID_MSK));
value = Beb_Read32(csp0base, UDP_HEADER_A_LEFT_OFST); value = Beb_Read32(csp0base, UDP_HEADER_A_LEFT_OFST);
if ((value & UDP_HEADER_ID_MSK) != if ((value & UDP_HEADER_ID_MSK) !=
((swapid << UDP_HEADER_ID_OFST) & UDP_HEADER_ID_MSK)) { ((swapid << UDP_HEADER_ID_OFST) & UDP_HEADER_ID_MSK)) {
@ -1318,9 +1352,9 @@ void Beb_SetDetectorNumber(uint32_t detid) {
} }
value = Beb_Read32(csp0base, UDP_HEADER_A_RIGHT_OFST); value = Beb_Read32(csp0base, UDP_HEADER_A_RIGHT_OFST);
value &= UDP_HEADER_X_MSK; // to keep previous x value value &= UDP_HEADER_X_MSK; // to keep previous x value
Beb_Write32(csp0base, UDP_HEADER_A_RIGHT_OFST, Beb_Write32(
value | csp0base, UDP_HEADER_A_RIGHT_OFST,
((swapid << UDP_HEADER_ID_OFST) & UDP_HEADER_ID_MSK)); value | ((swapid << UDP_HEADER_ID_OFST) & UDP_HEADER_ID_MSK));
value = Beb_Read32(csp0base, UDP_HEADER_A_RIGHT_OFST); value = Beb_Read32(csp0base, UDP_HEADER_A_RIGHT_OFST);
if ((value & UDP_HEADER_ID_MSK) != if ((value & UDP_HEADER_ID_MSK) !=
((swapid << UDP_HEADER_ID_OFST) & UDP_HEADER_ID_MSK)) { ((swapid << UDP_HEADER_ID_OFST) & UDP_HEADER_ID_MSK)) {
@ -1377,7 +1411,8 @@ int Beb_SetDetectorPosition(int pos[]) {
value = Beb_Read32(csp0base, UDP_HEADER_A_LEFT_OFST); value = Beb_Read32(csp0base, UDP_HEADER_A_LEFT_OFST);
value &= UDP_HEADER_ID_MSK; // to keep previous id value value &= UDP_HEADER_ID_MSK; // to keep previous id value
Beb_Write32(csp0base, UDP_HEADER_A_LEFT_OFST, Beb_Write32(csp0base, UDP_HEADER_A_LEFT_OFST,
value | ((posval << UDP_HEADER_X_OFST) & UDP_HEADER_X_MSK)); value |
((posval << UDP_HEADER_X_OFST) & UDP_HEADER_X_MSK));
value = Beb_Read32(csp0base, UDP_HEADER_A_LEFT_OFST); value = Beb_Read32(csp0base, UDP_HEADER_A_LEFT_OFST);
if ((value & UDP_HEADER_X_MSK) != if ((value & UDP_HEADER_X_MSK) !=
((posval << UDP_HEADER_X_OFST) & UDP_HEADER_X_MSK)) { ((posval << UDP_HEADER_X_OFST) & UDP_HEADER_X_MSK)) {
@ -1389,7 +1424,8 @@ int Beb_SetDetectorPosition(int pos[]) {
value = Beb_Read32(csp0base, UDP_HEADER_A_RIGHT_OFST); value = Beb_Read32(csp0base, UDP_HEADER_A_RIGHT_OFST);
value &= UDP_HEADER_ID_MSK; // to keep previous id value value &= UDP_HEADER_ID_MSK; // to keep previous id value
Beb_Write32(csp0base, UDP_HEADER_A_RIGHT_OFST, Beb_Write32(csp0base, UDP_HEADER_A_RIGHT_OFST,
value | ((posval << UDP_HEADER_X_OFST) & UDP_HEADER_X_MSK)); value |
((posval << UDP_HEADER_X_OFST) & UDP_HEADER_X_MSK));
value = Beb_Read32(csp0base, UDP_HEADER_A_RIGHT_OFST); value = Beb_Read32(csp0base, UDP_HEADER_A_RIGHT_OFST);
if ((value & UDP_HEADER_X_MSK) != if ((value & UDP_HEADER_X_MSK) !=
((posval << UDP_HEADER_X_OFST) & UDP_HEADER_X_MSK)) { ((posval << UDP_HEADER_X_OFST) & UDP_HEADER_X_MSK)) {
@ -1402,11 +1438,13 @@ int Beb_SetDetectorPosition(int pos[]) {
value = Beb_Read32(csp0base, UDP_HEADER_B_LEFT_OFST); value = Beb_Read32(csp0base, UDP_HEADER_B_LEFT_OFST);
value &= UDP_HEADER_Z_MSK; // to keep previous z value value &= UDP_HEADER_Z_MSK; // to keep previous z value
Beb_Write32(csp0base, UDP_HEADER_B_LEFT_OFST, Beb_Write32(csp0base, UDP_HEADER_B_LEFT_OFST,
value | ((posval << UDP_HEADER_Y_OFST) & UDP_HEADER_Y_MSK)); value |
((posval << UDP_HEADER_Y_OFST) & UDP_HEADER_Y_MSK));
value = Beb_Read32(csp0base, UDP_HEADER_B_LEFT_OFST); value = Beb_Read32(csp0base, UDP_HEADER_B_LEFT_OFST);
if ((value & UDP_HEADER_Y_MSK) != if ((value & UDP_HEADER_Y_MSK) !=
((posval << UDP_HEADER_Y_OFST) & UDP_HEADER_Y_MSK)) { ((posval << UDP_HEADER_Y_OFST) & UDP_HEADER_Y_MSK)) {
LOG(logERROR, ("Could not set column position for left port\n")); LOG(logERROR,
("Could not set column position for left port\n"));
ret = FAIL; ret = FAIL;
} }
@ -1415,11 +1453,13 @@ int Beb_SetDetectorPosition(int pos[]) {
value = Beb_Read32(csp0base, UDP_HEADER_B_RIGHT_OFST); value = Beb_Read32(csp0base, UDP_HEADER_B_RIGHT_OFST);
value &= UDP_HEADER_Z_MSK; // to keep previous z value value &= UDP_HEADER_Z_MSK; // to keep previous z value
Beb_Write32(csp0base, UDP_HEADER_B_RIGHT_OFST, Beb_Write32(csp0base, UDP_HEADER_B_RIGHT_OFST,
value | ((posval << UDP_HEADER_Y_OFST) & UDP_HEADER_Y_MSK)); value |
((posval << UDP_HEADER_Y_OFST) & UDP_HEADER_Y_MSK));
value = Beb_Read32(csp0base, UDP_HEADER_B_RIGHT_OFST); value = Beb_Read32(csp0base, UDP_HEADER_B_RIGHT_OFST);
if ((value & UDP_HEADER_Y_MSK) != if ((value & UDP_HEADER_Y_MSK) !=
((posval << UDP_HEADER_Y_OFST) & UDP_HEADER_Y_MSK)) { ((posval << UDP_HEADER_Y_OFST) & UDP_HEADER_Y_MSK)) {
LOG(logERROR, ("Could not set column position for right port\n")); LOG(logERROR,
("Could not set column position for right port\n"));
ret = FAIL; ret = FAIL;
} }
@ -1441,8 +1481,8 @@ int Beb_SetStartingFrameNumber(uint64_t value) {
Beb_deactivatedStartFrameNumber = value; Beb_deactivatedStartFrameNumber = value;
return OK; return OK;
} }
LOG(logINFO, LOG(logINFO, ("Setting start frame number: %llu\n",
("Setting start frame number: %llu\n", (long long unsigned int)value)); (long long unsigned int)value));
u_int32_t *csp0base = 0; u_int32_t *csp0base = 0;
int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_TEST_BASEADDR); int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_TEST_BASEADDR);
@ -1496,13 +1536,14 @@ int Beb_GetStartingFrameNumber(uint64_t *retval, int tengigaEnable) {
Beb_close(fd, csp0base); Beb_close(fd, csp0base);
if (left1g != right1g) { if (left1g != right1g) {
LOG(logERROR, ("Retrieved inconsistent frame numbers from 1g left " LOG(logERROR,
("Retrieved inconsistent frame numbers from 1g left "
"%llu and right %llu\n", "%llu and right %llu\n",
(long long int)left1g, (long long int)right1g)); (long long int)left1g, (long long int)right1g));
*retval = (left1g > right1g) *retval = (left1g > right1g)
? left1g ? left1g
: right1g; // give max to set it to when stopping acq : right1g; // give max to set it to when stopping
// & different value // acq & different value
return -2; // to differentiate between failed address mapping return -2; // to differentiate between failed address mapping
} }
*retval = left1g; *retval = left1g;
@ -1523,13 +1564,14 @@ int Beb_GetStartingFrameNumber(uint64_t *retval, int tengigaEnable) {
++right10g; // increment for firmware ++right10g; // increment for firmware
if (left10g != right10g) { if (left10g != right10g) {
LOG(logERROR, ("Retrieved inconsistent frame numbers from `0g left " LOG(logERROR,
("Retrieved inconsistent frame numbers from `0g left "
"%llu and right %llu\n", "%llu and right %llu\n",
(long long int)left10g, (long long int)right10g)); (long long int)left10g, (long long int)right10g));
*retval = (left10g > right10g) *retval = (left10g > right10g)
? left10g ? left10g
: right10g; // give max to set it to when stopping acq : right10g; // give max to set it to when stopping
// & different value // acq & different value
return -2; // to differentiate between failed address mapping return -2; // to differentiate between failed address mapping
} }
*retval = left10g; *retval = left10g;
@ -1548,7 +1590,8 @@ int Beb_open(u_int32_t **csp0base, u_int32_t offset) {
LOG(logERROR, ("\nCan't find /dev/mem!\n")); LOG(logERROR, ("\nCan't find /dev/mem!\n"));
} else { } else {
LOG(logDEBUG1, ("/dev/mem opened\n")); LOG(logDEBUG1, ("/dev/mem opened\n"));
*csp0base = (u_int32_t *)mmap(0, BEB_MMAP_SIZE, PROT_READ | PROT_WRITE, *csp0base =
(u_int32_t *)mmap(0, BEB_MMAP_SIZE, PROT_READ | PROT_WRITE,
MAP_FILE | MAP_SHARED, fd, offset); MAP_FILE | MAP_SHARED, fd, offset);
if (*csp0base == MAP_FAILED) { if (*csp0base == MAP_FAILED) {
LOG(logERROR, ("\nCan't map memmory area!!\n")); LOG(logERROR, ("\nCan't map memmory area!!\n"));
@ -1565,7 +1608,8 @@ u_int32_t Beb_Read32(u_int32_t *baseaddr, u_int32_t offset) {
return value; return value;
} }
u_int32_t Beb_Write32(u_int32_t *baseaddr, u_int32_t offset, u_int32_t data) { u_int32_t Beb_Write32(u_int32_t * baseaddr, u_int32_t offset,
u_int32_t data) {
volatile u_int32_t *ptr1; volatile u_int32_t *ptr1;
ptr1 = (u_int32_t *)(baseaddr + offset / (sizeof(u_int32_t))); ptr1 = (u_int32_t *)(baseaddr + offset / (sizeof(u_int32_t)));
*ptr1 = data; *ptr1 = data;

4
slsDetectorServers/eigerDetectorServer/Beb.h
View File

@ -36,8 +36,8 @@ unsigned int Beb_GetBebInfoIndex(unsigned int beb_numb);
void Beb_GetModuleConfiguration(int *master, int *top, int *normal); void Beb_GetModuleConfiguration(int *master, int *top, int *normal);
int Beb_IsTransmitting(int *retval, int tengiga, int waitForDelay); int Beb_IsTransmitting(int *retval, int tengiga, int waitForDelay);
int Beb_SetTop(int val); int Beb_SetTop(enum TOPINDEX ind);
int Beb_SetMaster(int val); int Beb_SetMaster(enum MASTERINDEX ind);
int Beb_Activate(int enable); int Beb_Activate(int enable);
int Beb_GetActivate(); int Beb_GetActivate();
int Beb_Set32bitOverflow(int val); int Beb_Set32bitOverflow(int val);

85
slsDetectorServers/eigerDetectorServer/FebControl.c
View File

@ -2459,7 +2459,7 @@ int Feb_Control_GetInterruptSubframe() {
return value[0]; return value[0];
} }
int Feb_Control_SetTop(int val, int left, int right) { int Feb_Control_SetTop(enum TOPINDEX ind, int left, int right) {
uint32_t offset = DAQ_REG_HRDWRE; uint32_t offset = DAQ_REG_HRDWRE;
unsigned int addr[2] = {0, 0}; unsigned int addr[2] = {0, 0};
if (left) { if (left) {
@ -2468,68 +2468,89 @@ int Feb_Control_SetTop(int val, int left, int right) {
if (right) { if (right) {
addr[1] = Module_GetTopRightAddress(&modules[0]); addr[1] = Module_GetTopRightAddress(&modules[0]);
} }
char *top_names[] = {TOP_NAMES};
int i = 0; int i = 0;
for (i = 0; i < 2; ++i) { for (i = 0; i < 2; ++i) {
if (addr[i] == 0) { if (addr[i] == 0) {
continue; continue;
} }
uint32_t regVal = 0; uint32_t value = 0;
if (!Feb_Interface_ReadRegister(addr[i], offset, &regVal)) { if (!Feb_Interface_ReadRegister(addr[i], offset, &value)) {
LOG(logERROR, ("Could not read %s DAQ_REG_HRDWRE reg\n", LOG(logERROR, ("Could not read %s Feb reg to set Top flag\n",
(i == 0 ? "left" : "right"))); (i == 0 ? "left" : "right")));
return 0; return 0;
} }
regVal |= DAQ_REG_HRDWRE_OW_TOP_MSK; switch (ind) {
if (val) { case TOP_HARDWARE:
regVal |= DAQ_REG_HRDWRE_TOP_MSK; value &= ~DAQ_REG_HRDWRE_OW_TOP_MSK;
} else { break;
regVal &= ~DAQ_REG_HRDWRE_TOP_MSK; case OW_TOP:
value |= DAQ_REG_HRDWRE_OW_TOP_MSK;
value |= DAQ_REG_HRDWRE_TOP_MSK;
break;
case OW_BOTTOM:
value |= DAQ_REG_HRDWRE_OW_TOP_MSK;
value &= ~DAQ_REG_HRDWRE_TOP_MSK;
break;
default:
LOG(logERROR, ("Unknown top index in Feb: %d\n", ind));
return 0;
} }
if (!Feb_Interface_WriteRegister(addr[i], offset, value, 0, 0)) {
if (!Feb_Interface_WriteRegister(addr[i], offset, regVal, 0, 0)) { LOG(logERROR, ("Could not set Top flag to %s in %s Feb\n", val,
LOG(logERROR, top_names[ind], (i == 0 ? "left" : "right")));
("Could not overwrite top %d to %s DAQ_REG_HRDWRE reg\n", val,
(i == 0 ? "left" : "right")));
return 0; return 0;
} }
} }
if (left && right) { if (left && right) {
LOG(logINFOBLUE, LOG(logINFOBLUE, ("%s Top flag to %s Feb\n",
("Overwriting FEB Hardware: %s\n", (val ? "Top" : "Bottom"))); (ind == TOP_HARDWARE ? "Resetting" : "Overwriting"),
top_names[ind]));
} }
return 1; return 1;
} }
int Feb_Control_SetMaster(int val) { int Feb_Control_SetMaster(enum MASTERINDEX ind) {
uint32_t offset = DAQ_REG_HRDWRE; uint32_t offset = DAQ_REG_HRDWRE;
unsigned int addr[2] = {0, 0}; unsigned int addr[2] = {0, 0};
addr[0] = Module_GetTopLeftAddress(&modules[0]); addr[0] = Module_GetTopLeftAddress(&modules[0]);
addr[1] = Module_GetTopRightAddress(&modules[0]); addr[1] = Module_GetTopRightAddress(&modules[0]);
char *master_names[] = {MASTER_NAMES};
int i = 0; int i = 0;
for (i = 0; i < 2; ++i) { for (i = 0; i < 2; ++i) {
uint32_t regVal = 0; uint32_t value = 0;
if (!Feb_Interface_ReadRegister(addr[i], offset, &regVal)) { if (!Feb_Interface_ReadRegister(addr[i], offset, &value)) {
LOG(logERROR, ("Could not read %s DAQ_REG_HRDWRE reg\n", LOG(logERROR, ("Could not read %s Feb reg to set Master flag\n",
(i == 0 ? "left" : "right"))); (i == 0 ? "left" : "right")));
return 0; return 0;
} }
regVal |= DAQ_REG_HRDWRE_OW_MASTER_MSK; switch (ind) {
if (val) { case MASTER_HARDWARE:
regVal |= DAQ_REG_HRDWRE_MASTER_MSK; value &= ~DAQ_REG_HRDWRE_OW_MASTER_MSK;
} else { break;
regVal &= ~DAQ_REG_HRDWRE_MASTER_MSK; case OW_MASTER:
value |= DAQ_REG_HRDWRE_OW_MASTER_MSK;
value |= DAQ_REG_HRDWRE_MASTER_MSK;
break;
case OW_SLAVE:
value |= DAQ_REG_HRDWRE_OW_MASTER_MSK;
value &= ~DAQ_REG_HRDWRE_MASTER_MSK;
break;
default:
LOG(logERROR, ("Unknown master index in Feb: %d\n", ind));
Beb_close(fd, csp0base);
return 0;
} }
if (!Feb_Interface_WriteRegister(addr[i], offset, regVal, 0, 0)) { if (!Feb_Interface_WriteRegister(addr[i], offset, value, 0, 0)) {
LOG(logERROR, LOG(logERROR, ("Could not set Master flag to %s in %s Feb\n", val,
("Could not write master %d to %s DAQ_REG_HRDWRE reg\n", val, master_names[ind], (i == 0 ? "left" : "right")));
(i == 0 ? "left" : "right")));
return 0; return 0;
} }
} }
Feb_control_master = 1; LOG(logINFOBLUE, ("%s Master flag to %s Feb\n",
LOG(logINFOBLUE, (ind == MASTER_HARDWARE ? "Resetting" : "Overwriting"),
("Overwriting FEB Hardware: %s\n", (val ? "Master" : "Slave"))); master_names[ind]));
return 1; return 1;
} }

4
slsDetectorServers/eigerDetectorServer/FebControl.h
View File

@ -175,8 +175,8 @@ int Feb_Control_SoftwareTrigger();
int Feb_Control_SetInterruptSubframe(int val); int Feb_Control_SetInterruptSubframe(int val);
int Feb_Control_GetInterruptSubframe(); int Feb_Control_GetInterruptSubframe();
int Feb_Control_SetTop(int val, int left, int right); int Feb_Control_SetTop(enum TOPINDEX ind, int left, int right);
int Feb_Control_SetMaster(int val); int Feb_Control_SetMaster(enum MASTERINDEX ind);
int Feb_Control_SetQuad(int val); int Feb_Control_SetQuad(int val);
int Feb_Control_SetReadNLines(int value); int Feb_Control_SetReadNLines(int value);
int Feb_Control_GetReadNLines(); int Feb_Control_GetReadNLines();

2
slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h
View File

@ -147,7 +147,7 @@
/** BEB Registers */ /** BEB Registers */
// module configuration - XPAR_PLB_GPIO_SYS_BASEADDR // module configuration - XPAR_PLB_GPIO_SYS_BASEADDR
#define BEB_CONFIG_OW_OFST (0x160) // 0x20 * 11 (P11) #define BEB_CONFIG_WR_OFST (0x160) // 0x20 * 11 (P11)
#define BEB_CONFIG_MASTER_OFST (0) #define BEB_CONFIG_MASTER_OFST (0)
#define BEB_CONFIG_MASTER_MSK (0x00000001 << BEB_CONFIG_MASTER_OFST) #define BEB_CONFIG_MASTER_MSK (0x00000001 << BEB_CONFIG_MASTER_OFST)
#define BEB_CONFIG_OW_MASTER_OFST (1) #define BEB_CONFIG_OW_MASTER_OFST (1)

4
slsDetectorServers/eigerDetectorServer/config.txt
View File

@ -1,2 +1,2 @@
top 0 top 1
master 0 master 1

79
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -309,6 +309,14 @@ u_int32_t getDetectorIP() {
/* initialization */ /* initialization */
void initControlServer() { void initControlServer() {
master = -1;
top = -1;
// force top or master if in config file
if (readConfigFile() == FAIL) {
return;
}
#ifdef VIRTUAL #ifdef VIRTUAL
if (initError == OK) { if (initError == OK) {
getModuleConfiguration(); getModuleConfiguration();
@ -352,7 +360,15 @@ void initControlServer() {
} }
void initStopServer() { void initStopServer() {
master = -1;
top = -1;
#ifdef VIRTUAL #ifdef VIRTUAL
// force top or master if in config file
if (readConfigFile() == FAIL) {
return;
}
getModuleConfiguration(); getModuleConfiguration();
virtual_stop = 0; virtual_stop = 0;
if (!isControlServer) { if (!isControlServer) {
@ -362,6 +378,9 @@ void initStopServer() {
LOG(logINFORED, ("Deactivated!\n")); LOG(logINFORED, ("Deactivated!\n"));
return; return;
#else #else
// wait till control server has configured top/master
usleep(2 * 1000 * 1000);
getModuleConfiguration(); getModuleConfiguration();
Feb_Interface_FebInterface(); Feb_Interface_FebInterface();
Feb_Control_FebControl(); Feb_Control_FebControl();
@ -382,22 +401,33 @@ void initStopServer() {
void getModuleConfiguration() { void getModuleConfiguration() {
#ifdef VIRTUAL #ifdef VIRTUAL
// if master not modified by config file
if (master == -1) {
#ifdef VIRTUAL_MASTER #ifdef VIRTUAL_MASTER
master = 1; master = 1;
top = 1;
#else #else
master = 0; master = 0;
#endif
}
// if top not modified by config file
if (top == -1) {
#ifdef VIRTUAL_MASTER
top = 1;
#else
#ifdef VIRTUAL_TOP #ifdef VIRTUAL_TOP
top = 1; top = 1;
#else #else
top = 0; top = 0;
#endif #endif
#endif #endif
}
#ifdef VIRTUAL_9M #ifdef VIRTUAL_9M
normal = 0; normal = 0;
#else #else
normal = 1; normal = 1;
#endif #endif
#else #else
// read detector id // read detector id
char output[255]; char output[255];
@ -411,10 +441,6 @@ void getModuleConfiguration() {
Beb_GetModuleConfiguration(&master, &top, &normal); Beb_GetModuleConfiguration(&master, &top, &normal);
#endif #endif
if (readConfigFile() == FAIL) {
return;
}
if (isControlServer) { if (isControlServer) {
LOG(logINFOBLUE, LOG(logINFOBLUE,
("Module: %s %s %s\n", (top ? "TOP" : "BOTTOM"), ("Module: %s %s %s\n", (top ? "TOP" : "BOTTOM"),
@ -476,7 +502,8 @@ int readConfigFile() {
break; break;
} }
#ifndef VIRTUAL #ifndef VIRTUAL
if (Beb_SetTop(top) == FAIL) { enum TOPINDEX ind = (top == 1 ? OW_TOP : OW_BOTTOM);
if (!Beb_SetTop(ind)) {
sprintf( sprintf(
initErrorMessage, initErrorMessage,
"Could not overwrite top to %d in Beb from on-board server " "Could not overwrite top to %d in Beb from on-board server "
@ -484,7 +511,7 @@ int readConfigFile() {
top, line); top, line);
break; break;
} }
if (Feb_Control_SetTop(top, 1, 1) == FAIL) { if (!Feb_Control_SetTop(ind, 1, 1)) {
sprintf( sprintf(
initErrorMessage, initErrorMessage,
"Could not overwrite top to %d in Feb from on-board server " "Could not overwrite top to %d in Feb from on-board server "
@ -506,7 +533,8 @@ int readConfigFile() {
break; break;
} }
#ifndef VIRTUAL #ifndef VIRTUAL
if (Beb_SetMaster(master) == FAIL) { enum MASTERINDEX ind = (master == 1 ? OW_MASTER : OW_SLAVE);
if (!Beb_SetMaster(ind)) {
sprintf(initErrorMessage, sprintf(initErrorMessage,
"Could not overwrite master to %d in Beb from on-board " "Could not overwrite master to %d in Beb from on-board "
"server " "server "
@ -514,7 +542,7 @@ int readConfigFile() {
master, line); master, line);
break; break;
} }
if (Feb_Control_SetMaster(master) == FAIL) { if (!Feb_Control_SetMaster(ind)) {
sprintf(initErrorMessage, sprintf(initErrorMessage,
"Could not overwrite master to %d in Feb from on-board " "Could not overwrite master to %d in Feb from on-board "
"server " "server "
@ -535,6 +563,39 @@ int readConfigFile() {
} }
} }
fclose(fd); fclose(fd);
// reset to hardware settings if not in config file (if overwritten)
#ifndef VIRTUAL
if (top == -1) {
if (!Beb_SetTop(TOP_HARDWARE)) {
initError = FAIL;
sprintf(initErrorMessage,
"Could not reset Top flag to Beb hardware settings.\n");
return;
}
if (!Feb_Control_SetTop(TOP_HARDWARE, 1, 1)) {
initError = FAIL;
sprintf(initErrorMessage,
"Could not reset Top flag to Feb hardware settings.\n");
return;
}
}
if (master == -1) {
if (!Beb_SetMaster(TOP_HARDWARE)) {
initError = FAIL;
sprintf(initErrorMessage,
"Could not reset Master flag to Beb hardware settings.\n");
return;
}
if (!Feb_Control_SetMaster(TOP_HARDWARE)) {
initError = FAIL;
sprintf(initErrorMessage,
"Could not reset Master flag to Feb hardware settings.\n");
return;
}
}
#endif
if (strlen(initErrorMessage)) { if (strlen(initErrorMessage)) {
initError = FAIL; initError = FAIL;
LOG(logERROR, ("%s\n\n", initErrorMessage)); LOG(logERROR, ("%s\n\n", initErrorMessage));

5
slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
View File

@ -62,6 +62,11 @@ enum ADCINDEX {
enum NETWORKINDEX { TXN_LEFT, TXN_RIGHT, TXN_FRAME, FLOWCTRL_10G }; enum NETWORKINDEX { TXN_LEFT, TXN_RIGHT, TXN_FRAME, FLOWCTRL_10G };
enum ROINDEX { E_PARALLEL, E_NON_PARALLEL }; enum ROINDEX { E_PARALLEL, E_NON_PARALLEL };
enum CLKINDEX { RUN_CLK, NUM_CLOCKS }; enum CLKINDEX { RUN_CLK, NUM_CLOCKS };
enum TOPINDEX { TOP_HARDWARE, OW_TOP, OW_BOTTOM };
#define TOP_NAMES "hardware", "top", "bottom"
enum MASTERINDEX { MASTER_HARDWARE, OW_MASTER, OW_SLAVE };
#define MASTER_NAMES "hardware", "master", "slave"
#define CLK_NAMES "run" #define CLK_NAMES "run"
/* Hardware Definitions */ /* Hardware Definitions */