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

Merge branch 'remove-eoe-ioctl-ifdef' into 'stable-1.5' 

Remove EoE #ifdef in IOCTL header to avoid inconsistencies when EoE is enabled or disabled.

See merge request etherlab.org/ethercat!75
This commit is contained in:
Florian Pose 2023-07-20 07:41:53 +00:00
parent 5d8c8990de d35c5a41cc
commit e679d23ab9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
master/ioctl.c
View File

@ -118,6 +118,8 @@ static ATTRIBUTES int ec_ioctl_master(
io.domain_count = ec_master_domain_count(master);
#ifdef EC_EOE
io.eoe_handler_count = ec_master_eoe_handler_count(master);
#else
io.eoe_handler_count = 0;
#endif
io.phase = (uint8_t) master->phase;
io.active = (uint8_t) master->active;

4
master/ioctl.h
View File

@ -47,7 +47,7 @@
*
* Increment this when changing the ioctl interface!
*/
#define EC_IOCTL_VERSION_MAGIC 31
#define EC_IOCTL_VERSION_MAGIC 32
// Command-line tool
#define EC_IOCTL_MODULE EC_IOR(0x00, ec_ioctl_module_t)
@ -164,9 +164,7 @@ typedef struct {
uint32_t slave_count;
uint32_t config_count;
uint32_t domain_count;
#ifdef EC_EOE
uint32_t eoe_handler_count;
#endif
uint8_t phase;
uint8_t active;
uint8_t scan_busy;