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

Applied base-0026-EoE-processing-is-now-only-allowed-in-state-PREOP 

EoE is disabled in INIT, BOOT, and invalid states to prevent errors.
This commit is contained in:
Knud Baastrup 2015-07-10 12:46:37 +02:00
parent 1267e45bf8
commit ff2e062a08
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
master/master.c
View File

@ -1901,12 +1901,16 @@ static int ec_master_eoe_thread(void *priv_data)
// actual EoE processing
sth_to_send = 0;
list_for_each_entry(eoe, &master->eoe_handlers, list) {
ec_eoe_run(eoe);
if (eoe->queue_datagram) {
sth_to_send = 1;
}
if (!ec_eoe_is_idle(eoe)) {
all_idle = 0;
if ((eoe->slave->current_state == EC_SLAVE_STATE_PREOP) ||
(eoe->slave->current_state == EC_SLAVE_STATE_SAFEOP) ||
(eoe->slave->current_state == EC_SLAVE_STATE_OP)) {
ec_eoe_run(eoe);
if (eoe->queue_datagram) {
sth_to_send = 1;
}
if (!ec_eoe_is_idle(eoe)) {
all_idle = 0;
}
}
}