# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1168351054 0
# Node ID d778acff9592a4fbd2766179d1434eb95fbe35bf
# Parent  54787e1b57d416717f8d9c9096c02af9b67a2260
Removed slave.configured flag.

diff -r 54787e1b57d4 -r d778acff9592 master/fsm.c
--- a/master/fsm.c	Tue Jan 09 13:42:38 2007 +0000
+++ b/master/fsm.c	Tue Jan 09 13:57:34 2007 +0000
@@ -325,20 +325,13 @@
         if (slave->error_flag
             || !slave->online
             || slave->requested_state == EC_SLAVE_STATE_UNKNOWN
-            || (slave->current_state == slave->requested_state
-                && slave->configured)) continue;
+            || slave->current_state == slave->requested_state) continue;
 
         if (master->debug_level) {
             ec_state_string(slave->current_state, old_state);
-            if (slave->current_state != slave->requested_state) {
-                ec_state_string(slave->requested_state, new_state);
-                EC_DBG("Changing state of slave %i (%s -> %s).\n",
-                       slave->ring_position, old_state, new_state);
-            }
-            else if (!slave->configured) {
-                EC_DBG("Reconfiguring slave %i (%s).\n",
-                       slave->ring_position, old_state);
-            }
+            ec_state_string(slave->requested_state, new_state);
+            EC_DBG("Changing state of slave %i (%s -> %s).\n",
+                   slave->ring_position, old_state, new_state);
         }
 
         fsm->master_state = ec_fsm_master_configure_slave;
@@ -1315,8 +1308,6 @@
         return;
     }
 
-    slave->configured = 1;
-
     if (master->debug_level) {
         EC_DBG("Slave %i is now in INIT.\n", slave->ring_position);
     }
diff -r 54787e1b57d4 -r d778acff9592 master/slave.c
--- a/master/slave.c	Tue Jan 09 13:42:38 2007 +0000
+++ b/master/slave.c	Tue Jan 09 13:57:34 2007 +0000
@@ -112,7 +112,6 @@
 
     slave->requested_state = EC_SLAVE_STATE_UNKNOWN;
     slave->current_state = EC_SLAVE_STATE_UNKNOWN;
-    slave->configured = 0;
     slave->error_flag = 0;
     slave->online = 1;
     slave->fmmu_count = 0;
diff -r 54787e1b57d4 -r d778acff9592 master/slave.h
--- a/master/slave.h	Tue Jan 09 13:42:38 2007 +0000
+++ b/master/slave.h	Tue Jan 09 13:57:34 2007 +0000
@@ -197,7 +197,6 @@
 
     ec_slave_state_t requested_state; /**< requested slave state */
     ec_slave_state_t current_state; /**< current slave state */
-    unsigned int configured; /**< the slave was configured by this master */
     unsigned int error_flag; /**< stop processing after an error */
     unsigned int online; /**< non-zero, if the slave responds. */