Fixed reconfiguration: Force config when application detaches.

This commit is contained in:
Florian Pose 2008-08-01 07:23:09 +00:00
parent d24c3cbbf7
commit 09a6ddc5a4
2 changed files with 8 additions and 5 deletions

View File

@ -503,12 +503,19 @@ void ec_master_leave_operation_phase(ec_master_t *master
ec_master_clear_slave_configs(master);
up(&master->master_sem);
// set states for all slaves
for (slave = master->slaves;
slave < master->slaves + master->slave_count;
slave++) {
// set states for all slaves
ec_slave_request_state(slave, EC_SLAVE_STATE_PREOP);
// mark for reconfiguration, because the master could have no
// possibility for a reconfiguration between two sequential operation
// phases.
slave->force_config = 1;
}
#ifdef EC_EOE
// ... but leave EoE slaves in OP
list_for_each_entry(eoe, &master->eoe_handlers, list) {

View File

@ -208,10 +208,6 @@ int ec_slave_config_attach(
slave->config = sc;
sc->slave = slave;
// force reconfiguration, because the master could have had no possibility
// for a reconfiguration, between two operation phases.
slave->force_config = 1;
ec_slave_request_state(slave, EC_SLAVE_STATE_OP);
if (sc->master->debug_level)