# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1324049500 -3600
# Node ID 6122e722133df7a39c709fad51b5ca5faa2800d9
# Parent  3afde1f58e1a87809ab45a3c3519e28e3ba04481# Parent  37a25c76987b2406d194553edc718f45e1430441
merge

diff -r 3afde1f58e1a -r 6122e722133d master/fsm_change.c
--- a/master/fsm_change.c	Fri Dec 16 16:29:00 2011 +0100
+++ b/master/fsm_change.c	Fri Dec 16 16:31:40 2011 +0100
@@ -49,8 +49,8 @@
 void ec_fsm_change_state_start(ec_fsm_change_t *);
 void ec_fsm_change_state_check(ec_fsm_change_t *);
 void ec_fsm_change_state_status(ec_fsm_change_t *);
+void ec_fsm_change_state_start_code(ec_fsm_change_t *);
 void ec_fsm_change_state_code(ec_fsm_change_t *);
-void ec_fsm_change_state_start_ack(ec_fsm_change_t *);
 void ec_fsm_change_state_ack(ec_fsm_change_t *);
 void ec_fsm_change_state_check_ack(ec_fsm_change_t *);
 void ec_fsm_change_state_end(ec_fsm_change_t *);
@@ -111,7 +111,7 @@
     fsm->mode = EC_FSM_CHANGE_MODE_ACK_ONLY;
     fsm->slave = slave;
     fsm->requested_state = EC_SLAVE_STATE_UNKNOWN;
-    fsm->state = ec_fsm_change_state_start_ack;
+    fsm->state = ec_fsm_change_state_start_code;
 }
 
 /*****************************************************************************/
@@ -295,11 +295,8 @@
 
         EC_SLAVE_ERR(slave, "Failed to set %s state, slave refused state"
                 " change (%s).\n", req_state, cur_state);
-        // fetch AL status error code
-        ec_datagram_fprd(datagram, slave->station_address, 0x0134, 2);
-        ec_datagram_zero(datagram);
-        fsm->retries = EC_FSM_RETRIES;
-        fsm->state = ec_fsm_change_state_code;
+
+        ec_fsm_change_state_start_code(fsm);
         return;
     }
 
@@ -324,6 +321,24 @@
 
 /*****************************************************************************/
 
+/** Enter reading AL status code.
+ */
+void ec_fsm_change_state_start_code(
+        ec_fsm_change_t *fsm /**< finite state machine */
+        )
+{
+    ec_slave_t *slave = fsm->slave;
+    ec_datagram_t *datagram = fsm->datagram;
+
+    // fetch AL status error code
+    ec_datagram_fprd(datagram, slave->station_address, 0x0134, 2);
+    ec_datagram_zero(datagram);
+    fsm->retries = EC_FSM_RETRIES;
+    fsm->state = ec_fsm_change_state_code;
+}
+
+/*****************************************************************************/
+
 /**
    Application layer status messages.
 */
@@ -424,23 +439,8 @@
     }
 
     // acknowledge "old" slave state
-    ec_fsm_change_state_start_ack(fsm); // execute immediately
-}
-
-/*****************************************************************************/
-
-/**
-   Change state: START ACK.
-*/
-
-void ec_fsm_change_state_start_ack(ec_fsm_change_t *fsm
-                                   /**< finite state machine */)
-{
-    ec_slave_t *slave = fsm->slave;
-    ec_datagram_t *datagram = fsm->datagram;
-
-    ec_datagram_fpwr(datagram, slave->station_address, 0x0120, 2);
-    EC_WRITE_U16(datagram->data, slave->current_state);
+    ec_datagram_fpwr(datagram, fsm->slave->station_address, 0x0120, 2);
+    EC_WRITE_U16(datagram->data, fsm->slave->current_state);
     fsm->retries = EC_FSM_RETRIES;
     fsm->state = ec_fsm_change_state_ack;
 }