Index: drsdaq/DRS/DRS.cc
===================================================================
--- drsdaq/DRS/DRS.cc	(revision 177)
+++ drsdaq/DRS/DRS.cc	(revision 182)
@@ -183,8 +183,8 @@
 #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,5 +4857,5 @@
 
    // use following lines to save calibration into an ASCII file
-#if 1
+#if 0
    FILE *fh;
 
@@ -6907,5 +6907,5 @@
   if ((ErrorCode = VME_Open()) != VME_SUCCESS) {
     VME_ErrorString(ErrorCode,ErrorString); 
-    printf("Error: %s\n",ErrorString);
+    printf("VME_Open()  %s\n",ErrorString);
   }  
   return ErrorCode;
@@ -6917,5 +6917,5 @@
   if (ErrorCode = VME_MasterMap(&MasterMap, MMap)) {
     VME_ErrorString(ErrorCode,ErrorString); 
-    printf("Error: %s\n",ErrorString);
+    printf("VME_MasterMap()  %s\n",ErrorString);
   }
   return(ErrorCode);
@@ -6927,5 +6927,5 @@
   if (ErrorCode = VME_MasterUnmap(MMap)) {
     VME_ErrorString(ErrorCode,ErrorString); 
-    printf("Error: %s\n",ErrorString);
+    printf("VME_MasterUnmap()  %s\n",ErrorString);
   }  
   return(ErrorCode);  
@@ -6937,5 +6937,5 @@
   if ((ErrorCode = VME_Close()) != VME_SUCCESS) {    
     VME_ErrorString(ErrorCode,ErrorString);
-    printf("Error: %s\n",ErrorString);
+    printf("VME_Close()  %s\n",ErrorString);
   }
   return ErrorCode;
@@ -6947,5 +6947,5 @@
   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,5 +6957,5 @@
   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,5 +6966,5 @@
   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,5 +6976,5 @@
   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,5 +6986,5 @@
   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,5 +6996,5 @@
   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;
