# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1354622355 -3600
# Node ID 611e4d745dcd4f6d15d040a4af0ca13399e5b9fb
# Parent  8c7e674aa5d61f509e985f0bd17ab8768e3ff4f1
Minor: Renamed slave_sdo_requests.

diff -r 8c7e674aa5d6 -r 611e4d745dcd master/fsm_slave.c
--- a/master/fsm_slave.c	Tue Dec 04 12:23:43 2012 +0100
+++ b/master/fsm_slave.c	Tue Dec 04 12:59:15 2012 +0100
@@ -183,8 +183,7 @@
     ec_master_sdo_request_t *request, *next;
 
     // search the first external request to be processed
-    list_for_each_entry_safe(request, next,
-            &slave->slave_sdo_requests, list) {
+    list_for_each_entry_safe(request, next, &slave->sdo_requests, list) {
 
         list_del_init(&request->list); // dequeue
         if (slave->current_state & EC_SLAVE_STATE_ACK_ERR) {
diff -r 8c7e674aa5d6 -r 611e4d745dcd master/master.c
--- a/master/master.c	Tue Dec 04 12:23:43 2012 +0100
+++ b/master/master.c	Tue Dec 04 12:59:15 2012 +0100
@@ -2702,7 +2702,7 @@
     EC_SLAVE_DBG(request.slave, 1, "Schedule SDO download request.\n");
 
     // schedule request.
-    list_add_tail(&request.list, &request.slave->slave_sdo_requests);
+    list_add_tail(&request.list, &request.slave->sdo_requests);
 
     up(&master->master_sem);
 
@@ -2783,7 +2783,7 @@
             " (complete access).\n");
 
     // schedule request.
-    list_add_tail(&request.list, &request.slave->slave_sdo_requests);
+    list_add_tail(&request.list, &request.slave->sdo_requests);
 
     up(&master->master_sem);
 
@@ -2854,7 +2854,7 @@
     EC_SLAVE_DBG(request.slave, 1, "Schedule SDO upload request.\n");
 
     // schedule request.
-    list_add_tail(&request.list, &request.slave->slave_sdo_requests);
+    list_add_tail(&request.list, &request.slave->sdo_requests);
 
     up(&master->master_sem);
 
diff -r 8c7e674aa5d6 -r 611e4d745dcd master/slave.c
--- a/master/slave.c	Tue Dec 04 12:23:43 2012 +0100
+++ b/master/slave.c	Tue Dec 04 12:59:15 2012 +0100
@@ -152,7 +152,7 @@
     slave->sdo_dictionary_fetched = 0;
     slave->jiffies_preop = 0;
 
-    INIT_LIST_HEAD(&slave->slave_sdo_requests);
+    INIT_LIST_HEAD(&slave->sdo_requests);
     init_waitqueue_head(&slave->sdo_queue);
 
     INIT_LIST_HEAD(&slave->reg_requests);
@@ -194,9 +194,9 @@
 
     // abort all pending requests
 
-    while (!list_empty(&slave->slave_sdo_requests)) {
+    while (!list_empty(&slave->sdo_requests)) {
         ec_master_sdo_request_t *request =
-            list_entry(slave->slave_sdo_requests.next,
+            list_entry(slave->sdo_requests.next,
                 ec_master_sdo_request_t, list);
         list_del_init(&request->list); // dequeue
         EC_SLAVE_WARN(slave, "Discarding SDO request,"
diff -r 8c7e674aa5d6 -r 611e4d745dcd master/slave.h
--- a/master/slave.h	Tue Dec 04 12:23:43 2012 +0100
+++ b/master/slave.h	Tue Dec 04 12:59:15 2012 +0100
@@ -224,7 +224,7 @@
     uint8_t sdo_dictionary_fetched; /**< Dictionary has been fetched. */
     unsigned long jiffies_preop; /**< Time, the slave went to PREOP. */
 
-    struct list_head slave_sdo_requests; /**< SDO access requests. */
+    struct list_head sdo_requests; /**< SDO access requests. */
     wait_queue_head_t sdo_queue; /**< Wait queue for SDO access requests
                                    from user space. */
     struct list_head reg_requests; /**< Register access requests. */