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

not really a change in the server, but this seems to have worked for cpu transfer after changing vhdl code

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@420 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-01-10 15:54:45 +00:00
parent 1c275c28bd
commit af2d3d87b3
1 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -260,9 +260,10 @@ int cleanFifo(){
bus_w(addr,val); bus_w(addr,val);
} }
else { else {
//1b322114
val=ADCSYNC_VAL | ADCSYNC_CLEAN_FIFO_BITS | TOKEN_RESTART_DELAY_ROI; val=ADCSYNC_VAL | ADCSYNC_CLEAN_FIFO_BITS | TOKEN_RESTART_DELAY_ROI;
bus_w(addr,val); bus_w(addr,val);
//88022114 //1b022114
val=ADCSYNC_VAL | TOKEN_RESTART_DELAY_ROI; val=ADCSYNC_VAL | TOKEN_RESTART_DELAY_ROI;
@ -1645,11 +1646,12 @@ u_int32_t* fifo_read_event()
#ifdef VERBOSE #ifdef VERBOSE
printf("before looping\n"); printf("before looping\n");
#endif #endif
volatile u_int32_t t = bus_r(LOOK_AT_ME_REG); volatile u_int32_t t = bus_r(LOOK_AT_ME_REG);
#ifdef VERBOSE #ifdef VERBOSE
printf("lookatmereg=x%x\n",t); printf("lookatmereg=x%x\n",t);
#endif #endif
/*
while ((t&0x1)==0) while ((t&0x1)==0)
{ {
t = bus_r(LOOK_AT_ME_REG); t = bus_r(LOOK_AT_ME_REG);
@ -1657,37 +1659,30 @@ u_int32_t* fifo_read_event()
return NULL; return NULL;
} }
} }
*/
while((t&0x1)==0) {
if (runBusy()==0) {
t = bus_r(LOOK_AT_ME_REG);
if ((t&0x1)==0) {
printf("no frame found - exiting ");
printf("%08x %08x\n", runState(), bus_r(LOOK_AT_ME_REG));
return NULL;
} else {
printf("no frame found %x status %x\n", bus_r(LOOK_AT_ME_REG),runState());
break;
}
}
t = bus_r(LOOK_AT_ME_REG);
}
/* while(bus_r(LOOK_AT_ME_REG)==0) { */ //#ifdef VERBOSE
/* #ifdef VERBOSE */
/* printf("Waiting for data status %x\n",runState()); */
/* #endif */
/* // if (runBusy()==0) { */
/* if (bus_r(LOOK_AT_ME_REG)==0) { */
/* #ifdef VERBOSE */
/* printf("no frame found - exiting "); */
/* printf("%08x %08x\n", runState(), bus_r(LOOK_AT_ME_REG)); */
/* #endif */
/* return NULL; */
/* } else { */
/* #ifdef VERBOSE */
/* printf("no frame found %x status %x\n", bus_r(LOOK_AT_ME_REG),runState()); */
/* #endif */
/* break; */
/* } */
/* //} */
/* } */
#ifdef VERBOSE
printf("before readout %08x %08x\n", runState(), bus_r(LOOK_AT_ME_REG)); printf("before readout %08x %08x\n", runState(), bus_r(LOOK_AT_ME_REG));
#endif //#endif
//added+2 for creating ram_values memory
dma_memcpy(now_ptr,values ,dataBytes); dma_memcpy(now_ptr,values ,dataBytes);
//memcpy(now_ptr,values ,dataBytes);
#ifdef VERYVERBOSE #ifdef VERYVERBOSE
int a; int a;
@ -1698,10 +1693,10 @@ u_int32_t* fifo_read_event()
printf("********\n"); printf("********\n");
//memcpy(now_ptr, values, dataBytes); //memcpy(now_ptr, values, dataBytes);
#endif #endif
#ifdef VERBOSE //#ifdef VERBOSE
printf("Copying to ptr %08x %d\n",(unsigned int)(now_ptr), dataBytes); printf("Copying to ptr %08x %d\n",(unsigned int)(now_ptr), dataBytes);
printf("after readout %08x %08x\n", runState(), bus_r(LOOK_AT_ME_REG)); printf("after readout %08x %08x\n", runState(), bus_r(LOOK_AT_ME_REG));
#endif //#endif
if (storeInRAM>0) { if (storeInRAM>0) {
now_ptr+=dataBytes; now_ptr+=dataBytes;