From c5a0dcc8376f602298afd5e89ff86294622df8c8 Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Wed, 5 Apr 2006 11:44:41 +0000
Subject: [PATCH] Renamed slave_set_fmmu() to slave_prepare_fmmu().
---
master/domain.c | 3 +--
master/slave.c | 8 ++++----
master/slave.h | 3 ++-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/master/domain.c b/master/domain.c
index 0fed456e..c17888b3 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 5ec7d69b..8af9c3f8 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 dfc3fc67..3c6d6bf5 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 *);
--
GitLab