--- a/master/fsm.h	Fri Oct 20 15:35:15 2006 +0000
+++ b/master/fsm.h	Mon Oct 23 12:59:42 2006 +0000
@@ -47,6 +47,8 @@
 #include "slave.h"
 #include "canopen.h"
 
+#include "fsm_sii.h"
+
 /*****************************************************************************/
 
 typedef struct ec_fsm ec_fsm_t; /**< \see ec_fsm */
@@ -65,15 +67,11 @@
     unsigned int master_slaves_responding; /**< number of responding slaves */
     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 */
 
     void (*slave_state)(ec_fsm_t *); /**< slave state function */
 
-    void (*sii_state)(ec_fsm_t *); /**< SII state function */
-    uint16_t sii_offset; /**< input: offset in SII */
-    unsigned int sii_mode; /**< SII reading done by APRD (0) or NPRD (1) */
-    uint8_t sii_value[4]; /**< raw SII value (32bit) */
-    cycles_t sii_start; /**< sii start */
-    uint8_t sii_check_once_more; /**< one more try after timeout */
+    ec_fsm_sii_t fsm_sii; /**< SII state machine */
 
     void (*change_state)(ec_fsm_t *); /**< slave state change state function */
     ec_slave_state_t change_new; /**< input: new state */