From 27ecf7ad96854808893e68db937b586cd2db1976 Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh.de>
Date: Fri, 5 Mar 2010 18:02:13 +0100
Subject: [PATCH] Added ec_soe_request_copy() method.

---
 master/soe_request.c | 33 +++++++++++++--------------------
 master/soe_request.h |  6 +-----
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/master/soe_request.c b/master/soe_request.c
index 00e39d78..57fc5bbb 100644
--- a/master/soe_request.c
+++ b/master/soe_request.c
@@ -61,7 +61,6 @@ void ec_soe_request_init(
     req->data_size = 0;
     req->dir = EC_DIR_INVALID;
     req->state = EC_INT_REQUEST_INIT;
-    //req->jiffies_start = 0U;
     req->jiffies_sent = 0U;
     req->error_code = 0x0000;
 }
@@ -79,6 +78,19 @@ void ec_soe_request_clear(
 
 /*****************************************************************************/
 
+/** Copy another SoE request.
+ */
+int ec_soe_request_copy(
+        ec_soe_request_t *req, /**< SoE request. */
+        const ec_soe_request_t *other /**< Other SoE request to copy from. */
+        )
+{
+    req->idn = other->idn;
+    return ec_soe_request_copy_data(req, other->data, other->data_size);
+}
+
+/*****************************************************************************/
+
 /** Set IDN.
  */
 void ec_soe_request_set_idn(
@@ -89,25 +101,6 @@ void ec_soe_request_set_idn(
     req->idn = idn;
 }
 
-#if 0
-/*****************************************************************************/
-
-/** Copy another SoE request.
- *
- * \attention Only the index subindex and data are copied.
- */
-int ec_soe_request_copy(
-        ec_soe_request_t *req, /**< SoE request. */
-        const ec_soe_request_t *other /**< Other SoE request to copy from. */
-        )
-{
-    req->complete_access = other->complete_access;
-    req->index = other->index;
-    req->subindex = other->subindex;
-    return ec_soe_request_copy_data(req, other->data, other->data_size);
-}
-#endif
-
 /*****************************************************************************/
 
 /** Free allocated memory.
diff --git a/master/soe_request.h b/master/soe_request.h
index 6b924dad..932b2bcf 100644
--- a/master/soe_request.h
+++ b/master/soe_request.h
@@ -64,17 +64,13 @@ typedef struct {
 void ec_soe_request_init(ec_soe_request_t *);
 void ec_soe_request_clear(ec_soe_request_t *);
 
+int ec_soe_request_copy(ec_soe_request_t *, const ec_soe_request_t *);
 void ec_soe_request_set_idn(ec_soe_request_t *, uint16_t);
 int ec_soe_request_alloc(ec_soe_request_t *, size_t);
 int ec_soe_request_copy_data(ec_soe_request_t *, const uint8_t *, size_t);
 void ec_soe_request_read(ec_soe_request_t *);
 void ec_soe_request_write(ec_soe_request_t *);
 
-#if 0
-int ec_soe_request_copy(ec_soe_request_t *, const ec_soe_request_t *);
-int ec_soe_request_timed_out(const ec_soe_request_t *);
-#endif
-
 /*****************************************************************************/
 
 #endif