Changeset 10031 for trunk/Cosy/candrv

Timestamp:

10/21/10 16:16:52 (14 years ago)

Author:

tbretz

Message:

Changed connection from SPS to a client-only connection.

Location:

trunk/Cosy/candrv

Files:

• ethernet.cc (modified) (4 diffs)
• ethernet.h (modified) (1 diff)

trunk/Cosy/candrv/ethernet.cc

@@ -55 +55 @@
 //  and switch the can bus communication on
 //
-Ethernet::Ethernet(const char *addr, const int tx, const int rx, CanOpen *receiver)
-    : MTcpIpI(rx), /*MTcpIpO(addr, tx),*/ Interface(receiver), fTxAddress(addr), fTxPort(tx)
+Ethernet::Ethernet(const char *addr, const int tx, CanOpen *receiver)
+    : MTcpIpOI(addr, tx), Interface(receiver)
 {
     gLog << inf2 << "- Ethernet initialized." << endl;
@@ -68 +68 @@
 Ethernet::~Ethernet()
 {
-    MTcpIpI::CancelThread();
+    CancelThread();
     gLog << inf2 << "- Ethernet stopped." << endl;
 }
@@ -79 +79 @@
 
     Message msg;
+    msg.len = 0;
     msg.cmd = M_BCAN_RX_ind;
     msg.data[0] = 0;
     msg.data[1] = 0;
 
-    const TString address = MTcpIpO::GetSocketAddress(rx);
-
-    while (!MTcpIpI::IsThreadCanceled())
+    const TString address = GetSocketAddress(rx);
+
+    while (!IsThreadCanceled())
     {
         unsigned char c;
@@ -280 +281 @@
     st.Start();
 #endif
-    MTcpIpO::SendFrame(fTxAddress, fTxPort, (char*)(msg.data+1), msg.len-1);
-//    Send((char*)(msg.data+1), msg.len-1);
+
+    Send((char*)(msg.data+1), msg.len-1);
+
 #ifdef DEBUG
     st.Print();
 #endif
-    //Send((char*)(msg.data+1), msg.len-1);
-
-    /*
-    const WORD_t desc = MsgDescr(cobid, 8, rtr);
-
-    Message msg;
-
-    msg.cmd = M_BCAN_TX_req;
-
-    msg.len = 12;
-    msg.data[0]  = 0;
-    msg.data[1]  = 0;
-    msg.data[2]  = word_to_msb(desc);
-    msg.data[3]  = word_to_lsb(desc);
-
-    memcpy(&msg.data[4], m, 8);
-
-    while (!Send(&msg));*/
-}
+}

trunk/Cosy/candrv/ethernet.h

@@ -10 +10 @@
 #endif
 
-class Ethernet : public MTcpIpI, /*public MTcpIpO,*/ public Interface
+class Ethernet : public MTcpIpOI, public Interface
 {
 private:
-    TString fTxAddress;
-    Int_t   fTxPort;
-
     // Send interface based on MTcpIpI
     Bool_t ReadSocket(TSocket &rx);
 
     // Start/stop communication inherited from Interface
-    void Start() { MTcpIpI::RunThread(); }
-    void Stop()  { MTcpIpI::CancelThread(); }
-
-    Bool_t HasConnection() const { return MTcpIpI::IsConnectionEstablished(); }
+    void Start() { if (!IsThreadRunning()) RunThread(); }
+    void Stop()  { CancelThread(); }
 
 public:
-    Ethernet(const char *addr, const int tx, const int rx, CanOpen *receiver);
+    Ethernet(const char *addr, const int tx, CanOpen *receiver);
     virtual ~Ethernet();