# HG changeset patch # User Martin Troxler # Date 1272874883 -7200 # Node ID 02c8728bf9e48c7e036d3710c2e244fe2c7cd686 # Parent df270de292e148d9b448cd6496ba29ca82479acf Inplace I/O: fixed domain command (fmmu logical_address -> domain_address); show domain tx size diff -r df270de292e1 -r 02c8728bf9e4 master/cdev.c --- a/master/cdev.c Fri Apr 30 11:17:26 2010 +0200 +++ b/master/cdev.c Mon May 03 10:21:23 2010 +0200 @@ -539,6 +539,7 @@ } 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 @@ 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 -r df270de292e1 -r 02c8728bf9e4 master/ioctl.h --- a/master/ioctl.h Fri Apr 30 11:17:26 2010 +0200 +++ b/master/ioctl.h Mon May 03 10:21:23 2010 +0200 @@ -277,6 +277,7 @@ // 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 @@ 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 -r df270de292e1 -r 02c8728bf9e4 tool/CommandDomains.cpp --- a/tool/CommandDomains.cpp Fri Apr 30 11:17:26 2010 +0200 +++ b/tool/CommandDomains.cpp Mon May 03 10:21:23 2010 +0200 @@ -143,6 +143,8 @@ << 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 @@ << 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;