Changeset 1690 for trunk/MagicSoft/Cosy/candrv

Timestamp:

12/18/02 17:48:44 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/candrv

Files:

• network.cc (modified) (1 diff)
• nodedrv.cc (modified) (2 diffs)
• nodedrv.h (modified) (3 diffs)

trunk/MagicSoft/Cosy/candrv/network.cc

@@ -237 +237 @@
             lout << "- Setting up Node #" << dec << i << endl;
             fNodes[i]->InitDevice(this);
-            fNodeInitialized[i] = TRUE;
+            if (!fNodes[i]->IsZombieNode())
+                fNodeInitialized[i] = TRUE;
+            else
+                fNodes[i]=NULL;
         }
     lout << "- All Nodes setup." << endl;

trunk/MagicSoft/Cosy/candrv/nodedrv.cc

@@ -56 +56 @@
 // and the node name. The name is a name for debug output.
 //
-NodeDrv::NodeDrv(BYTE_t nodeid, const char *name, MLog &out) : Log(out), fNetwork(NULL), fId(32), fError(0)
+NodeDrv::NodeDrv(BYTE_t nodeid, const char *name, MLog &out) : Log(out), fNetwork(NULL), fId(32), fError(0), fIsZombie(kFALSE)
 {
     if (nodeid>0x1f)
@@ -311 +311 @@
 // this device has been received.
 // You can stop waiting by StopWaitingForSDO.
-//
-void NodeDrv::WaitForSdo(WORD_t idx, BYTE_t subidx, WORDS_t timeout)
-{
-    fNetwork->WaitForSdo(fId, idx, subidx, timeout);
+// Return false if waiting timed out.
+//
+bool NodeDrv::WaitForSdo(WORD_t idx, BYTE_t subidx, WORDS_t timeout)
+{
+    return fNetwork->WaitForSdo(fId, idx, subidx, timeout);
 }
 

trunk/MagicSoft/Cosy/candrv/nodedrv.h

@@ -34 +34 @@
     void DelError()        { fError = 0; }
 
+    Bool_t fIsZombie;
+
 public:
     NodeDrv(BYTE_t nodeid, const char *name=NULL, MLog &out=gLog);
@@ -47 +49 @@
     int  GetError() const { return fError; }
     bool HasError() const { return fError; }
+
+    bool IsZombieNode() const { return fIsZombie; }
 
     virtual void HandleSDO(WORD_t idx, BYTE_t subidx, LWORD_t val, timeval_t *tv);
@@ -82 +86 @@
 
     // void WaitForSdos();
-    void WaitForSdo(WORD_t idx, BYTE_t subidx=0, WORDS_t timeout=500);
+    bool WaitForSdo(WORD_t idx, BYTE_t subidx=0, WORDS_t timeout=500);
 
     void EnableCanMsg(BYTE_t fcode);