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

included DAQ reg editing in configuremac function

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@299 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-10-18 09:07:55 +00:00
parent 6cf4fc5e43
commit f0450fbf5e
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -1225,7 +1225,7 @@ int initConfGain(int isettings,int val,int imod){
int configureMAC(int ipad,long long int macad,long long int servermacad,int ival, int adc){ int configureMAC(int ipad,long long int macad,long long int servermacad,int ival, int adc){
//setting adc mask //setting adc mask and DAQ_REG
int reg; int reg;
int udpPacketSize=0x050E; int udpPacketSize=0x050E;
int ipPacketSize=0x0522; int ipPacketSize=0x0522;
@ -1235,34 +1235,30 @@ int configureMAC(int ipad,long long int macad,long long int servermacad,int ival
case 2: case 2:
case 3: case 3:
case 4: case 4:
bus_w(DAQ_REG,0x7f2a22);
reg = (NCHAN*2)<<CHANNEL_OFFSET; reg = (NCHAN*2)<<CHANNEL_OFFSET;
reg&=CHANNEL_MASK; reg&=CHANNEL_MASK;
int mask =1<<adc; int mask =1<<adc;
reg|=(ACTIVE_ADC_MASK & mask); reg|=(ACTIVE_ADC_MASK & mask);
bus_w(CHIP_OF_INTRST_REG,reg); bus_w(CHIP_OF_INTRST_REG,reg);
reg=bus_r(CHIP_OF_INTRST_REG);
#ifdef VERBOSE
printf("Chip of Intrst Reg:%x\n",reg);
#endif
ipPacketSize= 256*2+14+20; ipPacketSize= 256*2+14+20;
udpPacketSize=256*2+4+8+2; udpPacketSize=256*2+4+8+2;
break; break;
//for all adcs //for all adcs
default: default:
bus_w(DAQ_REG,0x13f2a22);
reg = (NCHAN*NCHIP)<<CHANNEL_OFFSET; reg = (NCHAN*NCHIP)<<CHANNEL_OFFSET;
reg&=CHANNEL_MASK; reg&=CHANNEL_MASK;
reg|=ACTIVE_ADC_MASK; reg|=ACTIVE_ADC_MASK;
bus_w(CHIP_OF_INTRST_REG,reg); bus_w(CHIP_OF_INTRST_REG,reg);
reg=bus_r(CHIP_OF_INTRST_REG);
#ifdef VERBOSE
printf("Chip of Intrst Reg:%x\n",reg);
#endif
break; break;
} }
#ifdef VERBOSE //#ifdef VERBOSE
printf("DAQ Reg:%x\n",bus_r(DAQ_REG));
printf("Chip of Intrst Reg:%x\n",bus_r(CHIP_OF_INTRST_REG));
printf("IP Packet Size:%d\n",ipPacketSize); printf("IP Packet Size:%d\n",ipPacketSize);
printf("UDP Packet Size:%d\n",udpPacketSize); printf("UDP Packet Size:%d\n",udpPacketSize);
#endif //#endif
//configuring mac //configuring mac
u_int32_t addrr=MULTI_PURPOSE_REG; u_int32_t addrr=MULTI_PURPOSE_REG;