From 2b7d509da5b62d5e341b9c3ba5cdd6cd61438029 Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Tue, 17 Oct 2006 14:10:29 +0000
Subject: [PATCH] Renamed EC_ACK to EC_SLAVE_STATE_ACK_ERR
---
master/fsm.c | 4 ++--
master/slave.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/master/fsm.c b/master/fsm.c
index 861ea408..1b6da74c 100644
--- a/master/fsm.c
+++ b/master/fsm.c
@@ -1040,7 +1040,7 @@ void ec_fsm_slavescan_state(ec_fsm_t *fsm /**< finite state machine */)
}
slave->current_state = EC_READ_U8(datagram->data);
- if (slave->current_state & EC_ACK) {
+ if (slave->current_state & EC_SLAVE_STATE_ACK_ERR) {
EC_WARN("Slave %i has state error bit set (0x%02X)!\n",
slave->ring_position, slave->current_state);
slave->current_state &= 0x0F;
@@ -1881,7 +1881,7 @@ void ec_fsm_change_status(ec_fsm_t *fsm /**< finite state machine */)
return;
}
- if (slave->current_state & 0x10) {
+ if (slave->current_state & EC_SLAVE_STATE_ACK_ERR) {
// state change error
fsm->change_new = slave->current_state & 0x0F;
EC_ERR("Failed to set state 0x%02X - Slave %i refused state change"
diff --git a/master/slave.h b/master/slave.h
index e5403e3e..60d73c52 100644
--- a/master/slave.h
+++ b/master/slave.h
@@ -67,8 +67,8 @@ typedef enum
/**< SAVEOP (mailbox communication and input update) */
EC_SLAVE_STATE_OP = 0x08,
/**< OP (mailbox communication and input/output update) */
- EC_ACK = 0x10
- /**< Acknoledge bit (no state) */
+ EC_SLAVE_STATE_ACK_ERR = 0x10
+ /**< Acknoledge/Error bit (no actual state) */
}
ec_slave_state_t;
--
GitLab