diff --git a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c index f196f9370..da4d19085 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c +++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c @@ -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) { diff --git a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.h b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.h index cb5c80597..5e84efeb5 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.h +++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.h @@ -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); diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c index d7d6448ce..0a13774c6 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c +++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c @@ -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); + }