--- a/master/slave_config.h	Tue Jun 24 10:55:40 2008 +0000
+++ b/master/slave_config.h	Thu Jun 26 13:16:15 2008 +0000
@@ -47,8 +47,8 @@
 
 #include "globals.h"
 #include "slave.h"
+#include "sync_config.h"
 #include "fmmu_config.h"
-#include "pdo_list.h"
 
 /*****************************************************************************/
 
@@ -67,13 +67,14 @@
     ec_slave_t *slave; /**< Slave pointer. This is \a NULL, if the slave is
                          offline. */
 
-    ec_pdo_list_t pdos[2]; /**< Output and input Pdo assignment / mapping. */
+    ec_sync_config_t sync_configs[EC_MAX_SYNCS]; /**< Sync manager
+                                                   configurations. */
+    ec_fmmu_config_t fmmu_configs[EC_MAX_FMMUS]; /**< FMMU configurations. */
+    uint8_t used_fmmus; /**< Number of FMMUs used. */
 
     struct list_head sdo_configs; /**< List of Sdo configurations. */
     struct list_head sdo_requests; /**< List of Sdo requests. */
 
-    ec_fmmu_config_t fmmu_configs[EC_MAX_FMMUS]; /**< FMMU configurations. */
-    uint8_t used_fmmus; /**< Number of FMMUs used. */
 };
 
 /*****************************************************************************/
@@ -85,9 +86,7 @@
 int ec_slave_config_attach(ec_slave_config_t *);
 void ec_slave_config_detach(ec_slave_config_t *);
 
-void ec_slave_config_load_default_assignment(ec_slave_config_t *);
-void ec_slave_config_load_default_mapping(const ec_slave_config_t *,
-        ec_pdo_t *);
+void ec_slave_config_load_default_sync_config(ec_slave_config_t *);
 
 unsigned int ec_slave_config_sdo_count(const ec_slave_config_t *);
 const ec_sdo_request_t *ec_slave_config_get_sdo_by_pos_const(