Changeset 182 for drsdaq/DRS

Timestamp:

03/12/10 15:53:20 (15 years ago)

Author:

ogrimm

Message:

Updates to DIM integration

File:

• drsdaq/DRS/DRS.cc (modified) (12 diffs)

drsdaq/DRS/DRS.cc

@@ -183 +183 @@
 #endif
       /* check all VME slave slots */
-      for (index = 2; index <= 10; index++) {      
+      for (index = 2; index <= 9; index++) {      
 #ifdef CT_VME 
         MasterMap.vmebus_address        = GEVPC_BASE_ADDR + index * GEVPC_WINSIZE; // VME board base address
-        MasterMapVME(&MasterMapping[index]);
+        if (MasterMapVME(&MasterMapping[index]) != VME_SUCCESS) continue;
 #endif
       
@@ -4857 +4857 @@
 
    // use following lines to save calibration into an ASCII file
-#if 1
+#if 0
    FILE *fh;
 
@@ -6907 +6907 @@
   if ((ErrorCode = VME_Open()) != VME_SUCCESS) {
     VME_ErrorString(ErrorCode,ErrorString); 
-    printf("Error: %s\n",ErrorString);
+    printf("VME_Open()  %s\n",ErrorString);
   }  
   return ErrorCode;
@@ -6917 +6917 @@
   if (ErrorCode = VME_MasterMap(&MasterMap, MMap)) {
     VME_ErrorString(ErrorCode,ErrorString); 
-    printf("Error: %s\n",ErrorString);
+    printf("VME_MasterMap()  %s\n",ErrorString);
   }
   return(ErrorCode);
@@ -6927 +6927 @@
   if (ErrorCode = VME_MasterUnmap(MMap)) {
     VME_ErrorString(ErrorCode,ErrorString); 
-    printf("Error: %s\n",ErrorString);
+    printf("VME_MasterUnmap()  %s\n",ErrorString);
   }  
   return(ErrorCode);  
@@ -6937 +6937 @@
   if ((ErrorCode = VME_Close()) != VME_SUCCESS) {    
     VME_ErrorString(ErrorCode,ErrorString);
-    printf("Error: %s\n",ErrorString);
+    printf("VME_Close()  %s\n",ErrorString);
   }
   return ErrorCode;
@@ -6947 +6947 @@
   if ((ErrorCode = CMEM_Open()) != CMEM_RCC_SUCCESS) {
     VME_ErrorString(ErrorCode,ErrorString); 
-    printf("Error: %s\n",ErrorString);
+    printf("CMEM_Open()  %s\n",ErrorString);
   }
   return ErrorCode;
@@ -6957 +6957 @@
   if ((ErrorCode = CMEM_Close()) != CMEM_RCC_SUCCESS) {  
     VME_ErrorString(ErrorCode,ErrorString);
-    printf("Error: %s\n",ErrorString);
+    printf("CMEM_Close  %s\n",ErrorString);
   }
   return ErrorCode;
@@ -6966 +6966 @@
   if ((ErrorCode = CMEM_SegmentAllocate(SegSize, "DMA_BUFFER", CMEM_SegIdentifier)) != CMEM_RCC_SUCCESS) {
     VME_ErrorString(ErrorCode,ErrorString); 
-    printf("Error: %s\n",ErrorString);
+    printf("CMEM_SegmentAllocate()  %s\n",ErrorString);
   }
   return ErrorCode;
@@ -6976 +6976 @@
   if ((ErrorCode = CMEM_SegmentPhysicalAddress(CMEM_SegIdentifier, PCIAddress)) != CMEM_RCC_SUCCESS) {
     VME_ErrorString(ErrorCode,ErrorString);
-    printf("Error: %s\n",ErrorString);
+    printf("CMEM_SegmentPhysicalAddress()  %s\n",ErrorString);
   }
   return ErrorCode;
@@ -6986 +6986 @@
   if ((ErrorCode = CMEM_SegmentVirtualAddress(CMEM_SegIdentifier, VirtualAddress)) != CMEM_RCC_SUCCESS) {
     VME_ErrorString(ErrorCode,ErrorString);
-    printf("Error: %s\n",ErrorString);
+    printf("CMEM_SegmentVirtualAddress()  %s\n",ErrorString);
   }
   return ErrorCode;
@@ -6996 +6996 @@
   if ((ErrorCode = CMEM_SegmentFree(CMEM_SegIdentifier)) != CMEM_RCC_SUCCESS) {
     VME_ErrorString(ErrorCode,ErrorString); 
-    printf("Error: %s\n",ErrorString);
+    printf("CMEM_SegmentFree()  %s\n",ErrorString);
   }  
   return ErrorCode;