Changeset 1266 for trunk/MagicSoft/Cosy/candrv

Timestamp:

04/04/02 13:17:33 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/candrv

Files:

• canopen.cc (modified) (1 diff)
• network.cc (modified) (2 diffs)
• nodedrv.cc (modified) (1 diff)
• vmodican.cc (modified) (4 diffs)

trunk/MagicSoft/Cosy/candrv/canopen.cc

@@ -51 +51 @@
             pthread_mutex_lock(&fPdoMux[i][j]);
         }
+
+    lout << "- CanOpen initialized." << endl;
 }
 

trunk/MagicSoft/Cosy/candrv/network.cc

@@ -74 +74 @@
     for (int i=0; i<32; i++)
         fNodes[i] = NULL;
+
+    lout << "- Network initialized." << endl;
 }
 
@@ -233 +235 @@
         if (fNodes[i])
         {
-            lout << "- Initializing Node #" << dec << i << endl;
+            lout << "- Setting up Node #" << dec << i << endl;
             fNodes[i]->InitDevice(this);
             fNodeInitialized[i] = TRUE;
         }
-    lout << "- All Nodes initialized." << endl;
+    lout << "- All Nodes setup." << endl;
 }
 

trunk/MagicSoft/Cosy/candrv/nodedrv.cc

@@ -73 +73 @@
         fName += (int)nodeid;
     }
+
+    lout << "- Node #" << nodeid << " (" << name << ") initialized." << endl;
 }
 

trunk/MagicSoft/Cosy/candrv/vmodican.cc

@@ -39 +39 @@
 #include <unistd.h>        // read
 #include <pthread.h>       // pthread_create
+#include <sys/time.h>      // gettimeofday
 #include <sys/ioctl.h>     // ioctl
 #include <sys/resource.h>  // PRIO_PROCESS
@@ -592 +593 @@
     {
         lout << "Error: Opening device '" << devname << "' (rc=" << fd << ")" << endl;
+        lout << strerror(errno) << endl;
         return FALSE;
     }
 
-    lout << "- Device " << devname << " open." << endl;
+    lout << "- Device " << devname << " #" << fd << " open." << endl;
 
     return TRUE;
@@ -921 +923 @@
     Detach();
 
-    Open(dev);                         // open module
+    if (!Open(dev))
+    {
+        cout << "Cannot open device '" << dev << "'... exit." << endl;
+        cout << strerror(errno) << endl;
+        exit(1);                       // open module
+    }
     Reset();
     EnableFifo();                      // connect to host (in interrupt mode)
@@ -931 +938 @@
      EnableFastCan(50, 50);
      SetTermination(0);
-    */
+     */
+
+    lout << "- VmodIcan initialized." << endl;
+
 }