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

changes for testram which didnt work anyway

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@111 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-01-23 15:05:08 +00:00
parent 41fea1fbcf
commit 094a87ec7b
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -511,6 +511,7 @@ u_int32_t getMcsVersion() {
// for fpga test // for fpga test
u_int32_t testFpga(void) { u_int32_t testFpga(void) {
printf("Test FPGA:\n");
u_int32_t val,addr; u_int32_t val,addr;
int result=OK,i; int result=OK,i;
//fixed pattern //fixed pattern
@ -572,7 +573,7 @@ u_int32_t testRAM(void) {
allocateRAM(); allocateRAM();
// while(i<100000) { // while(i<100000) {
memcpy(ram_values, values, dataBytes); memcpy(ram_values, values, dataBytes);
printf ("%d: copied fifo %x to memory %x size %d\n",i++, values, ram_values, dataBytes); printf ("Test RAM:\t%d: copied fifo %x to memory %x size %d\n",i++, values, ram_values, dataBytes);
// } // }
return result; return result;
} }
@ -1677,7 +1678,6 @@ int allocateRAM() {
#ifdef VERBOSE #ifdef VERBOSE
printf("RAM of size %d already allocated: nothing to be done\n", size); printf("RAM of size %d already allocated: nothing to be done\n", size);
#endif #endif
return OK; return OK;
} }

5
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -58,7 +58,6 @@ int init_detector( int b) {
system("bus -a 0xb0000000"); system("bus -a 0xb0000000");
#endif #endif
#endif #endif
testFpga(); shouldnt this be inside virtual as well?!
*/ */
if (res<0) { printf("Could not map memory\n"); if (res<0) { printf("Could not map memory\n");
@ -71,14 +70,12 @@ int init_detector( int b) {
initDetector(); initDetector();
printf("\ninitdetector done! \n"); printf("\ninitdetector done! \n");
testFpga(); testFpga();
//testRAM();
//gotthard specific //gotthard specific
setPhaseShiftOnce(); setPhaseShiftOnce();
setDAQRegister(); setDAQRegister();
setSettings(GET_SETTINGS,-1); setSettings(GET_SETTINGS,-1);
//testRAM();
} }
#endif #endif
strcpy(mess,"dummy message"); strcpy(mess,"dummy message");