--- a/master/fsm.h	Mon Oct 23 14:00:58 2006 +0000
+++ b/master/fsm.h	Tue Oct 24 08:00:24 2006 +0000
@@ -49,6 +49,7 @@
 
 #include "fsm_sii.h"
 #include "fsm_change.h"
+#include "fsm_coe.h"
 
 /*****************************************************************************/
 
@@ -69,19 +70,14 @@
     ec_slave_state_t master_slave_states; /**< states of responding slaves */
     unsigned int master_validation; /**< non-zero, if validation to do */
     uint16_t sii_offset; /**< current offset for SII access */
+    ec_sdo_request_t *sdo_request;
 
     void (*slave_state)(ec_fsm_t *); /**< slave state function */
+    ec_sdo_data_t *sdodata; /**< SDO configuration data */
 
     ec_fsm_sii_t fsm_sii; /**< SII state machine */
     ec_fsm_change_t fsm_change; /**< State change state machine */
-
-    void (*coe_state)(ec_fsm_t *); /**< CoE state function */
-    ec_sdo_data_t *coe_sdodata; /**< input/output: SDO data object */
-    cycles_t coe_start; /**< CoE timestamp */
-    ec_sdo_t *coe_sdo; /**< current SDO */
-    uint8_t coe_subindex; /**< current subindex */
-    ec_sdo_request_t *coe_request; /**< SDO request */
-    uint8_t coe_toggle; /**< toggle bit for segment commands */
+    ec_fsm_coe_t fsm_coe; /**< CoE state machine */
 };
 
 /*****************************************************************************/