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

added the read write reg for debugging

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@105 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-01-13 17:00:06 +00:00
parent 89c00ffda3
commit 3265f8b483
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -314,7 +314,7 @@ int setDAQRegister()
}
/*
u_int32_t bus_write(int addr, u_int32_t data) {
u_int32_t *ptr1,offset;
switch(addr){
@ -344,7 +344,7 @@ u_int32_t bus_read(int addr) {
return *ptr1;
}
*/
// direct pattern output
u_int32_t putout(char *s, int modnum) {

4
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.h
View File

@ -27,8 +27,8 @@ u_int32_t bus_r(u_int32_t offset);
int setDummyRegister();
int setPhaseShiftOnce();
int setDAQRegister();
u_int32_t bus_write(int addr, u_int32_t data);
u_int32_t bus_read(int addr);
//u_int32_t bus_write(int addr, u_int32_t data);
//u_int32_t bus_read(int addr);
u_int32_t putout(char *s, int modnum);
u_int32_t readin(int modnum);

17
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -746,7 +746,7 @@ int write_register(int file_des) {
int addr, val;
int n;
u_int32_t address;
sprintf(mess,"Can't write to register\n");
n = receiveDataOnly(file_des,arg,sizeof(arg));
@ -766,11 +766,12 @@ int write_register(int file_des) {
sprintf(mess,"Detector locked by %s\n",lastClientIP);
}
if(ret!=FAIL){
ret=bus_write(addr,val);
address=(addr<<11);
ret=bus_w(address,val);
if(ret==OK)
retval=bus_read(addr);
retval=bus_r(address);
}
@ -809,7 +810,7 @@ int read_register(int file_des) {
int addr;
int n;
u_int32_t address;
sprintf(mess,"Can't read register\n");
n = receiveDataOnly(file_des,&arg,sizeof(arg));
@ -825,8 +826,10 @@ int read_register(int file_des) {
printf("reading register 0x%x\n", addr);
#endif
if(ret!=FAIL)
retval=bus_read(address);
if(ret!=FAIL){
address=(addr<<11);
retval=bus_r(address);
}