Changeset 6923 for trunk/MagicSoft/Cosy/candrv/nodedrv.cc

Timestamp:

04/11/05 10:58:30 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/candrv/nodedrv.cc (modified) (1 diff)

trunk/MagicSoft/Cosy/candrv/nodedrv.cc

@@ -416 +416 @@
 // queue and no waiting is done, false is returned..
 //
-bool NodeDrv::WaitForSdo(WORD_t idx, BYTE_t subidx, WORDS_t timeout)
+bool NodeDrv::WaitForSdo(WORD_t idx, BYTE_t subidx, WORDS_t timeout, bool zombie)
 {
     bool rc = fNetwork->WaitForSdo(fId, idx, subidx, fIsZombie?-1:timeout);
-
-    if (!rc)
-    {
-        lout << "NodeDrv::WaitForSdo: 0x" << hex << idx << "/" << dec << (int)subidx << " " << GetNodeName() << " --> ZOMBIE!" << endl;
+    if (rc)
+        return true;
+
+    lout << " + " << GetNodeName() << ": NodeDrv::WaitForSdo: 0x" << hex << idx << "/" << dec << (int)subidx << " --> ZOMBIE! " << MTime() << endl;
+    if (zombie)
         SetZombie();
-    }
-/*
-    if (HasError())
-    {
-        lout << "NodeDrv::WaitForSdo: HasError 0x" << hex << idx << "/" << dec << (int)subidx << " " << GetNodeName() << " --> ZOMBIE!" << endl;
-        fIsZombie = kTRUE;
-    }
-*/
-    return fIsZombie ? false : rc;
+    return false;
 }