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

Fixed missing return causing slaves not going to OP.

This commit is contained in:
Florian Pose 2011-09-22 16:52:54 +02:00
parent e09499f1b9
commit 6086dc56a9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
master/fsm_master.c
View File

@ -212,7 +212,8 @@ void ec_fsm_master_state_broadcast(
fsm->slaves_responding);
}
if (fsm->link_state && !master->main_device.link_state) { // link went down
if (fsm->link_state && !master->main_device.link_state) {
// link went down
EC_MASTER_DBG(master, 1, "Master state machine detected "
"link down. Clearing slave list.\n");
@ -267,7 +268,8 @@ void ec_fsm_master_state_broadcast(
}
size = sizeof(ec_slave_t) * master->slave_count;
if (!(master->slaves = (ec_slave_t *) kmalloc(size, GFP_KERNEL))) {
if (!(master->slaves =
(ec_slave_t *) kmalloc(size, GFP_KERNEL))) {
EC_MASTER_ERR(master, "Failed to allocate %u bytes"
" of slave memory!\n", size);
master->slave_count = 0; // TODO avoid retrying scan!
@ -578,6 +580,7 @@ void ec_fsm_master_action_configure(
fsm->slave = master->slaves; // begin with first slave
ec_fsm_master_enter_write_system_times(fsm);
return;
}
// Does the slave have to be configured?