diff -r 36cd81362f10 -r 7fafc1a7451e master/sdo_request.c
--- a/master/sdo_request.c	Wed Jun 18 15:03:03 2008 +0000
+++ b/master/sdo_request.c	Thu Jun 19 07:54:45 2008 +0000
@@ -70,7 +70,8 @@
     req->mem_size = 0;
     req->data_size = 0;
     req->dir = EC_DIR_OUTPUT;
-    req->timeout = 0; // no timeout
+    req->issue_timeout = 0; // no timeout
+    req->response_timeout = 0; // immediate response required
     req->state = EC_REQUEST_INIT;
 }
 
@@ -170,8 +171,8 @@
  */
 int ec_sdo_request_timed_out(const ec_sdo_request_t *req /**< Sdo request. */)
 {
-    return req->timeout
-        && jiffies - req->start_jiffies > HZ * req->timeout / 1000;
+    return req->issue_timeout
+        && jiffies - req->jiffies_start > HZ * req->issue_timeout / 1000;
 }
 
 /*****************************************************************************
@@ -180,7 +181,7 @@
 
 void ecrt_sdo_request_timeout(ec_sdo_request_t *req, uint32_t timeout)
 {
-    req->timeout = timeout;
+    req->issue_timeout = timeout;
 }
 
 /*****************************************************************************/
@@ -210,7 +211,7 @@
 {
     req->dir = EC_DIR_INPUT;
     req->state = EC_REQUEST_QUEUED;
-    req->start_jiffies = jiffies;
+    req->jiffies_start = jiffies;
 }
 
 /*****************************************************************************/
@@ -219,7 +220,7 @@
 {
     req->dir = EC_DIR_OUTPUT;
     req->state = EC_REQUEST_QUEUED;
-    req->start_jiffies = jiffies;
+    req->jiffies_start = jiffies;
 }
 
 /*****************************************************************************/