bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Inplace I/O: fixed domain command (fmmu logical_address -> domain_address); show domain tx size

This commit is contained in:
Martin Troxler 2010-05-03 10:21:23 +02:00
parent 86fbe23891
commit c2d9442c8d
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
master/cdev.c
View File

@ -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);

2
master/ioctl.h
View File

@ -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;

4
tool/CommandDomains.cpp
View File

@ -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;