--- a/master/slave_config.h	Thu Sep 06 14:21:02 2012 +0200
+++ b/master/slave_config.h	Mon Nov 03 15:20:05 2014 +0100
@@ -2,7 +2,7 @@
  *
  *  $Id$
  *
- *  Copyright (C) 2006-2008  Florian Pose, Ingenieurgemeinschaft IgH
+ *  Copyright (C) 2006-2012  Florian Pose, Ingenieurgemeinschaft IgH
  *
  *  This file is part of the IgH EtherCAT Master.
  *
@@ -43,6 +43,7 @@
 #include "slave.h"
 #include "sync_config.h"
 #include "fmmu_config.h"
+#include "coe_emerg_ring.h"
 
 /*****************************************************************************/
 
@@ -97,6 +98,8 @@
  * and ALIAS and POSITION identify the configuration.
  *
  * \param sc EtherCAT slave configuration
+ * \param level Debug level. Master's debug level must be >= \a level for
+ * output.
  * \param fmt format string (like in printf())
  * \param args arguments (optional)
  */
@@ -126,8 +129,7 @@
                                  intervals (see spec. reg. 0x0400). */
     uint16_t watchdog_intervals; /**< Process data watchdog intervals (see
                                    spec. reg. 0x0420). */
-    uint8_t allow_overlapping_pdos;	/**< Allow input PDOs use the same frame space
-                                      as output PDOs. */
+
     ec_slave_t *slave; /**< Slave pointer. This is \a NULL, if the slave is
                          offline. */
 
@@ -141,7 +143,10 @@
     struct list_head sdo_configs; /**< List of SDO configurations. */
     struct list_head sdo_requests; /**< List of SDO requests. */
     struct list_head voe_handlers; /**< List of VoE handlers. */
+    struct list_head reg_requests; /**< List of register requests. */
     struct list_head soe_configs; /**< List of SoE configurations. */
+
+    ec_coe_emerg_ring_t emerg_ring; /**< CoE emergency ring buffer. */
 };
 
 /*****************************************************************************/
@@ -163,6 +168,8 @@
         const ec_slave_config_t *, unsigned int);
 ec_sdo_request_t *ec_slave_config_find_sdo_request(ec_slave_config_t *,
         unsigned int);
+ec_reg_request_t *ec_slave_config_find_reg_request(ec_slave_config_t *,
+        unsigned int);
 ec_voe_handler_t *ec_slave_config_find_voe_handler(ec_slave_config_t *,
         unsigned int);
 
@@ -170,6 +177,8 @@
         ec_slave_config_t *, uint16_t, uint8_t, size_t);
 ec_voe_handler_t *ecrt_slave_config_create_voe_handler_err(
         ec_slave_config_t *, size_t);
+ec_reg_request_t *ecrt_slave_config_create_reg_request_err(
+        ec_slave_config_t *, size_t);
 
 /*****************************************************************************/