From 202b5294cf1a4a81b152fb6cb9ab9e63722a9798 Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Tue, 9 Jan 2007 13:57:34 +0000
Subject: [PATCH] Removed slave.configured flag.
---
master/fsm.c | 17 ++++-------------
master/slave.c | 1 -
master/slave.h | 1 -
3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/master/fsm.c b/master/fsm.c
index 423e36c5..9d8e5c98 100644
--- a/master/fsm.c
+++ b/master/fsm.c
@@ -325,20 +325,13 @@ void ec_fsm_master_action_process_states(ec_fsm_t *fsm
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 @@ void ec_fsm_slaveconf_state_init(ec_fsm_t *fsm /**< finite state machine */)
return;
}
- slave->configured = 1;
-
if (master->debug_level) {
EC_DBG("Slave %i is now in INIT.\n", slave->ring_position);
}
diff --git a/master/slave.c b/master/slave.c
index cca6e6af..d23cdebf 100644
--- a/master/slave.c
+++ b/master/slave.c
@@ -112,7 +112,6 @@ int ec_slave_init(ec_slave_t *slave, /**< EtherCAT slave */
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 --git a/master/slave.h b/master/slave.h
index d61015e7..aabdd0d5 100644
--- a/master/slave.h
+++ b/master/slave.h
@@ -197,7 +197,6 @@ struct ec_slave
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. */
--
GitLab