# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1164313166 0
# Node ID 178b1b43a88ccde546ab208bb0de345060c6c757
# Parent  b17c95eac6b2f690f5eef9c581ca2ecb51877426
Version 1.2.0-rc1, re-introduced ecrt_domain_queue().

diff -r b17c95eac6b2 -r 178b1b43a88c configure.ac
--- a/configure.ac	Tue Nov 21 15:46:21 2006 +0000
+++ b/configure.ac	Thu Nov 23 20:19:26 2006 +0000
@@ -3,7 +3,7 @@
 #------------------------------------------------------------------------------
 
 AC_PREREQ(2.59)
-AC_INIT([ethercat],[1.1.1],[fp@igh-essen.com])
+AC_INIT([ethercat],[1.2.0-rc1],[fp@igh-essen.com])
 AC_CONFIG_AUX_DIR([autoconf])
 AM_INIT_AUTOMAKE([-Wall -Werror dist-bzip2])
 AC_PREFIX_DEFAULT([/opt/etherlab])
diff -r b17c95eac6b2 -r 178b1b43a88c include/ecrt.h
--- a/include/ecrt.h	Tue Nov 21 15:46:21 2006 +0000
+++ b/include/ecrt.h	Thu Nov 23 20:19:26 2006 +0000
@@ -109,7 +109,6 @@
 ec_domain_t *ecrt_master_create_domain(ec_master_t *master);
 
 int ecrt_master_activate(ec_master_t *master);
-void ecrt_master_deactivate(ec_master_t *master); // deprecated!
 
 void ecrt_master_prepare(ec_master_t *master);
 
@@ -149,6 +148,7 @@
                                            void **data_ptr);
 
 void ecrt_domain_process(ec_domain_t *domain);
+void ecrt_domain_queue(ec_domain_t *domain);
 int ecrt_domain_state(const ec_domain_t *domain);
 
 /******************************************************************************
@@ -162,9 +162,6 @@
 int ecrt_slave_conf_sdo32(ec_slave_t *slave, uint16_t sdo_index,
                           uint8_t sdo_subindex, uint32_t value);
 
-int ecrt_slave_pdo_size(ec_slave_t *slave, uint16_t pdo_index,
-                        uint8_t pdo_subindex, size_t size); // deprecated
-
 /******************************************************************************
  *  Bitwise read/write macros
  *****************************************************************************/
diff -r b17c95eac6b2 -r 178b1b43a88c master/domain.c
--- a/master/domain.c	Tue Nov 21 15:46:21 2006 +0000
+++ b/master/domain.c	Thu Nov 23 20:19:26 2006 +0000
@@ -479,21 +479,6 @@
 /*****************************************************************************/
 
 /**
-   Places all process data datagrams in the masters datagram queue.
-*/
-
-void ec_domain_queue_datagrams(ec_domain_t *domain /**< EtherCAT domain */)
-{
-    ec_datagram_t *datagram;
-
-    list_for_each_entry(datagram, &domain->datagrams, list) {
-        ec_master_queue_datagram(domain->master, datagram);
-    }
-}
-
-/*****************************************************************************/
-
-/**
    Formats attribute data for SysFS reading.
    \return number of bytes to read
 */
@@ -691,8 +676,22 @@
         }
         domain->working_counter_changes = 0;
     }
-
-    ec_domain_queue_datagrams(domain);
+}
+
+/*****************************************************************************/
+
+/**
+   Places all process data datagrams in the masters datagram queue.
+   \ingroup RealtimeInterface
+*/
+
+void ecrt_domain_queue(ec_domain_t *domain /**< EtherCAT domain */)
+{
+    ec_datagram_t *datagram;
+
+    list_for_each_entry(datagram, &domain->datagrams, list) {
+        ec_master_queue_datagram(domain->master, datagram);
+    }
 }
 
 /*****************************************************************************/
@@ -716,6 +715,7 @@
 EXPORT_SYMBOL(ecrt_domain_register_pdo_list);
 EXPORT_SYMBOL(ecrt_domain_register_pdo_range);
 EXPORT_SYMBOL(ecrt_domain_process);
+EXPORT_SYMBOL(ecrt_domain_queue);
 EXPORT_SYMBOL(ecrt_domain_state);
 
 /** \endcond */