Merge branch 'cbm-fles-master'

Author: Heiko Engel

configure

@@ -266,7 +266,7 @@ linux()
 	                     BUILD_PATH="$BUILD_PATH/$BUILD_PATH_POSTFIX"
                              if [ -d $BUILD_PATH  ]
                              then
-                                 echo "Build directory $BUILD_PATH already exists (aborting -> run make mrpropper to run a clean configure)"
+                                 echo "Build directory $BUILD_PATH already exists (aborting -> run 'make mrproper' to run a clean configure)"
                                  exit -1
                              else
                                  mkdir $BUILD_PATH

patches/linux_uio/uio_pci_dma.c

@@ -482,6 +482,7 @@ remove(struct pci_dev *pci_device)
 
 static DEFINE_PCI_DEVICE_TABLE(id_table) = {
     {PCI_DEVICE(0x10dc, 0x01a0) }, /* C-RORC PCI ID as registered at CERN */
+    {PCI_DEVICE(0x10dc, 0xbeaf) }, /* FLIB intermediate PCI ID */
     { 0, }
 };
 

src/debug.c

@@ -139,15 +139,18 @@ DebugInit()
             debug_mask = atoi(environment_pda_debug);
         }
 
-        fprintf(DEBUG_CHANNEL,
-                ENV_WRN " : The PDA library has debug support "
+        if(false)
+        {
+            fprintf(DEBUG_CHANNEL,
+                    ENV_WRN " : The PDA library has debug support "
                         "(current debug mask is %u).\n", debug_mask );
-        fprintf(DEBUG_CHANNEL,
-                ENV_WRN " : Please use the environment variable " ENV_VAR
-                " to change the debug mask!\n");
-        fprintf(DEBUG_CHANNEL,
-                ENV_WRN " : Please set " ENV_VAR " to the value %u to "
-                                                 "get all debug output!\n", PDADEBUG_ALL);
+            fprintf(DEBUG_CHANNEL,
+                    ENV_WRN " : Please use the environment variable " ENV_VAR
+                    " to change the debug mask!\n");
+            fprintf(DEBUG_CHANNEL,
+                    ENV_WRN " : Please set " ENV_VAR " to the value %u to "
+                    "get all debug output!\n", PDADEBUG_ALL);
+        }
     }
 }