--- a/master/fsm.h	Mon May 29 09:54:18 2006 +0000
+++ b/master/fsm.h	Mon Jun 26 15:04:06 2006 +0000
@@ -67,17 +67,11 @@
     unsigned int master_validation; /**< non-zero, if validation to do */
 
     void (*slave_state)(ec_fsm_t *); /**< slave state function */
-    uint8_t slave_sii_num; /**< SII value iteration counter */
-    uint8_t *slave_cat_data; /**< temporary memory for category data */
-    uint16_t slave_cat_offset; /**< current category word offset in EEPROM */
-    uint16_t slave_cat_data_offset; /**< current offset in category data */
-    uint16_t slave_cat_type; /**< type of current category */
-    uint16_t slave_cat_words; /**< number of words of current category */
 
     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) */
-    uint32_t sii_result; /**< output: read SII value (32bit) */
+    uint8_t sii_value[4]; /**< raw SII value (32bit) */
     cycles_t sii_start; /**< sii start */
 
     void (*change_state)(ec_fsm_t *); /**< slave state change state function */