Renamed slave_set_fmmu() to slave_prepare_fmmu().
authorFlorian Pose <fp@igh-essen.com>
Wed, 05 Apr 2006 11:44:41 +0000
changeset 160 7ddf8367196a
parent 159 acb250c92896
child 161 ddb7266d1c56
Renamed slave_set_fmmu() to slave_prepare_fmmu().
master/domain.c
master/slave.c
master/slave.h
--- 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;
 }
 
--- 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;
 
--- 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 *);