Changeset 9439 for trunk/MagicSoft/Cosy/candrv

Timestamp:

05/09/09 13:48:12 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/candrv

Files:

• CandrvLinkDef.h (modified) (1 diff)
• Makefile (modified) (1 diff)
• canopen.h (modified) (2 diffs)
• ethernet.cc (modified) (5 diffs)
• ethernet.h (modified) (2 diffs)

trunk/MagicSoft/Cosy/candrv/CandrvLinkDef.h

@@ -5 +5 @@
 #pragma link off all functions;
 
-#pragma link C++ class VmodIcan+;
 #pragma link C++ class CanOpen+;
 #pragma link C++ class Network+;
-#pragma link C++ class Ethernet+;
-//#pragma link C++ class Interface+;
 
 #pragma link C++ class NodeDrv+;

trunk/MagicSoft/Cosy/candrv/Makefile

@@ -17 +17 @@
 
 SRCFILES = nodedrv.cc \
-           vmodican.cc \
            sdolist.cc \
            canopen.cc \

trunk/MagicSoft/Cosy/candrv/canopen.h

@@ -4 +4 @@
 #ifndef ROOT_TCondition
 #include <TCondition.h>
+#endif
+
+#ifdef __CINT__
+typedef Byte_t   BYTE_t;
+typedef UShort_t WORD_t;
+typedef Short_t  WORDS_t;
+typedef UInt_t   LWORD_t;
+typedef Int_t    LWORDS_t;
+struct Message;
+struct FastMessage;
+#else
+#include "gendef.h"
+#include "dpm.h"
 #endif
 
@@ -12 +25 @@
 #ifndef COSY_MTimeout
 #include "MTimeout.h"
-#endif
-
-#ifdef __CINT__
-typedef UInt_t LWORD_t;
-typedef Short_t WORDS_t;
 #endif
 

trunk/MagicSoft/Cosy/candrv/ethernet.cc

@@ -37 +37 @@
 #include <TSocket.h>
 
-ClassImp(Ethernet);
+//ClassImp(Ethernet);
 
 #undef DEBUG
@@ -56 +56 @@
 //
 Ethernet::Ethernet(const char *addr, const int tx, const int rx, CanOpen *receiver)
-    : MTcpIpI(rx),/* MTcpIpO(addr, tx),*/ Interface(receiver), fTxAddress(addr), fTxPort(tx)
+    : MTcpIpI(rx), /*MTcpIpO(addr, tx),*/ Interface(receiver), fTxAddress(addr), fTxPort(tx)
 {
     gLog << inf2 << "- Ethernet initialized." << endl;
@@ -68 +68 @@
 Ethernet::~Ethernet()
 {
-    CancelThread();
+    MTcpIpI::CancelThread();
     gLog << inf2 << "- Ethernet stopped." << endl;
 }
@@ -85 +85 @@
     const TString address = MTcpIpO::GetSocketAddress(rx);
 
-    while (!IsThreadCanceled())
+    while (!MTcpIpI::IsThreadCanceled())
     {
         unsigned char c;
@@ -281 +281 @@
 #endif
     MTcpIpO::SendFrame(fTxAddress, fTxPort, (char*)(msg.data+1), msg.len-1);
+//    Send((char*)(msg.data+1), msg.len-1);
 #ifdef DEBUG
     st.Print();

trunk/MagicSoft/Cosy/candrv/ethernet.h

@@ -20 +20 @@
 
     // Start/stop communication inherited from Interface
-    void Start() { RunThread(); }
-    void Stop()  { CancelThread(); }
+    void Start() { MTcpIpI::RunThread(); }
+    void Stop()  { MTcpIpI::CancelThread(); }
 
-    Bool_t HasConnection() const { return IsConnectionEstablished(); }
+    Bool_t HasConnection() const { return MTcpIpI::IsConnectionEstablished(); }
 
 public:
@@ -32 +32 @@
     void SendCanFrame(WORD_t cobid, BYTE_t m[8], BYTE_t rtr=0);
 
-    ClassDef(Ethernet, 0) // hardware interface to the vmodican can module (Janz)
+//    ClassDef(Ethernet, 0) // hardware interface to the vmodican can module (Janz)
 };