diff -r bc89e3fba1a5 -r 5fcbd29151d2 master/slave.h --- a/master/slave.h Tue Feb 13 13:36:31 2007 +0000 +++ b/master/slave.h Tue Feb 13 13:42:37 2007 +0000 @@ -197,7 +197,7 @@ ec_slave_state_t requested_state; /**< requested slave state */ ec_slave_state_t current_state; /**< current slave state */ - unsigned int configured; /**< the slave was configured by this master */ + unsigned int self_configured; /**< slave was configured by this master */ unsigned int error_flag; /**< stop processing after an error */ unsigned int online; /**< non-zero, if the slave responds. */ @@ -244,6 +244,7 @@ char *sii_image; /**< slave image name acc. to EEPROM */ char *sii_order; /**< slave order number acc. to EEPROM */ char *sii_name; /**< slave name acc. to EEPROM */ + int16_t sii_current_on_ebus; /**< power consumption */ ec_fmmu_t fmmus[EC_MAX_FMMUS]; /**< FMMU configurations */ uint8_t fmmu_count; /**< number of FMMUs used */ @@ -277,8 +278,10 @@ int ec_slave_locate_string(ec_slave_t *, unsigned int, char **); // misc. -uint16_t ec_slave_calc_sync_size(const ec_slave_t *, - const ec_sii_sync_t *); +void ec_slave_sync_config(const ec_slave_t *, const ec_sii_sync_t *, + uint8_t *); +void ec_slave_fmmu_config(const ec_slave_t *, const ec_fmmu_t *, uint8_t *); +uint16_t ec_slave_calc_sync_size(const ec_slave_t *, const ec_sii_sync_t *); int ec_slave_is_coupler(const ec_slave_t *); int ec_slave_has_subbus(const ec_slave_t *);