detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 05:50:14 +01:00
Code Issues Actions Packages Releases Activity

bugfix moduleid

Browse Source
This commit is contained in:
maliakal_d
2021-10-01 14:05:38 +02:00
parent ee7ae9d947
commit 594553434d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@@ -288,11 +288,11 @@ u_int32_t getDetectorNumber() {
} }
int getModuleId(int *ret, char *mess) { int getModuleId(int *ret, char *mess) {
return ((bus_r(MOD_ID_REG) & ~MOD_ID_MSK) >> MOD_ID_OFST); return ((bus_r(MOD_ID_REG) & MOD_ID_MSK) >> MOD_ID_OFST);
} }
void setModuleId(int modid) { void setModuleId(int modid) {
LOG(logINFOBLUE, ("Setting module id in fpga: %d\n", modid)) LOG(logINFOBLUE, ("Setting module id in fpga: 0x%x\n", modid))
bus_w(MOD_ID_REG, bus_r(MOD_ID_REG) & ~MOD_ID_MSK); bus_w(MOD_ID_REG, bus_r(MOD_ID_REG) & ~MOD_ID_MSK);
bus_w(MOD_ID_REG, bus_r(MOD_ID_REG) | ((modid << MOD_ID_OFST) & MOD_ID_MSK)); bus_w(MOD_ID_REG, bus_r(MOD_ID_REG) | ((modid << MOD_ID_OFST) & MOD_ID_MSK));
} }

4
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@@ -283,11 +283,11 @@ u_int32_t getDetectorNumber() {
int getModuleId(int *ret, char *mess) { int getModuleId(int *ret, char *mess) {
return ((bus_r(MOD_ID_REG) & ~MOD_ID_MSK) >> MOD_ID_OFST); return ((bus_r(MOD_ID_REG) & MOD_ID_MSK) >> MOD_ID_OFST);
} }
void setModuleId(int modid) { void setModuleId(int modid) {
LOG(logINFOBLUE, ("Setting module id in fpga: %d\n", modid)) LOG(logINFOBLUE, ("Setting module id in fpga: 0x%x\n", modid))
bus_w(MOD_ID_REG, bus_r(MOD_ID_REG) & ~MOD_ID_MSK); bus_w(MOD_ID_REG, bus_r(MOD_ID_REG) & ~MOD_ID_MSK);
bus_w(MOD_ID_REG, bus_w(MOD_ID_REG,
bus_r(MOD_ID_REG) | ((modid << MOD_ID_OFST) & MOD_ID_MSK)); bus_r(MOD_ID_REG) | ((modid << MOD_ID_OFST) & MOD_ID_MSK));