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

forces update

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@74 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2011-12-09 15:48:26 +00:00
parent a77a6bac21
commit c9a314d829
9 changed files with 766 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/mythenDetectorServer/firmware_funcs.c
View File

@@ -151,8 +151,13 @@ u_int32_t readin(int modnum) {
u_int32_t val;
//addr=MCB_DOUT_REG_OFF+(modnum<<4);
addr=MCB_DOUT_REG_OFF+(modnum<<SHIFTMOD);
val=bus_r(addr) & 0x3ff;
// printf("reading 0x%08x, value 0x%08x\n",addr,val);
#ifndef PICASSOD
val=bus_r(addr) & 0x3ff; //anna (MYTHEN: reads direct input for 10 chips per module)
#else
val=bus_r(addr) & 0xfff; //frances. despite changed, errors still in the ShiftStSel, shiftIn and shiftOut.
#endif
return val;
}