included the ival for digital_test_bit and set adc_write_reg to all FFFFFFFF by default in DAQ reg initialization

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@103 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-01-13 13:40:58 +00:00
parent bbedcbc329
commit 429bedecca
4 changed files with 57 additions and 37 deletions

View File

@ -303,31 +303,49 @@ int setDAQRegister()
#ifdef VERBOSE
printf("DAQ reg:20916770:%d",reg);
#endif
return result;
}
float setADCWriteRegister(float val){
u_int32_t addr, reg;
printf("\n\n\nChecking a few stuff\n");
printf("\nval received is %f,%d,%x",val,val,val);
printf("\nval converted to int and hex is %d,%x\n",(int)val,(float)val);
//setting ADC reg temporary
addr=ADC_WRITE_REG;
val=0xFFFFFFFF;
addr=ADC_SYNC_REG;
val=12;
bus_w(addr,val);
reg=bus_r(addr);
#ifdef VERBOSE
printf("\n\nADC write reg:%X",reg);
printf("\nADC SYNC reg:%d",reg);
#endif
return val;
return result;
}
u_int32_t bus_write(int addr, u_int32_t data) {
u_int32_t *ptr1,offset;
switch(addr){
case ADC_WRITE:
offset=ADC_WRITE_REG;
break;
default:
return FAIL;
}
ptr1=(u_int32_t*)(CSP0BASE+offset*2);
*ptr1=data;
return OK;
}
u_int32_t bus_read(int addr) {
u_int32_t *ptr1,offset;
switch(addr){
case ADC_WRITE:
offset=ADC_WRITE_REG;
break;
default:
offset=ADC_WRITE_REG;
}
ptr1=(u_int32_t*)(CSP0BASE+offset*2);
return *ptr1;
}
// direct pattern output
u_int32_t putout(char *s, int modnum) {
int i;