# HG changeset patch
# User Dominik Staubli <ch1010252@ch10pc423>
# Date 1264068622 -3600
# Node ID f228415225b777b86fd87cea974c5f9ddca5c036
# Parent  e7733f8259820a2faeeb158f96232bf9f2d5701f# Parent  a93fc03eeb06dd99ccc7e828877b006a29f9b2f6
Merge

diff -r a93fc03eeb06 -r f228415225b7 master/domain.c
--- a/master/domain.c	Tue Jan 19 19:33:47 2010 +0100
+++ b/master/domain.c	Thu Jan 21 11:10:22 2010 +0100
@@ -203,6 +203,7 @@
     unsigned int datagram_count;
     unsigned int datagram_used[EC_DIR_COUNT];
     ec_fmmu_config_t *fmmu;
+    ec_fmmu_config_t *fmmu_temp;
     const ec_datagram_t *datagram;
     int ret;
 
@@ -225,15 +226,21 @@
     datagram_count = 0;
     datagram_used[EC_DIR_OUTPUT] = 0;
     datagram_used[EC_DIR_INPUT] = 0;
-
+    list_for_each_entry(fmmu_temp, &domain->fmmu_configs, list) {
+       ec_slave_config_t *sc = (ec_slave_config_t *)fmmu_temp->sc; // we have to remove the constness, sorry
+       sc->used_for_fmmu_datagram[fmmu_temp->dir] = 0;
+    }
     list_for_each_entry(fmmu, &domain->fmmu_configs, list) {
         // Correct logical FMMU address
         fmmu->logical_start_address += base_address;
 
         // Increment Input/Output counter to determine datagram types
         // and calculate expected working counters
-        datagram_used[fmmu->dir]++;
-
+        if (fmmu->sc->used_for_fmmu_datagram[fmmu->dir] == 0) {
+            ec_slave_config_t *sc = (ec_slave_config_t *)fmmu->sc;
+            datagram_used[fmmu->dir]++;
+            sc->used_for_fmmu_datagram[fmmu->dir] = 1;
+        }
         // If the current FMMU's data do not fit in the current datagram,
         // allocate a new one.
         if (datagram_size + fmmu->data_size > EC_MAX_DATA_SIZE) {
@@ -248,6 +255,10 @@
             datagram_count++;
             datagram_used[EC_DIR_OUTPUT] = 0;
             datagram_used[EC_DIR_INPUT] = 0;
+            list_for_each_entry(fmmu_temp, &domain->fmmu_configs, list) {
+                ec_slave_config_t *sc = (ec_slave_config_t *)fmmu_temp->sc;
+               sc->used_for_fmmu_datagram[fmmu_temp->dir] = 0;
+            }
         }
 
         datagram_size += fmmu->data_size;
diff -r a93fc03eeb06 -r f228415225b7 master/slave_config.c
--- a/master/slave_config.c	Tue Jan 19 19:33:47 2010 +0100
+++ b/master/slave_config.c	Thu Jan 21 11:10:22 2010 +0100
@@ -75,7 +75,8 @@
         ec_sync_config_init(&sc->sync_configs[i]);
 
     sc->used_fmmus = 0;
-
+    sc->used_for_fmmu_datagram[EC_DIR_INPUT] = 0;
+    sc->used_for_fmmu_datagram[EC_DIR_OUTPUT] = 0;
     sc->dc_assign_activate = 0x0000;
     sc->dc_sync[0].cycle_time = 0x00000000;
     sc->dc_sync[1].cycle_time = 0x00000000;
diff -r a93fc03eeb06 -r f228415225b7 master/slave_config.h
--- a/master/slave_config.h	Tue Jan 19 19:33:47 2010 +0100
+++ b/master/slave_config.h	Thu Jan 21 11:10:22 2010 +0100
@@ -70,7 +70,7 @@
                                                    configurations. */
     ec_fmmu_config_t fmmu_configs[EC_MAX_FMMUS]; /**< FMMU configurations. */
     uint8_t used_fmmus; /**< Number of FMMUs used. */
-
+    unsigned int used_for_fmmu_datagram[EC_DIR_COUNT];
     uint16_t dc_assign_activate; /**< Vendor-specific AssignActivate word. */
     ec_sync_signal_t dc_sync[EC_SYNC_SIGNAL_COUNT]; /**< DC sync signals. */