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

Show complete access flag in config view.

This commit is contained in:
Florian Pose 2012-10-09 09:52:50 +02:00
parent ef68a4bff1
commit 77d12c25ca
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
master/ioctl.c
View File

@ -1350,6 +1350,7 @@ static int ec_ioctl_config_sdo(
ioctl->size = req->data_size; ioctl->size = req->data_size;
memcpy(ioctl->data, req->data, memcpy(ioctl->data, req->data,
min((u32) ioctl->size, (u32) EC_MAX_SDO_DATA_SIZE)); min((u32) ioctl->size, (u32) EC_MAX_SDO_DATA_SIZE));
ioctl->complete_access = req->complete_access;
up(&master->master_sem); up(&master->master_sem);

3
master/ioctl.h
View File

@ -56,7 +56,7 @@
* *
* Increment this when changing the ioctl interface! * Increment this when changing the ioctl interface!
*/ */
#define EC_IOCTL_VERSION_MAGIC 19 #define EC_IOCTL_VERSION_MAGIC 20
// Command-line tool // Command-line tool
#define EC_IOCTL_MODULE EC_IOR(0x00, ec_ioctl_module_t) #define EC_IOCTL_MODULE EC_IOR(0x00, ec_ioctl_module_t)
@ -528,6 +528,7 @@ typedef struct {
uint8_t subindex; uint8_t subindex;
uint32_t size; uint32_t size;
uint8_t data[EC_MAX_SDO_DATA_SIZE]; uint8_t data[EC_MAX_SDO_DATA_SIZE];
uint8_t complete_access;
} ec_ioctl_config_sdo_t; } ec_ioctl_config_sdo_t;
/*****************************************************************************/ /*****************************************************************************/

11
tool/CommandConfig.cpp
View File

@ -236,9 +236,14 @@ void CommandConfig::showDetailedConfigs(
cout << indent << " 0x" cout << indent << " 0x"
<< hex << setfill('0') << hex << setfill('0')
<< setw(4) << sdo.index << ":" << setw(4) << sdo.index;
<< setw(2) << (unsigned int) sdo.subindex if (sdo.complete_access) {
<< ", " << dec << sdo.size << " byte" << endl; cout << " C";
}
else {
cout << ":" << setw(2) << (unsigned int) sdo.subindex;
}
cout << ", " << dec << sdo.size << " byte" << endl;
cout << indent << " " << hex; cout << indent << " " << hex;
for (i = 0; i < min((uint32_t) sdo.size, for (i = 0; i < min((uint32_t) sdo.size,