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

Dev/reg bit change no validate (#970)

Browse Source 
- do not validate write reg, setbit and clearbit by default anymore
- --validate will force validation on the bitmask or entire reg
- remove return value for write reg (across server to client, but thankfully not in the Detector class)
- extend validation into writereg, setbit and clearbit for Eiger (always special)
-  need to check python (TODO)
- missed the rx_zmqip implementations in detector.h and python bindings
This commit is contained in:
maliakal_d
2024-09-30 16:54:12 +02:00
committed by GitHub
parent a44ba4dc35
commit 2dc0963c56
33 changed files with 499 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/slsDetectorServer/include/blackfin.h
View File

@ -81,7 +81,7 @@ u_int32_t readRegister(u_int32_t offset);
* @param offset address offset
* @param data 32 bit data
*/
u_int32_t writeRegister(u_int32_t offset, u_int32_t data);
void writeRegister(u_int32_t offset, u_int32_t data);
/**
* Read from a 16 bit register (literal register value provided by client)
@ -95,7 +95,7 @@ u_int32_t readRegister16(u_int32_t offset);
* @param offset address offset
* @param data 16 bit data
*/
u_int32_t writeRegister16(u_int32_t offset, u_int32_t data);
void writeRegister16(u_int32_t offset, u_int32_t data);
/**
* Get base address for memory copy

2
slsDetectorServers/slsDetectorServer/include/nios.h
View File

@ -78,7 +78,7 @@ u_int32_t readRegister(u_int32_t offset);
* @param offset address offset
* @param data 32 bit data
*/
u_int32_t writeRegister(u_int32_t offset, u_int32_t data);
void writeRegister(u_int32_t offset, u_int32_t data);
/**
* Map FPGA

9
slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
View File

@ -172,14 +172,13 @@ void resetToHardwareSettings();
// advanced read/write reg
#ifdef EIGERD
int writeRegister(uint32_t offset, uint32_t data);
int writeRegister(uint32_t offset, uint32_t data, int validate);
int readRegister(uint32_t offset, uint32_t *retval);
int setBit(const uint32_t addr, int nBit);
int clearBit(const uint32_t addr, int nBit);
int setBit(const uint32_t addr, const int nBit, int validate);
int clearBit(const uint32_t addr, const int nBit, int validate);
int getBit(const uint32_t addr, const int nBit, int *retval);
#elif GOTTHARDD
uint32_t writeRegister16And32(uint32_t offset,
uint32_t data); // FIXME its not there in ctb
void writeRegister16And32(uint32_t offset, uint32_t data);
uint32_t readRegister16And32(uint32_t offset);
#endif

6
slsDetectorServers/slsDetectorServer/src/blackfin.c
View File

@ -84,7 +84,7 @@ u_int32_t readRegister(u_int32_t offset) {
return bus_r(offset << MEM_MAP_SHIFT);
}
u_int32_t writeRegister(u_int32_t offset, u_int32_t data) {
void writeRegister(u_int32_t offset, u_int32_t data) {
// if electron mode bit touched
#ifdef JUNGFRAUD
int electronCollectionModeChange = 0;
@ -100,16 +100,14 @@ u_int32_t writeRegister(u_int32_t offset, u_int32_t data) {
configureChip();
}
#endif
return readRegister(offset);
}
u_int32_t readRegister16(u_int32_t offset) {
return (u_int32_t)bus_r16(offset << MEM_MAP_SHIFT);
}
u_int32_t writeRegister16(u_int32_t offset, u_int32_t data) {
void writeRegister16(u_int32_t offset, u_int32_t data) {
bus_w16(offset << MEM_MAP_SHIFT, (u_int16_t)data);
return readRegister16(offset);
}
int mapCSP0(void) {

5
slsDetectorServers/slsDetectorServer/src/nios.c
View File

@ -82,10 +82,7 @@ void setU64BitReg(uint64_t value, int aLSB, int aMSB) {
u_int32_t readRegister(u_int32_t offset) { return bus_r(offset); }
u_int32_t writeRegister(u_int32_t offset, u_int32_t data) {
bus_w(offset, data);
return readRegister(offset);
}
void writeRegister(u_int32_t offset, u_int32_t data) { bus_w(offset, data); }
int mapCSP0(void) {
u_int32_t csps[2] = {CSP0, CSP1};

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

@ -1649,40 +1649,35 @@ int get_adc(int file_des) {
int write_register(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
uint32_t args[2] = {-1, -1};
uint32_t retval = -1;
uint32_t args[3] = {-1, -1, -1};
if (receiveData(file_des, args, sizeof(args), INT32) < 0)
return printSocketReadError();
uint32_t addr = args[0];
uint32_t val = args[1];
LOG(logDEBUG1, ("Writing to register 0x%x, data 0x%x\n", addr, val));
uint32_t validate = args[2];
LOG(logDEBUG1, ("Writing to register 0x%x, data 0x%x, validate:%d\n", addr,
val, validate));
// only set
if (Server_VerifyLock() == OK) {
#ifdef GOTTHARDD
retval = writeRegister16And32(addr, val);
#elif EIGERD
if (writeRegister(addr, val) == FAIL) {
#if EIGERD
if (writeRegister(addr, val, validate) == FAIL) {
ret = FAIL;
sprintf(mess, "Could not write to register 0x%x.\n", addr);
LOG(logERROR, (mess));
} else {
if (readRegister(addr, &retval) == FAIL) {
ret = FAIL;
sprintf(
mess,
"Could not read register 0x%x or inconsistent values. Try "
"to read +0x100 for only left and +0x200 for only right.\n",
addr);
LOG(logERROR, (mess));
}
}
#else
retval = writeRegister(addr, val);
#ifdef GOTTHARDD
writeRegister16And32(addr, val);
uint32_t retval = readRegister16And32(addr);
#else
writeRegister(addr, val);
uint32_t retval = readRegister(addr);
#endif
LOG(logDEBUG1, ("Write register retval (0x%x): 0x%x\n", addr, retval));
// validate
if (ret == OK && retval != val) {
if (validate && ret == OK && retval != val) {
ret = FAIL;
sprintf(
mess,
@ -1690,9 +1685,9 @@ int write_register(int file_des) {
addr, val, retval);
LOG(logERROR, (mess));
}
LOG(logDEBUG1, ("Write register (0x%x): 0x%x\n", retval));
#endif
}
return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
return Server_SendResult(file_des, INT32, NULL, 0);
}
int read_register(int file_des) {
@ -1707,9 +1702,7 @@ int read_register(int file_des) {
LOG(logDEBUG1, ("Reading from register 0x%x\n", addr));
// get
#ifdef GOTTHARDD
retval = readRegister16And32(addr);
#elif EIGERD
#if EIGERD
if (readRegister(addr, &retval) == FAIL) {
ret = FAIL;
sprintf(mess,
@ -1718,6 +1711,8 @@ int read_register(int file_des) {
addr);
LOG(logERROR, (mess));
}
#elif GOTTHARDD
retval = readRegister16And32(addr);
#else
retval = readRegister(addr);
#endif
@ -10594,13 +10589,15 @@ int get_frontend_firmware_version(int file_des) {
int set_bit(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
uint32_t args[2] = {-1, -1};
uint32_t args[3] = {-1, -1, -1};
if (receiveData(file_des, args, sizeof(args), INT32) < 0)
return printSocketReadError();
uint32_t addr = args[0];
int nBit = (int)args[1];
LOG(logDEBUG1, ("Setting bit %d of reg 0x%x\n", nBit, addr));
uint32_t validate = args[2];
LOG(logDEBUG1,
("Setting bit %d of reg 0x%x, validate:%d\n", nBit, addr, validate));
// only set
if (Server_VerifyLock() == OK) {
@ -10613,20 +10610,23 @@ int set_bit(int file_des) {
LOG(logERROR, (mess));
} else {
#ifdef EIGERD
ret = setBit(addr, nBit);
if (ret == FAIL) {
ret = setBit(addr, nBit, validate);
#else
uint32_t bitmask = (1 << nBit);
#ifdef GOTTHARDD
uint32_t val = readRegister16And32(addr) | bitmask;
uint32_t retval = writeRegister16And32(addr, val);
writeRegister16And32(addr, val);
uint32_t retval = readRegister16And32(addr) | bitmask;
#else
uint32_t val = readRegister(addr) | bitmask;
uint32_t retval = writeRegister(addr, val);
writeRegister(addr, val);
uint32_t retval = readRegister(addr) | bitmask;
#endif
if (!(retval & bitmask)) {
if (validate && (!(retval & bitmask))) {
ret = FAIL;
}
#endif
if (ret == FAIL) {
sprintf(mess, "Could not set bit %d.\n", nBit);
LOG(logERROR, (mess));
}
@ -10638,13 +10638,15 @@ int set_bit(int file_des) {
int clear_bit(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
uint32_t args[2] = {-1, -1};
uint32_t args[3] = {-1, -1, -1};
if (receiveData(file_des, args, sizeof(args), INT32) < 0)
return printSocketReadError();
uint32_t addr = args[0];
int nBit = (int)args[1];
LOG(logDEBUG1, ("Clearing bit %d of reg 0x%x\n", nBit, addr));
uint32_t validate = args[2];
LOG(logDEBUG1,
("Clearing bit %d of reg 0x%x, validate:%d\n", nBit, addr, validate));
// only set
if (Server_VerifyLock() == OK) {
@ -10657,20 +10659,23 @@ int clear_bit(int file_des) {
LOG(logERROR, (mess));
} else {
#ifdef EIGERD
ret = clearBit(addr, nBit);
if (ret == FAIL) {
ret = clearBit(addr, nBit, validate);
#else
uint32_t bitmask = (1 << nBit);
#ifdef GOTTHARDD
uint32_t val = readRegister16And32(addr) & ~bitmask;
uint32_t retval = writeRegister16And32(addr, val);
writeRegister16And32(addr, val);
uint32_t retval = readRegister16And32(addr) & ~bitmask;
#else
uint32_t val = readRegister(addr) & ~bitmask;
uint32_t retval = writeRegister(addr, val);
writeRegister(addr, val);
uint32_t retval = readRegister(addr) & ~bitmask;
#endif
if (retval & bitmask) {
if (validate && (retval & bitmask)) {
ret = FAIL;
}
#endif
if (ret == FAIL) {
sprintf(mess, "Could not clear bit %d.\n", nBit);
LOG(logERROR, (mess));
}