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

using daq register function in configuremac

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@300 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-10-18 09:27:35 +00:00
parent f0450fbf5e
commit 524160422f
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -245,23 +245,22 @@ int setPhaseShiftOnce(){
} }
int setDAQRegister() int setDAQRegister(int adcval)
{ {
u_int32_t addr, reg, val; u_int32_t addr, reg, val;
int result=OK;
addr=DAQ_REG; addr=DAQ_REG;
val=34+(42<<8)+(319<<16); int value=0x7f;
if(adcval==-1) value=0x13f;
val=34+(42<<8)+(value<<16);
reg=bus_r(addr); reg=bus_r(addr);
//write to daqreg if not valid bus_w(addr,val);
if(reg!=val){ reg=bus_r(addr);
bus_w(addr,val); //#ifdef VERBOSE
reg=bus_r(addr); printf("DAQ reg:%x",reg);
if(reg!=val) //#endif
result=FAIL;
}
#ifdef VERBOSE
printf("DAQ reg:20916770:%d",reg);
#endif
addr=ADC_SYNC_REG; addr=ADC_SYNC_REG;
val=12; val=12;
bus_w(addr,val); bus_w(addr,val);
@ -269,7 +268,7 @@ int setDAQRegister()
#ifdef VERBOSE #ifdef VERBOSE
printf("\nADC SYNC reg:%d",reg); printf("\nADC SYNC reg:%d",reg);
#endif #endif
return result; return OK;
} }
@ -1225,7 +1224,9 @@ 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 and DAQ_REG //setting daqregister
setDAQRegister(adc);
//setting adc mask
int reg; int reg;
int udpPacketSize=0x050E; int udpPacketSize=0x050E;
int ipPacketSize=0x0522; int ipPacketSize=0x0522;
@ -1235,7 +1236,6 @@ 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;
@ -1254,7 +1254,6 @@ int configureMAC(int ipad,long long int macad,long long int servermacad,int ival
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("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);

2
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.h
View File

@ -26,7 +26,7 @@ u_int32_t bus_w(u_int32_t offset, u_int32_t data);
u_int32_t bus_r(u_int32_t offset); u_int32_t bus_r(u_int32_t offset);
int setPhaseShiftOnce(); int setPhaseShiftOnce();
int setDAQRegister(); int setDAQRegister(int adcval);
u_int32_t putout(char *s, int modnum); u_int32_t putout(char *s, int modnum);
u_int32_t readin(int modnum); u_int32_t readin(int modnum);

2
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -72,7 +72,7 @@ int init_detector( int b) {
testRAM(); testRAM();
//gotthard specific //gotthard specific
//setPhaseShiftOnce(); //setPhaseShiftOnce();
setDAQRegister(); setDAQRegister(-1);
setSettings(GET_SETTINGS,-1); setSettings(GET_SETTINGS,-1);
//Initialization //Initialization
setFrames(1); setFrames(1);