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

formatting

Browse Source
This commit is contained in:
maliakal_d
2020-05-11 19:27:49 +02:00
parent 5aaefc8e00
commit e148a584df
7 changed files with 175 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
slsDetectorServers/eigerDetectorServer/Beb.c
View File

@ -337,9 +337,9 @@ int Beb_SetTop(enum TOPINDEX ind) {
Beb_close(fd, csp0base); Beb_close(fd, csp0base);
return 0; return 0;
} }
LOG(logINFOBLUE, ("%s Top flag to %s in Beb\n", LOG(logINFOBLUE,
(ind == TOP_HARDWARE ? "Resetting" : "Overwriting"), ("%s Top flag to %s in Beb\n",
top_names[ind])); (ind == TOP_HARDWARE ? "Resetting" : "Overwriting"), top_names[ind]));
Beb_close(fd, csp0base); Beb_close(fd, csp0base);
return 1; return 1;
} }
@ -377,8 +377,8 @@ int Beb_SetMaster(enum MASTERINDEX ind) {
char *master_names[] = {MASTER_NAMES}; 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 set Master flag to %s in Beb\n", LOG(logERROR,
master_names[ind])); ("Could not set Master flag to %s in Beb\n", master_names[ind]));
Beb_close(fd, csp0base); Beb_close(fd, csp0base);
return 0; return 0;
} }
@ -407,7 +407,9 @@ int Beb_SetActivate(int enable) {
u_int32_t retval = Beb_Write32(csp0base, BEB_CONFIG_WR_OFST, value); u_int32_t retval = Beb_Write32(csp0base, BEB_CONFIG_WR_OFST, value);
if (retval != value) { if (retval != value) {
LOG(logERROR, ("Could not %s. WRote 0x%x, read 0x%x\n", (enable ? "activate" : "deactivate"), value, retval)); LOG(logERROR,
("Could not %s. WRote 0x%x, read 0x%x\n",
(enable ? "activate" : "deactivate"), value, retval));
Beb_close(fd, csp0base); Beb_close(fd, csp0base);
} }
} }
@ -450,8 +452,7 @@ 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, LOG(logERROR, ("Could not read register to set overflow flag in 32 bit "
("Could not read register to set overflow flag in 32 bit "
"mode. FAIL\n")); "mode. FAIL\n"));
return -1; return -1;
} else { } else {
@ -464,8 +465,7 @@ 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 | valueread | ((val << FLOW_REG_OVERFLOW_32_BIT_OFST) &
((val << FLOW_REG_OVERFLOW_32_BIT_OFST) &
FLOW_REG_OVERFLOW_32_BIT_MSK)); FLOW_REG_OVERFLOW_32_BIT_MSK));
} }
@ -542,8 +542,7 @@ 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, LOG(logERROR, ("Invalid transmission delay frame value %d\n", value));
("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;
@ -578,8 +577,7 @@ 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, LOG(logERROR, ("Invalid transmission delay left value %d\n", value));
("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;
@ -614,8 +612,7 @@ 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, LOG(logERROR, ("Invalid transmission delay right value %d\n", value));
("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;
@ -654,8 +651,7 @@ int Beb_SetNetworkParameter(enum NETWORKINDEX mode, int val) {
break; break;
default: default:
LOG(logERROR, LOG(logERROR, ("Unrecognized mode in network parameter: %d\n", mode));
("Unrecognized mode in network parameter: %d\n", mode));
return -1; return -1;
} }
// open file pointer // open file pointer
@ -715,8 +711,7 @@ 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, LOG(logERROR, ("Firmware Software API Version does not exist in "
("Firmware Software API Version does not exist in "
"this version\n")); "this version\n"));
} }
} }
@ -810,8 +805,7 @@ int Beb_SetBebSrcHeaderInfos(unsigned int beb_number, int ten_gig,
// 0, zero is // 0, zero is
// the global // the global
// send // send
BebInfo_SetHeaderInfo(&beb_infos[i], ten_gig, src_mac, src_ip, BebInfo_SetHeaderInfo(&beb_infos[i], ten_gig, src_mac, src_ip, src_port);
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]);
@ -841,8 +835,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, ("*****found beb index:%d, for beb number:%d\n", LOG(logDEBUG1,
i, beb_numb)); ("*****found beb index:%d, for beb number:%d\n", i, beb_numb));
return i; return i;
} }
LOG(logDEBUG1, ("*****Returning 0\n")); LOG(logDEBUG1, ("*****Returning 0\n"));
@ -887,8 +881,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, unsigned int header_number, char *dst_mac, char *dst_ip,
char *dst_ip, unsigned int dst_port) { unsigned int dst_port) {
if (!Beb_activated) if (!Beb_activated)
return 1; return 1;
@ -909,8 +903,7 @@ 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, memcpy(csp0base + header_number * 16, &udp_header, sizeof(udp_header));
sizeof(udp_header));
// close file pointer // close file pointer
Beb_close(fd, csp0base); Beb_close(fd, csp0base);
} }
@ -1061,10 +1054,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( int Beb_SendMultiReadRequest(unsigned int beb_number, unsigned int left_right,
unsigned int beb_number, unsigned int left_right, int ten_gig, int ten_gig, unsigned int dst_number,
unsigned int dst_number, unsigned int npackets, unsigned int npackets, unsigned int packet_size,
unsigned int packet_size, int stop_read_when_fifo_empty) { 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
// ================================================== // ==================================================
@ -1179,8 +1172,7 @@ 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, LOG(logINFO, ("beb_number:%d, ten_gig:%d,dst_number:%d, npackets:%d, "
("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,
@ -1254,9 +1246,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, ("%X\n", Beb_Read32(csp0base, LOG(logDEBUG1,
(LEFT_OFFSET + ("%X\n", Beb_Read32(csp0base,
i * 4)))); //*(ptrl+i)); (LEFT_OFFSET + 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);
@ -1276,8 +1268,7 @@ int Beb_Test(unsigned int beb_number) {
unsigned int index = Beb_GetBebInfoIndex(beb_number); unsigned int index = Beb_GetBebInfoIndex(beb_number);
if (!index) { if (!index) {
LOG(logERROR, LOG(logERROR, ("Error beb number (%d)not in list????\n", beb_number));
("Error beb number (%d)not in list????\n", beb_number));
return 0; return 0;
} }
@ -1295,8 +1286,7 @@ int Beb_Test(unsigned int beb_number) {
// npackets, unsigned int packet_size, int // npackets, unsigned int packet_size, int
// stop_read_when_fifo_empty=1); // 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, if (!Beb_SendMultiReadRequest(beb_number, i % 3 + 1, 0, i, 1, 0, 1)) {
1)) {
LOG(logERROR, ("Error requesting data....\n")); LOG(logERROR, ("Error requesting data....\n"));
return 0; return 0;
} }
@ -1319,8 +1309,7 @@ int Beb_GetBebFPGATemp() {
} else { } else {
// read data // read data
ret = Beb_Read32(csp0base, FPGA_TEMP_OFFSET); ret = Beb_Read32(csp0base, FPGA_TEMP_OFFSET);
temperature = temperature = ((((float)(ret) / 65536.0f) / 0.00198421639f) - 273.15f) *
((((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
@ -1344,9 +1333,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( Beb_Write32(csp0base, UDP_HEADER_A_LEFT_OFST,
csp0base, UDP_HEADER_A_LEFT_OFST, value |
value | ((swapid << UDP_HEADER_ID_OFST) & UDP_HEADER_ID_MSK)); ((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)) {
@ -1354,9 +1343,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( Beb_Write32(csp0base, UDP_HEADER_A_RIGHT_OFST,
csp0base, UDP_HEADER_A_RIGHT_OFST, value |
value | ((swapid << UDP_HEADER_ID_OFST) & UDP_HEADER_ID_MSK)); ((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)) {
@ -1413,8 +1402,7 @@ 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 | value | ((posval << UDP_HEADER_X_OFST) & UDP_HEADER_X_MSK));
((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)) {
@ -1426,8 +1414,7 @@ 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 | value | ((posval << UDP_HEADER_X_OFST) & UDP_HEADER_X_MSK));
((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)) {
@ -1440,13 +1427,11 @@ 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 | value | ((posval << UDP_HEADER_Y_OFST) & UDP_HEADER_Y_MSK));
((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, LOG(logERROR, ("Could not set column position for left port\n"));
("Could not set column position for left port\n"));
ret = FAIL; ret = FAIL;
} }
@ -1455,13 +1440,11 @@ 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 | value | ((posval << UDP_HEADER_Y_OFST) & UDP_HEADER_Y_MSK));
((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, LOG(logERROR, ("Could not set column position for right port\n"));
("Could not set column position for right port\n"));
ret = FAIL; ret = FAIL;
} }
@ -1483,8 +1466,8 @@ int Beb_SetStartingFrameNumber(uint64_t value) {
Beb_deactivatedStartFrameNumber = value; Beb_deactivatedStartFrameNumber = value;
return OK; return OK;
} }
LOG(logINFO, ("Setting start frame number: %llu\n", LOG(logINFO,
(long long unsigned int)value)); ("Setting start frame number: %llu\n", (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);
@ -1538,8 +1521,7 @@ int Beb_GetStartingFrameNumber(uint64_t * retval, int tengigaEnable) {
Beb_close(fd, csp0base); Beb_close(fd, csp0base);
if (left1g != right1g) { if (left1g != right1g) {
LOG(logERROR, LOG(logERROR, ("Retrieved inconsistent frame numbers from 1g left "
("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)
@ -1566,8 +1548,7 @@ int Beb_GetStartingFrameNumber(uint64_t * retval, int tengigaEnable) {
++right10g; // increment for firmware ++right10g; // increment for firmware
if (left10g != right10g) { if (left10g != right10g) {
LOG(logERROR, LOG(logERROR, ("Retrieved inconsistent frame numbers from `0g left "
("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)
@ -1592,8 +1573,7 @@ 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 = *csp0base = (u_int32_t *)mmap(0, BEB_MMAP_SIZE, PROT_READ | PROT_WRITE,
(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"));
@ -1610,8 +1590,7 @@ 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 Beb_Write32(u_int32_t *baseaddr, u_int32_t offset, u_int32_t data) {
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;

3
slsDetectorServers/eigerDetectorServer/FebControl.c
View File

@ -2497,7 +2497,8 @@ int Feb_Control_SetTop(enum TOPINDEX ind, int left, int right) {
return 0; return 0;
} }
if (!Feb_Interface_WriteRegister(addr[i], offset, value, 0, 0)) { if (!Feb_Interface_WriteRegister(addr[i], offset, value, 0, 0)) {
LOG(logERROR, ("Could not set Top flag to %s in %s Feb\n", top_names[ind], (i == 0 ? "left" : "right"))); LOG(logERROR, ("Could not set Top flag to %s in %s Feb\n",
top_names[ind], (i == 0 ? "left" : "right")));
return 0; return 0;
} }
} }

17
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -431,7 +431,8 @@ int readConfigFile() {
top = -1; top = -1;
FILE *fd = fopen(CONFIG_FILE, "r"); FILE *fd = fopen(CONFIG_FILE, "r");
if (fd == NULL) { if (fd == NULL) {
LOG(logINFO, ("No config file found. Resetting to hardware settings (Top/Master)\n")); LOG(logINFO, ("No config file found. Resetting to hardware settings "
"(Top/Master)\n"));
// reset to hardware settings if not in config file (if overwritten) // reset to hardware settings if not in config file (if overwritten)
resetToHardwareSettings(); resetToHardwareSettings();
return initError; return initError;
@ -500,8 +501,8 @@ int readConfigFile() {
int actual_top = -1, temp = -1, temp2 = -1; int actual_top = -1, temp = -1, temp2 = -1;
Beb_GetModuleConfiguration(&temp, &actual_top, &temp2); Beb_GetModuleConfiguration(&temp, &actual_top, &temp2);
if (actual_top != top) { if (actual_top != top) {
sprintf(initErrorMessage, sprintf(initErrorMessage, "Could not set top to %d. Read %d\n",
"Could not set top to %d. Read %d\n", top, actual_top); top, actual_top);
break; break;
} }
Beb_SetTopVariable(top); Beb_SetTopVariable(top);
@ -541,7 +542,8 @@ int readConfigFile() {
Beb_GetModuleConfiguration(&actual_master, &temp, &temp2); Beb_GetModuleConfiguration(&actual_master, &temp, &temp2);
if (actual_master != master) { if (actual_master != master) {
sprintf(initErrorMessage, sprintf(initErrorMessage,
"Could not set master to %d. Read %d\n", master, actual_master); "Could not set master to %d. Read %d\n", master,
actual_master);
break; break;
} }
Feb_Control_SetMasterVariable(master); Feb_Control_SetMasterVariable(master);
@ -618,7 +620,6 @@ void resetToHardwareSettings() {
#endif #endif
} }
/* set up detector */ /* set up detector */
void allocateDetectorStructureMemory() { void allocateDetectorStructureMemory() {
@ -1894,9 +1895,11 @@ int setActivate(int enable) {
Feb_Control_activate(enable); Feb_Control_activate(enable);
#endif #endif
if (enable == 0) { if (enable == 0) {
LOG(logINFORED, ("Deactivated in %s Server!\n", isControlServer ? " Control" : "Stop")); LOG(logINFORED, ("Deactivated in %s Server!\n",
isControlServer ? " Control" : "Stop"));
} else { } else {
LOG(logINFOGREEN, ("Activated in %s Server!\n", isControlServer ? " Control" : "Stop")); LOG(logINFOGREEN, ("Activated in %s Server!\n",
isControlServer ? " Control" : "Stop"));
} }
return OK; return OK;
} }

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

@ -4122,7 +4122,8 @@ int set_activate(int file_des) {
if (arg >= 0) { if (arg >= 0) {
if (setActivate(arg) == FAIL) { if (setActivate(arg) == FAIL) {
ret = FAIL; ret = FAIL;
sprintf(mess, "Could not %s\n", (arg == 0 ? "deactivate" : "activate")); sprintf(mess, "Could not %s\n",
(arg == 0 ? "deactivate" : "activate"));
LOG(logERROR, (mess)); LOG(logERROR, (mess));
} }
} }