diff --git a/master/domain.c b/master/domain.c index 0fed456eb3cadd95851a465ec445c0051b71e015..c17888b35e5ec37aa8bc3fc71fca53ce213d4b9d 100644 --- a/master/domain.c +++ b/master/domain.c @@ -74,7 +74,7 @@ int ec_domain_reg_field(ec_domain_t *domain, /**< Dom 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 @@ int ec_domain_reg_field(ec_domain_t *domain, /**< Dom field_reg->data_ptr = data_ptr; list_add_tail(&field_reg->list, &domain->field_regs); - return 0; } diff --git a/master/slave.c b/master/slave.c index 5ec7d69babc7935e58ffafff152b85addffd25e2..8af9c3f8cfd001429b69f797176a8700cee2edff 100644 --- a/master/slave.c +++ b/master/slave.c @@ -856,10 +856,10 @@ int ec_slave_state_change(ec_slave_t *slave, \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 --git a/master/slave.h b/master/slave.h index dfc3fc677652b13143de04f36f966f7dd7d965c3..3c6d6bf59ea4cce860712d5cc2b9e107b5d3e9af 100644 --- a/master/slave.h +++ b/master/slave.h @@ -251,7 +251,8 @@ int ec_slave_sii_read16(ec_slave_t *, uint16_t, uint16_t *); 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 *);