# HG changeset patch
# User Martin Troxler <ch1010277@ch10pc446>
# Date 1291632168 -3600
# Node ID 470342b23341140c28922c0c51f837cf618ad0d6
# Parent  5da31ecf3a87b37193afa0098ef44c420409acf6
Inplace I/O bug: correct domain tx-size when tx-size of input and output fmmu is different.

diff -r 5da31ecf3a87 -r 470342b23341 master/slave_config.c
--- a/master/slave_config.c	Tue Nov 30 07:37:09 2010 +0100
+++ b/master/slave_config.c	Mon Dec 06 11:42:48 2010 +0100
@@ -166,7 +166,7 @@
     ec_fmmu_config_t *fmmu;
     ec_fmmu_config_t *prev_fmmu;
     uint32_t fmmu_logical_start_address;
-    size_t tx_size;
+    size_t tx_size, old_prev_tx_size;
 
     // FMMU configuration already prepared?
     for (i = 0; i < sc->used_fmmus; i++) {
@@ -191,7 +191,9 @@
         if (fmmu->dir != prev_fmmu->dir && prev_fmmu->tx_size != 0) {
             // prev fmmu has opposite direction
             // and is not already paired with prev-prev fmmu
+            old_prev_tx_size = prev_fmmu->tx_size;
             prev_fmmu->tx_size = max(fmmu->data_size,prev_fmmu->data_size);
+            domain->tx_size += prev_fmmu->tx_size - old_prev_tx_size;
             tx_size = 0;
             fmmu_logical_start_address = prev_fmmu->logical_start_address;
         }
@@ -712,10 +714,6 @@
     ec_pdo_entry_t *entry;
     int sync_offset;
 
-    EC_CONFIG_DBG(sc, 1, "%s(sc = 0x%p, index = 0x%04X, "
-            "subindex = 0x%02X, domain = 0x%p, bit_position = 0x%p)\n",
-            __func__, sc, index, subindex, domain, bit_position);
-
     for (sync_index = 0; sync_index < EC_MAX_SYNC_MANAGERS; sync_index++) {
         sync_config = &sc->sync_configs[sync_index];
         bit_offset = 0;
@@ -739,7 +737,11 @@
                     if (sync_offset < 0)
                         return sync_offset;
 
-                    return sync_offset + bit_offset / 8;
+                    EC_CONFIG_DBG(sc, 1, "%s(index = 0x%04X, "
+                                  "subindex = 0x%02X, domain = %u, bytepos=%u, bitpos=%u)\n",
+                                  __func__,index, subindex,
+                                  domain->index, sync_offset + bit_offset / 8, bit_pos);
+					return sync_offset + bit_offset / 8;
                 }
             }
         }