From c2d9442c8d47466d81a8fe8a200ba47ba4647b0d Mon Sep 17 00:00:00 2001
From: Martin Troxler <martin.troxler@komaxgroup.com>
Date: Mon, 3 May 2010 10:21:23 +0200
Subject: [PATCH] Inplace I/O: fixed domain command (fmmu logical_address ->
 domain_address); show domain tx size

---
 master/cdev.c           | 2 ++
 master/ioctl.h          | 2 ++
 tool/CommandDomains.cpp | 4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/master/cdev.c b/master/cdev.c
index 22e462e6..c03b37e3 100644
--- a/master/cdev.c
+++ b/master/cdev.c
@@ -539,6 +539,7 @@ int ec_cdev_ioctl_domain(
     }
 
     data.data_size = domain->data_size;
+    data.tx_size = domain->tx_size;
     data.logical_base_address = domain->logical_base_address;
     data.working_counter = domain->working_counter;
     data.expected_working_counter = domain->expected_working_counter;
@@ -590,6 +591,7 @@ int ec_cdev_ioctl_domain_fmmu(
     data.sync_index = fmmu->sync_index;
     data.dir = fmmu->dir;
     data.logical_address = fmmu->logical_start_address;
+    data.domain_address = fmmu->domain_address;
     data.data_size = fmmu->data_size;
 
     up(&master->master_sem);
diff --git a/master/ioctl.h b/master/ioctl.h
index 7b755481..53ce5719 100644
--- a/master/ioctl.h
+++ b/master/ioctl.h
@@ -277,6 +277,7 @@ typedef struct {
 
     // outputs
     uint32_t data_size;
+    uint32_t tx_size;
     uint32_t logical_base_address;
     uint16_t working_counter;
     uint16_t expected_working_counter;
@@ -296,6 +297,7 @@ typedef struct {
     uint8_t sync_index;
     ec_direction_t dir;
     uint32_t logical_address;
+    uint32_t domain_address;
     uint32_t data_size;
 } ec_ioctl_domain_fmmu_t;
 
diff --git a/tool/CommandDomains.cpp b/tool/CommandDomains.cpp
index 738868a1..d7731791 100644
--- a/tool/CommandDomains.cpp
+++ b/tool/CommandDomains.cpp
@@ -143,6 +143,8 @@ void CommandDomains::showDomain(
         << setw(8) << domain.logical_base_address
         << ", Size " << dec << setfill(' ')
         << setw(3) << domain.data_size
+        << ", TxSize " << dec << setfill(' ')
+        << setw(3) << domain.tx_size
         << ", WorkingCounter "
         << domain.working_counter << "/"
         << domain.expected_working_counter << endl;
@@ -173,7 +175,7 @@ void CommandDomains::showDomain(
             << setw(8) << fmmu.logical_address
             << ", Size " << dec << fmmu.data_size << endl;
 
-        dataOffset = fmmu.logical_address - domain.logical_base_address;
+        dataOffset = fmmu.domain_address - domain.logical_base_address;
         if (dataOffset + fmmu.data_size > domain.data_size) {
             stringstream err;
             delete [] processData;