Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-02-06 20:01:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'disable_eoe_op' into 'stable-1.6'

Browse Source 
Backport "Do not touch AL state of EoE slaves." to stable-1.6

See merge request etherlab.org/ethercat!164
This commit is contained in:
Florian Pose
2025-03-21 09:32:23 +01:00
parent 319d7f8cd4 0e2dd2ff56
commit 7deaae5c4a
2 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
master/ethernet.c
View File

@@ -792,7 +792,6 @@ int ec_eoedev_open(struct net_device *dev /**< EoE net_device */)
#if EOE_DEBUG_LEVEL >= 2
EC_SLAVE_DBG(eoe->slave, 0, "%s opened.\n", dev->name);
#endif
ec_slave_request_state(eoe->slave, EC_SLAVE_STATE_OP);
return 0;
}
@@ -814,7 +813,6 @@ int ec_eoedev_stop(struct net_device *dev /**< EoE net_device */)
#if EOE_DEBUG_LEVEL >= 2
EC_SLAVE_DBG(eoe->slave, 0, "%s stopped.\n", dev->name);
#endif
ec_slave_request_state(eoe->slave, EC_SLAVE_STATE_PREOP);
return 0;
}

11
master/master.c
View File

@@ -703,9 +703,6 @@ int ec_master_enter_operation_phase(
{
int ret = 0;
ec_slave_t *slave;
#ifdef EC_EOE
ec_eoe_t *eoe;
#endif
EC_MASTER_DBG(master, 1, "IDLE -> OPERATION.\n");
@@ -755,14 +752,6 @@ int ec_master_enter_operation_phase(
ec_slave_request_state(slave, EC_SLAVE_STATE_PREOP);
}
#ifdef EC_EOE
// ... but set EoE slaves to OP
list_for_each_entry(eoe, &master->eoe_handlers, list) {
if (ec_eoe_is_open(eoe))
ec_slave_request_state(eoe->slave, EC_SLAVE_STATE_OP);
}
#endif
master->phase = EC_OPERATION;
master->app_send_cb = NULL;
master->app_receive_cb = NULL;