detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-30 20:14:55 +01:00
Code Issues Actions Packages Releases Activity

configuremac doesnt return a retval, separated setdaqregister and clean fifo, included clean fifo before startstatemachine, set delay and gates to 0 at start of server

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@335 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-11-08 08:21:33 +00:00
parent 3cc914a8fb
commit 33fa69d546
3 changed files with 50 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@@ -245,34 +245,42 @@ int setPhaseShiftOnce(){
}
int cleanFifo(){
u_int32_t addr, reg, val;
printf("\nCleaning FIFO\n");
addr=ADC_SYNC_REG;
val=ADCSYNC_VAL | ADCSYNC_CLEAN_FIFO_BITS;
bus_w(addr,val);
val=ADCSYNC_VAL;
bus_w(addr,val);
reg=bus_r(addr);
#ifdef VERBOSE
printf("\nADC SYNC reg:%d\n",reg);
#endif
return OK;
}
int setDAQRegister(int adcval)
{
u_int32_t addr, reg, val;
u_int32_t addr, reg, val;
addr=DAQ_REG;
int value=0x7f;
if(adcval==-1) value=0x13f;
val=34+(42<<8)+(value<<16);
reg=bus_r(addr);
bus_w(addr,val);
reg=bus_r(addr);
addr=DAQ_REG;
int value=0x7f;
if(adcval==-1) value=0x13f;
val=34+(42<<8)+(value<<16);
reg=bus_r(addr);
bus_w(addr,val);
reg=bus_r(addr);
#ifdef VERBOSE
printf("DAQ reg:%x\n",reg);
printf("DAQ reg:%x\n",reg);
#endif
cleanFifo();
//clean fifo
addr=ADC_SYNC_REG;
val=ADCSYNC_VAL | ADCSYNC_CLEAN_FIFO_BITS;
bus_w(addr,val);
val=ADCSYNC_VAL;
bus_w(addr,val);
reg=bus_r(addr);
#ifdef VERBOSE
printf("\nADC SYNC reg:%d\n",reg);
#endif
return OK;
return OK;
}
@@ -727,11 +735,12 @@ int startReceiver(int start) {
#ifdef VERBOSE
printf("Config Reg %x\n", reg);
#endif
if (start && (!(reg&CPU_OR_RECEIVER_BIT)))
int d =reg&CPU_OR_RECEIVER_BIT;
if(d!=0) d=1;
if(d!=start)
return OK;
if(!start && (reg&CPU_OR_RECEIVER_BIT))
return OK;
return FAIL;
else
return FAIL;
}
@@ -1276,9 +1285,9 @@ int configureMAC(int ipad,long long int macad,long long int servermacad,int ival
mac_conf_regs=(mac_conf*)(CSP0BASE+offset*2);
tse_conf_regs=(tse_conf*)(CSP0BASE+offset2*2);
#ifdef VERBOSE
printf("Configuring MAC\n");
#endif
//#ifdef VERBOSE
printf("***Configuring MAC***\n");
//#endif
if(ival)
bus_w(addrr,(RESET_BIT|DIGITAL_TEST_BIT)); //0x080,reset mac (reset)
@@ -1474,6 +1483,7 @@ u_int32_t runState(void) {
// State Machine
int startStateMachine(){
cleanFifo();
//#ifdef VERBOSE
printf("Starting State Machine\n");
//#endif