detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-11 12:27:14 +02:00
Code Issues Actions Packages Releases Activity

server should be up to date

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@442 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-01-30 14:33:03 +00:00
parent 1ee23e21d5
commit 2176620ca4
3 changed files with 90 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -30,6 +30,7 @@ int dynamicRange=16;//32;
int dataBytes=NMAXMOD*NCHIP*NCHAN*2;
int storeInRAM=0;
int ROI_flag=0;
int adcConfigured=-1;
u_int32_t *ram_values=NULL;
volatile char *now_ptr=NULL;
volatile u_int16_t *values;
@ -261,9 +262,9 @@ int cleanFifo(){
}
reg=bus_r(addr);
#ifdef DDEBUG
printf("\nADC SYNC reg:%x\n",reg);
#endif
//#ifdef DDEBUG
printf("\n***ADC SYNC reg:%x****\n",reg);
//#endif
return OK;
}
@ -1178,11 +1179,10 @@ int initConfGain(int isettings,int val,int imod){
int configureMAC(int ipad,long long int macad,long long int detectormacad, int detipad, int ival, int adc,int udpport){
if(runBusy())
if(stopStateMachine()==FAIL)
return FAIL;
//update adc configured
adcConfigured = adc;
printf("configuring with adc:%d\n",adc);
//setting adc mask
int reg;
int udpPacketSize=0x050E;
@ -1194,6 +1194,8 @@ int configureMAC(int ipad,long long int macad,long long int detectormacad, int d
case 3:
case 4:
ROI_flag=1;
//setting daqregister
setDAQRegister(adc);
reg = (NCHAN*2)<<CHANNEL_OFFSET;
reg&=CHANNEL_MASK;
int mask =1<<adc;
@ -1204,7 +1206,10 @@ int configureMAC(int ipad,long long int macad,long long int detectormacad, int d
break;
//for all adcs
default:
adcConfigured=-1;
ROI_flag=0;
//setting daqregister
setDAQRegister(adc);
reg = (NCHAN*NCHIP)<<CHANNEL_OFFSET;
reg&=CHANNEL_MASK;
reg|=ACTIVE_ADC_MASK;
@ -1214,7 +1219,7 @@ int configureMAC(int ipad,long long int macad,long long int detectormacad, int d
//setting daqregister
setDAQRegister(adc);
//setDAQRegister(adc);
#ifdef DDEBUG
printf("Chip of Intrst Reg:%x\n",bus_r(CHIP_OF_INTRST_REG));
@ -1236,7 +1241,7 @@ int configureMAC(int ipad,long long int macad,long long int detectormacad, int d
tse_conf_regs=(tse_conf*)(CSP0BASE+offset2*2);
#ifdef DDEBUG
printf("***Configuring MAC***\n");
printf("***Configuring MAC*** adc=%d\n",adc);
#endif
if(ival)
@ -1397,11 +1402,13 @@ int configureMAC(int ipad,long long int macad,long long int detectormacad, int d
return OK;
return adcConfigured;
}
int getAdcConfigured(){
return adcConfigured;
}
u_int32_t runBusy(void) {
u_int32_t s = bus_r(STATUS_REG);