diff --git a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c index 75bc6cb16..6ee1f7ea7 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c +++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c @@ -511,6 +511,7 @@ u_int32_t getMcsVersion() { // for fpga test u_int32_t testFpga(void) { + printf("Test FPGA:\n"); u_int32_t val,addr; int result=OK,i; //fixed pattern @@ -572,7 +573,7 @@ u_int32_t testRAM(void) { allocateRAM(); // while(i<100000) { 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; } @@ -1677,7 +1678,6 @@ int allocateRAM() { #ifdef VERBOSE printf("RAM of size %d already allocated: nothing to be done\n", size); #endif - return OK; } diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c index 9c2343a4f..ad16efa59 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c +++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c @@ -58,7 +58,6 @@ int init_detector( int b) { system("bus -a 0xb0000000"); #endif #endif - testFpga(); shouldnt this be inside virtual as well?! */ if (res<0) { printf("Could not map memory\n"); @@ -71,14 +70,12 @@ int init_detector( int b) { initDetector(); printf("\ninitdetector done! \n"); testFpga(); + //testRAM(); //gotthard specific setPhaseShiftOnce(); setDAQRegister(); setSettings(GET_SETTINGS,-1); - - - //testRAM(); } #endif strcpy(mess,"dummy message");