Changeset 1140 for trunk/MagicSoft/Cosy/devdrv

Timestamp:

12/21/01 12:36:22 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/devdrv

Files:

• macs.cc (modified) (3 diffs)
• macs.h (modified) (1 diff)
• shaftencoder.cc (modified) (4 diffs)
• shaftencoder.h (modified) (2 diffs)

trunk/MagicSoft/Cosy/devdrv/macs.cc

@@ -24 +24 @@
 }
 
-void Macs::HandleSDO(WORD_t idx, BYTE_t subidx, LWORD_t val, struct timeval *tv)
+void Macs::HandleSDO(WORD_t idx, BYTE_t subidx, LWORD_t val, timeval_t *tv)
 {
     switch (idx)
@@ -325 +325 @@
 }
 
-void Macs::HandlePDO1(BYTE_t *data, struct timeval *tv)
+void Macs::HandlePDO1(BYTE_t *data, timeval_t *tv)
 {
     fPdoPos    = (data[4]<<24) | (data[5]<<16) | (data[6]<<8) | data[7];
@@ -335 +335 @@
 }
 
-void Macs::HandlePDO2(BYTE_t *data, struct timeval *tv)
+void Macs::HandlePDO2(BYTE_t *data, timeval_t *tv)
 {
     LWORDS_t errnum = (data[0]<<24) | (data[1]<<16) | (data[2]<<8) | data[3];

trunk/MagicSoft/Cosy/devdrv/macs.h

@@ -46 +46 @@
     void StopDevice();
 
-    void HandleSDO(WORD_t idx, BYTE_t subidx, LWORD_t val, struct timeval *tv);
+    void HandleSDO(WORD_t idx, BYTE_t subidx, LWORD_t val, timeval_t *tv);
     void HandleSDOOK(WORD_t idx, BYTE_t subidx);
     void HandleSDOError(LWORD_t data)           { NodeDrv::HandleSDOError(data); }
 
-    void HandlePDO1(BYTE_t *data, struct timeval *tv);
-    void HandlePDO2(BYTE_t *data, struct timeval *tv);
+    void HandlePDO1(BYTE_t *data, timeval_t *tv);
+    void HandlePDO2(BYTE_t *data, timeval_t *tv);
 
     void SendMsg(BYTE_t data[6]);

trunk/MagicSoft/Cosy/devdrv/shaftencoder.cc

@@ -24 +24 @@
 }
 
-void ShaftEncoder::HandleSDO(WORD_t idx, BYTE_t subidx, LWORD_t val, struct timeval *tv)
+void ShaftEncoder::HandleSDO(WORD_t idx, BYTE_t subidx, LWORD_t val, timeval_t *tv)
 {
     switch (idx)
@@ -115 +115 @@
 }
 
-void ShaftEncoder::HandlePDOType0(BYTE_t *data, struct timeval *tv)
+void ShaftEncoder::HandlePDOType0(BYTE_t *data, timeval_t *tv)
 {
     //
@@ -129 +129 @@
 }
 
-void ShaftEncoder::HandlePDOType1(BYTE_t *data, struct timeval *tv)
+void ShaftEncoder::HandlePDOType1(BYTE_t *data, timeval_t *tv)
 {
     //
@@ -147 +147 @@
 }
 
-void ShaftEncoder::HandlePDOType2(BYTE_t *data, struct timeval *tv)
+void ShaftEncoder::HandlePDOType2(BYTE_t *data, timeval_t *tv)
 {
     //

trunk/MagicSoft/Cosy/devdrv/shaftencoder.h

@@ -26 +26 @@
     Timer fTime;
 
-    void HandlePDOType0(BYTE_t *data, struct timeval *tv);
-    void HandlePDOType1(BYTE_t *data, struct timeval *tv);
-    void HandlePDOType2(BYTE_t *data, struct timeval *tv);
+    void HandlePDOType0(BYTE_t *data, timeval_t *tv);
+    void HandlePDOType1(BYTE_t *data, timeval_t *tv);
+    void HandlePDOType2(BYTE_t *data, timeval_t *tv);
 
     void ReqPos();
@@ -43 +43 @@
     void SetDisplay(TGLabel **label) { fLabel = label; }
 
-    void HandleSDO(WORD_t idx, BYTE_t subidx, LWORD_t val, struct timeval *tv);
+    void HandleSDO(WORD_t idx, BYTE_t subidx, LWORD_t val, timeval_t *tv);
     void HandleSDOOK(WORD_t idx, BYTE_t subidx) { NodeDrv::HandleSDOOK(idx, subidx); }
     void HandleSDOError(LWORD_t data)           { NodeDrv::HandleSDOError(data); }
 
-    void HandlePDO1(BYTE_t *data, struct timeval *tv) { HandlePDOType2(data, tv); }
-    void HandlePDO2(BYTE_t *data, struct timeval *tv) { HandlePDOType2(data, tv); }
+    void HandlePDO1(BYTE_t *data, timeval_t *tv) { HandlePDOType2(data, tv); }
+    void HandlePDO2(BYTE_t *data, timeval_t *tv) { HandlePDOType2(data, tv); }
 
     LWORDS_t GetPos() { return fPos+fTurn*fTicks; }