Changeset 808 for trunk/MagicSoft/Cosy/candrv

Timestamp:

05/25/01 16:51:24 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/candrv

Files:

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

trunk/MagicSoft/Cosy/candrv/network.cc

@@ -166 +166 @@
 }
 
+bool Network::HasError()
+{
+    for (int i=0; i<32; i++)
+        if (fNodes[i] && fNodes[i]->HasError())
+            return true;
+
+    return false;
+}

trunk/MagicSoft/Cosy/candrv/network.h

@@ -30 +30 @@
     virtual void Start();
     virtual void Stop();
+
+    bool HasError();
 };
 

trunk/MagicSoft/Cosy/candrv/nodedrv.cc

@@ -6 +6 @@
 #include "network.h"
 
-NodeDrv::NodeDrv(BYTE_t nodeid, ostream &out) : Log(out), fNetwork(NULL), fId(32)
+NodeDrv::NodeDrv(BYTE_t nodeid, ostream &out) : Log(out), fNetwork(NULL), fId(32), fError(0)
 {
     if (nodeid>31)

trunk/MagicSoft/Cosy/candrv/nodedrv.h

@@ -13 +13 @@
     BYTE_t   fId;
 
+    int fError;
+
+protected:
+    void SetError(int err) { fError = err; }
+    void DelError()        { fError = 0; }
+    int  GetError()        { return fError; }
+
 public:
     NodeDrv(BYTE_t nodeid, ostream &out=cout);
@@ -21 +28 @@
     virtual void InitDevice(Network *net);
     virtual void StopDevice() = 0;
+
+    bool HasError()        { return fError; }
 
     virtual void HandleSDO(WORD_t idx, BYTE_t subidx, LWORD_t val, struct timeval *tv);