Changeset 8852 for trunk/MagicSoft/Cosy/candrv/vmodican.cc

Timestamp:

02/02/08 13:06:37 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/candrv/vmodican.cc (modified) (17 diffs)

trunk/MagicSoft/Cosy/candrv/vmodican.cc

@@ -41 +41 @@
 
 #include "MLog.h"
+#include "MLogManip.h"
 
 ClassImp(VmodIcan);
@@ -81 +82 @@
     while (!Send(&msg));
 
-    gLog << "- CAN Bus Termination set to " << (state?"on":"off") << endl;
+    gLog << inf2 << "- CAN Bus Termination set to " << (state?"on":"off") << endl;
 }
 
@@ -95 +96 @@
         return 0;
 
-    gLog << "- Starting Receiver Loop." << endl;
+    gLog << inf2 << "- Starting Receiver Loop." << endl;
 
     while (1)
@@ -313 +314 @@
     while (!Send(&msg));      /* transmitt to module */
 
-    gLog << "- Baudrate set to " << rate << "kbps" << endl;
+    gLog << inf2 << "- Baudrate set to " << rate << "kbps" << endl;
 }
 
@@ -342 +343 @@
     while (!Send(&msg));
 
-    gLog << "- Controller connected to bus" << endl;
+    gLog << inf2 << "- Controller connected to bus" << endl;
 }
 
@@ -387 +388 @@
         return -1;
 
-    gLog << "- Fast Host Interface Enabled" << endl;
+    gLog << inf2 << "- Fast Host Interface Enabled" << endl;
 
     return 0;
@@ -415 +416 @@
 void VmodIcan::DisableCanBusConnection()
 {
-    gLog << "- Disconnect VmodIcan module from Bus!" << endl;
+    gLog << inf2 << "- Disconnect VmodIcan module from Bus!" << endl;
 
     Message msg;                  /* buffer for module messages */
@@ -424 +425 @@
     while (!Send(&msg));
 
-    gLog << "- VmodIcan disconnected." << endl;
+    gLog << inf2 << "- VmodIcan disconnected." << endl;
 }
 
@@ -451 +452 @@
 void VmodIcan::Close()
 {
-    gLog << "- Closing device VmodIcan #" << (int)fd << endl;
+    gLog << inf2 << "- Closing device VmodIcan #" << (int)fd << endl;
 
     Message msg; /* disconnect message */
@@ -462 +463 @@
     close(fd);
 
-    gLog << "- Device closed." << endl;
+    gLog << inf2 << "- Device closed." << endl;
 }
 
@@ -479 +480 @@
     while (!Send(&msg));
 
-    gLog << "- Fifo enabled" << endl;
+    gLog << inf2 << "- Fifo enabled" << endl;
 
     return TRUE;
@@ -492 +493 @@
     const int rc = Ioctl(DPM_RESET, 0);
 
-    gLog << "- Reset done." << endl;
+    gLog << inf2 << "- Reset done." << endl;
 
     return rc;
@@ -516 +517 @@
     if (fd < 0)
     {
-        gLog << "Error: Opening device '" << devname << "' (rc=" << fd << ")" << endl;
+        gLog << err << "Error: Opening device '" << devname << "' (rc=" << fd << ")" << endl;
         gLog << strerror(errno) << endl;
         return FALSE;
     }
 
-    gLog << "- Device " << devname << " #" << fd << " open." << endl;
+    gLog << inf << "- Device " << devname << " #" << fd << " open." << endl;
 
     return TRUE;
@@ -582 +583 @@
     Ioctl(DPM_INIT_NEW_HOSTIF_PRIO, &hdp);
 
-    gLog << "- New style host interface enabled" << endl;
+    gLog << inf2 << "- New style host interface enabled" << endl;
 
     return 0;
@@ -757 +758 @@
     while (!Send(&msg));
 
-    gLog << "- All CobIds disabled." << endl;
+    gLog << inf2 << "- All CobIds disabled." << endl;
 }
 
@@ -868 +869 @@
      */
 
-    gLog << "- VmodIcan initialized." << endl;
+    gLog << inf << "- VmodIcan initialized." << endl;
 
 }
@@ -879 +880 @@
 VmodIcan::~VmodIcan()
 {
-    gLog << "- Stopping VmodIcan module." << endl;
+    gLog << inf2 << "- Stopping VmodIcan module." << endl;
     CancelThread();
     DisableCanBusConnection();
     Close();
-    gLog << "- VmodIcan stopped." << endl;
-}
+    gLog << inf << "- VmodIcan stopped." << endl;
+}