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

fix for storagecell bitwise start

Browse Source
This commit is contained in:
maliakal_d
2021-07-30 15:51:23 +02:00
parent c989be1e17
commit 6f81741931
2 changed files with 81 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -783,6 +783,7 @@ int selectStoragecellStart(int pos) {
uint32_t mask = DAQ_STRG_CELL_SLCT_MSK;
int offset = DAQ_STRG_CELL_SLCT_OFST;
if (getChipVersion() == 11) {
// set the bit
value = 1 << pos;
addr = CONFIG_V11_REG;
mask = CONFIG_V11_STRG_CLL_MSK;
@ -793,7 +794,18 @@ int selectStoragecellStart(int pos) {
bus_w(addr, bus_r(addr) & ~mask);
bus_w(addr, bus_r(addr) | ((value << offset) & mask));
}
return ((bus_r(addr) & mask) >> offset);
int retval = ((bus_r(addr) & mask) >> offset);
if (getChipVersion() == 11) {
// get which bit
int max = getMaxStoragecellStart();
for (int i = 0; i != max + 1; ++i) {
if (retval & (1 << i)) {
return i;
}
}
}
// chip v1.0
return retval;
}
int getMaxStoragecellStart() {