# HG changeset patch # User Florian Pose # Date 1144237481 0 # Node ID 7ddf8367196a4d3d35986b7c0473438833385cd5 # Parent acb250c92896b94bee226bdb0ba48e7a65ddd416 Renamed slave_set_fmmu() to slave_prepare_fmmu(). diff -r acb250c92896 -r 7ddf8367196a master/domain.c --- a/master/domain.c Wed Apr 05 09:53:55 2006 +0000 +++ b/master/domain.c Wed Apr 05 11:44:41 2006 +0000 @@ -74,7 +74,7 @@ return -1; } - if (ec_slave_set_fmmu(slave, domain, sync)) { + if (ec_slave_prepare_fmmu(slave, domain, sync)) { EC_ERR("FMMU configuration failed.\n"); kfree(field_reg); return -1; @@ -86,7 +86,6 @@ field_reg->data_ptr = data_ptr; list_add_tail(&field_reg->list, &domain->field_regs); - return 0; } diff -r acb250c92896 -r 7ddf8367196a master/slave.c --- a/master/slave.c Wed Apr 05 09:53:55 2006 +0000 +++ b/master/slave.c Wed Apr 05 11:44:41 2006 +0000 @@ -856,10 +856,10 @@ \return 0 bei Erfolg, sonst < 0 */ -int ec_slave_set_fmmu(ec_slave_t *slave, /**< EtherCAT-Slave */ - const ec_domain_t *domain, /**< Domäne */ - const ec_sync_t *sync /**< Sync-Manager */ - ) +int ec_slave_prepare_fmmu(ec_slave_t *slave, /**< EtherCAT-Slave */ + const ec_domain_t *domain, /**< Domäne */ + const ec_sync_t *sync /**< Sync-Manager */ + ) { unsigned int i; diff -r acb250c92896 -r 7ddf8367196a master/slave.h --- a/master/slave.h Wed Apr 05 09:53:55 2006 +0000 +++ b/master/slave.h Wed Apr 05 11:44:41 2006 +0000 @@ -251,7 +251,8 @@ int ec_slave_sii_read32(ec_slave_t *, uint16_t, uint32_t *); int ec_slave_sii_write16(ec_slave_t *, uint16_t, uint16_t); int ec_slave_state_change(ec_slave_t *, uint8_t); -int ec_slave_set_fmmu(ec_slave_t *, const ec_domain_t *, const ec_sync_t *); +int ec_slave_prepare_fmmu(ec_slave_t *, const ec_domain_t *, + const ec_sync_t *); // CANopen over EtherCAT int ec_slave_fetch_sdo_list(ec_slave_t *);